Rev 5034: Fix imports in per_repository/test_commit_builder.py. in file:///home/vila/src/bzr/cleanup/test-imports/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5034
revision-id: v.ladeuil+lp at free.fr-20100208092042-ce6zhdlut1ln3t85
parent: v.ladeuil+lp at free.fr-20100208091933-smx70gtoeyosa6uv
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-imports
timestamp: Mon 2010-02-08 10:20:42 +0100
message:
  Fix imports in per_repository/test_commit_builder.py.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_repository/test_commit_builder.py'
--- a/bzrlib/tests/per_repository/test_commit_builder.py	2009-11-19 15:06:47 +0000
+++ b/bzrlib/tests/per_repository/test_commit_builder.py	2010-02-08 09:20:42 +0000
@@ -16,24 +16,21 @@
 
 """Tests for repository commit builder."""
 
-from copy import copy
-import errno
 import os
-import sys
 
 from bzrlib import (
     errors,
+    graph,
     inventory,
     osutils,
     repository,
     revision as _mod_revision,
     tests,
     )
-from bzrlib.graph import Graph
-from bzrlib.tests.per_repository import test_repository
-
-
-class TestCommitBuilder(test_repository.TestCaseWithRepository):
+from bzrlib.tests import per_repository
+
+
+class TestCommitBuilder(per_repository.TestCaseWithRepository):
 
     def test_get_commit_builder(self):
         branch = self.make_branch('.')
@@ -924,8 +921,8 @@
         # (closest to a public per-file graph API we have today)
         tree.lock_read()
         self.addCleanup(tree.unlock)
-        graph = dict(Graph(tree.branch.repository.texts).iter_ancestry([tip]))
-        self.assertEqual(expected_graph, graph)
+        g = dict(graph.Graph(tree.branch.repository.texts).iter_ancestry([tip]))
+        self.assertEqual(expected_graph, g)
 
     def test_last_modified_revision_after_content_file_changes(self):
         # altering a file changes the last modified.