Rev 5204: Review feedback. in http://bazaar.launchpad.net/~lifeless/bzr/stuff

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/stuff

------------------------------------------------------------
revno: 5204
revision-id: robertc at robertcollins.net-20100505023502-fzybvhmxe9sv3b3g
parent: robertc at robertcollins.net-20100505000529-ltmllyms5watqj5u
committer: Robert Collins <robertc at robertcollins.net>
branch nick: stuff
timestamp: Wed 2010-05-05 14:35:02 +1200
message:
  Review feedback.
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-05-05 00:05:29 +0000
+++ b/bzrlib/tests/__init__.py	2010-05-05 02:35:02 +0000
@@ -2578,7 +2578,7 @@
                 content = "contents of %s%s" % (name.encode('utf-8'), end)
                 transport.put_bytes_non_atomic(urlutils.escape(name), content)
 
-    build_tree_contents = treeshape.build_tree_contents
+    build_tree_contents = staticmethod(treeshape.build_tree_contents)
 
     def assertInWorkingTree(self, path, root_path='.', tree=None):
         """Assert whether path or paths are in the WorkingTree"""

=== modified file 'bzrlib/trace.py'
--- a/bzrlib/trace.py	2010-05-04 06:46:59 +0000
+++ b/bzrlib/trace.py	2010-05-05 02:35:02 +0000
@@ -114,6 +114,7 @@
     """Output a note to the user.
 
     Takes the same parameters as logging.info.
+
     :return: None
     """
     # FIXME note always emits utf-8, regardless of the terminal encoding