Rev 4702: Remove bogus config imports left in previous tweak in http://bazaar.launchpad.net/~vila/bzr/integration

[Vincent Ladeuil]

At http://bazaar.launchpad.net/~vila/bzr/integration

------------------------------------------------------------
revno: 4702 [merge]
revision-id: v.ladeuil+lp at free.fr-20090918085208-jajnux1cilqltvdw
parent: pqm at pqm.ubuntu.com-20090918033431-imjyd17yze1okeap
parent: v.ladeuil+lp at free.fr-20090918085005-3c90u40kl4kqn671
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: integration
timestamp: Fri 2009-09-18 10:52:08 +0200
message:
  Remove bogus config imports left in previous tweak
modified:
  bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
  bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
  bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_cat.py'
--- a/bzrlib/tests/blackbox/test_cat.py	2009-09-17 22:26:36 +0000
+++ b/bzrlib/tests/blackbox/test_cat.py	2009-09-18 08:52:08 +0000
@@ -22,10 +22,10 @@
 import os
 import sys
 
-from bzrlib.tests import MemoryServer, TestCaseWithTransport
-
-
-class TestCat(TestCaseWithTransport):
+from bzrlib import tests
+
+
+class TestCat(tests.TestCaseWithTransport):
 
     def test_cat(self):
         tree = self.make_branch_and_tree('branch')
@@ -184,5 +184,5 @@
         self.assertEqual('contents of README\n', out)
 
     def test_cat_nonexistent_branch(self):
-        self.vfs_transport_factory = MemoryServer
+        self.vfs_transport_factory = tests.MemoryServer
         self.run_bzr_error(['^bzr: ERROR: Not a branch'], ['cat', self.get_url()])

=== modified file 'bzrlib/tests/blackbox/test_diff.py'
--- a/bzrlib/tests/blackbox/test_diff.py	2009-09-17 09:51:29 +0000
+++ b/bzrlib/tests/blackbox/test_diff.py	2009-09-18 08:50:05 +0000
@@ -22,7 +22,6 @@
 import re
 
 from bzrlib import (
-    config,
     tests,
     workingtree,
     )

=== modified file 'bzrlib/tests/blackbox/test_locale.py'
--- a/bzrlib/tests/blackbox/test_locale.py	2009-09-17 09:51:29 +0000
+++ b/bzrlib/tests/blackbox/test_locale.py	2009-09-18 08:50:05 +0000
@@ -20,7 +20,6 @@
 import sys
 
 from bzrlib import (
-    config,
     tests,
     )
 

=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- a/bzrlib/tests/blackbox/test_serve.py	2009-09-17 22:26:36 +0000
+++ b/bzrlib/tests/blackbox/test_serve.py	2009-09-18 08:52:08 +0000
@@ -25,7 +25,6 @@
 import threading
 
 from bzrlib import (
-    config,
     errors,
     osutils,
     revision as _mod_revision,

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2009-09-17 22:26:36 +0000
+++ b/bzrlib/tests/test_selftest.py	2009-09-18 08:52:08 +0000
@@ -28,7 +28,6 @@
 from bzrlib import (
     branchbuilder,
     bzrdir,
-    config,
     debug,
     errors,
     lockdir,