Rev 2995: Various fixes following local testing environment rebuild. in file:///v/home/vila/src/bzr/bugs/151208/

[Vincent Ladeuil]

At file:///v/home/vila/src/bzr/bugs/151208/

------------------------------------------------------------
revno: 2995
revision-id:v.ladeuil+lp at free.fr-20071119202029-ci39zpbqm1hxpwrh
parent: v.ladeuil+lp at free.fr-20071119140742-cx521282ef6t9e7g
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 151208
timestamp: Mon 2007-11-19 21:20:29 +0100
message:
  Various fixes following local testing environment rebuild.
  
  * bzrlib/tests/test_config.py: 
  Fix import and failing tests.
  
  * bzrlib/config.py: 
  Fix import.
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2007-11-19 14:06:42 +0000
+++ b/bzrlib/config.py	2007-11-19 20:20:29 +0000
@@ -84,7 +84,7 @@
     urlutils,
     win32utils,
     )
-import bzrlib.util.configobj.configobj as configobj
+from bzrlib.util.configobj import configobj
 """)
 
 

=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2007-11-19 14:06:42 +0000
+++ b/bzrlib/tests/test_config.py	2007-11-19 20:20:29 +0000
@@ -34,7 +34,7 @@
     tests,
     trace,
     )
-import bzrlib.util.configobj.configobj as configobj
+from bzrlib.util.configobj import configobj
 
 
 sample_long_alias="log -r-15..-1 --line"
@@ -309,15 +309,15 @@
                          self.bzr_home + '/bazaar.conf')
 
     def test_branches_config_filename(self):
-        self.assertEqual(config.config_filename(),
+        self.assertEqual(config.branches_config_filename(),
                          self.bzr_home + '/branches.conf')
 
     def test_locations_config_filename(self):
-        self.assertEqual(config.config_filename(),
+        self.assertEqual(config.locations_config_filename(),
                          self.bzr_home + '/locations.conf')
 
     def test_authentication_config_filename(self):
-        self.assertEqual(config.config_filename(),
+        self.assertEqual(config.authentication_config_filename(),
                          self.bzr_home + '/authentication.conf')