Rev 5025: Fix imports in per_branch/test_http.py. in file:///home/vila/src/bzr/cleanup/test-imports/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/cleanup/test-imports/

------------------------------------------------------------
revno: 5025
revision-id: v.ladeuil+lp at free.fr-20100208084632-i09xnm1xols3axx6
parent: v.ladeuil+lp at free.fr-20100208084442-zi8oe4x5o3lhxoxz
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-imports
timestamp: Mon 2010-02-08 09:46:32 +0100
message:
  Fix imports in per_branch/test_http.py.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_branch/test_http.py'
--- a/bzrlib/tests/per_branch/test_http.py	2009-07-10 10:46:00 +0000
+++ b/bzrlib/tests/per_branch/test_http.py	2010-02-08 08:46:32 +0000
@@ -16,16 +16,18 @@
 
 """Test branches with inaccessible parents."""
 
-import os
-
-from bzrlib import branch, errors
-from bzrlib.tests.http_server import HttpServer
-from bzrlib.tests.per_branch.test_branch import TestCaseWithBranch
-from bzrlib.transport.local import LocalURLServer
-from bzrlib.transport.chroot import TestingChrootServer
-
-
-class InaccessibleParentTests(TestCaseWithBranch):
+from bzrlib import (
+    branch,
+    errors,
+    )
+from bzrlib.tests import per_branch
+from bzrlib.transport import (
+    chroot,
+    local,
+    )
+
+
+class InaccessibleParentTests(per_branch.TestCaseWithBranch):
     """Tests with branches with "inaccessible" parents.
 
     An "inaccessible" parent location is one that cannot be represented, e.g. if
@@ -36,8 +38,8 @@
 
     def setUp(self):
         super(InaccessibleParentTests, self).setUp()
-        if self.transport_server in (LocalURLServer, None):
-            self.transport_readonly_server = TestingChrootServer
+        if self.transport_server in (local.LocalURLServer, None):
+            self.transport_readonly_server = chroot.TestingChrootServer
 
     def get_branch_with_invalid_parent(self):
         """Get a branch whose get_parent will raise InaccessibleParent."""