Rev 2926: Fix forgotten reference to _get_filename and duplicated code. in http://code.launchpad.net/%7Ev-ladeuil/bzr/auth.ring

[Vincent Ladeuil]

At http://code.launchpad.net/%7Ev-ladeuil/bzr/auth.ring

------------------------------------------------------------
revno: 2926
revision-id:v.ladeuil+lp at free.fr-20071104154432-hxcely69cx6acqzb
parent: v.ladeuil+lp at free.fr-20071104152917-nrsumxpk3dikso2c
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: auth.ring
timestamp: Sun 2007-11-04 16:44:32 +0100
message:
  Fix forgotten reference to _get_filename and duplicated code.
  
  * bzrlib/transport/http/_urllib.py:
  (HttpTransport_urllib._perform): Delete duplicate declarations.
  
  * bzrlib/config.py:
  (AuthenticationConfig._save): _get_filename() has been replaced by
  _filename.
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2007-11-04 15:24:27 +0000
+++ b/bzrlib/config.py	2007-11-04 15:44:32 +0000
@@ -966,10 +966,9 @@
 
     def _save(self):
         """Save the config file, only tests should use it for now."""
-        file_name = self._get_filename()
-        conf_dir = os.path.dirname(file_name)
+        conf_dir = os.path.dirname(self._filename)
         ensure_config_dir_exists(conf_dir)
-        self._get_config().write(file(file_name, 'wb'))
+        self._get_config().write(file(self._filename, 'wb'))
 
     def _set_option(self, section_name, option_name, value):
         """Set an authentication configuration option"""

=== modified file 'bzrlib/transport/http/_urllib.py'
--- a/bzrlib/transport/http/_urllib.py	2007-11-04 15:29:17 +0000
+++ b/bzrlib/transport/http/_urllib.py	2007-11-04 15:44:32 +0000
@@ -79,13 +79,8 @@
                         user=user, password=password,
                         protocol=self._unqualified_scheme,
                         path=self._path)
-            auth = {'host': self._host, 'port': self._port,
-                    'user': user, 'password': password,
-                    'protocol': self._unqualified_scheme,
-                    'path': self._path}
             # Proxy initialization will be done by first proxied request
             proxy_auth = dict()
-            proxy_auth = {}
         # Ensure authentication info is provided
         request.auth = auth
         request.proxy_auth = proxy_auth