Rev 5600: (vila) Fix PEP-8 violation in PythonVersionInfoBuilder's output (Soren in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5600 [merge]
revision-id: pqm at pqm.ubuntu.com-20110112183925-rnn12p6xp91441r0
parent: pqm at pqm.ubuntu.com-20110112172132-p7n9cxhslpn6svhh
parent: soren at linux2go.dk-20110112140828-nr7c2zw79l5xs2pz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-01-12 18:39:25 +0000
message:
  (vila) Fix PEP-8 violation in PythonVersionInfoBuilder's output (Soren
   Hansen)
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
  bzrlib/version_info_formats/format_python.py format_python.py-20060809202444-ike7i9ub03gb432p-1
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2011-01-12 01:01:53 +0000
+++ b/bzrlib/tests/__init__.py	2011-01-12 18:39:25 +0000
@@ -1336,6 +1336,10 @@
         if haystack.find(needle) == -1:
             self.fail("string %r not found in '''%s'''" % (needle, haystack))
 
+    def assertNotContainsString(self, haystack, needle):
+        if haystack.find(needle) != -1:
+            self.fail("string %r found in '''%s'''" % (needle, haystack))
+
     def assertSubset(self, sublist, superlist):
         """Assert that every entry in sublist is present in superlist."""
         missing = set(sublist) - set(superlist)

=== modified file 'bzrlib/tests/test_version_info.py'
--- a/bzrlib/tests/test_version_info.py	2011-01-12 01:01:53 +0000
+++ b/bzrlib/tests/test_version_info.py	2011-01-12 18:39:25 +0000
@@ -192,6 +192,7 @@
         val = sio.getvalue()
         self.assertContainsRe(val, "'revision_id': None")
         self.assertContainsRe(val, "'revno': 0")
+        self.assertNotContainsString(val, '\n\n\n\n')
 
     def test_python_version(self):
         wt = self.create_branch()

=== modified file 'bzrlib/version_info_formats/format_python.py'
--- a/bzrlib/version_info_formats/format_python.py	2009-04-03 21:23:55 +0000
+++ b/bzrlib/version_info_formats/format_python.py	2011-01-12 14:08:28 +0000
@@ -38,7 +38,6 @@
 
 
 _py_version_footer = '''
-
 if __name__ == '__main__':
     print 'revision: %(revno)d' % version_info
     print 'nick: %(branch_nick)s' % version_info