Rev 3495: more cleanups from Ian in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/annotation

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/annotation

------------------------------------------------------------
revno: 3495
revision-id: john at arbash-meinel.com-20080617204640-p23gxho19zcyqu7m
parent: john at arbash-meinel.com-20080617204106-lksom3sdqjt5sx5f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotation
timestamp: Tue 2008-06-17 15:46:40 -0500
message:
  more cleanups from Ian
-------------- next part --------------
=== modified file 'bzrlib/annotation_policy/no_merge.py'
--- a/bzrlib/annotation_policy/no_merge.py	2008-06-12 16:33:11 +0000
+++ b/bzrlib/annotation_policy/no_merge.py	2008-06-17 20:46:40 +0000
@@ -27,8 +27,8 @@
                                  second_parent_lines,
                                  plain_child_lines,
                                  child_revision_id):
-        """Annotate versus two parents,
-        
+        """Annotate versus two parents.
+
         For this class, we always ignore other parents.
         """
         return self._do_annotate_one_parent(first_parent_lines,

=== modified file 'bzrlib/tests/test_annotate.py'
--- a/bzrlib/tests/test_annotate.py	2008-06-11 18:53:36 +0000
+++ b/bzrlib/tests/test_annotate.py	2008-06-17 20:46:40 +0000
@@ -23,8 +23,6 @@
     annotate,
     conflicts,
     errors,
-    graph,
-    revision,
     tests,
     trace,
     )
@@ -414,5 +412,3 @@
         blocks = [(0, 1, 1), (1, 2, 0)]
         self.annotateEqual([('rev2', 'a\n'), ('rev1', 'a\n')], [parent],
                            new_text, 'rev2', blocks)
-
-