Merge lp:~soren/bzr/lp701898 into lp:bzr

[Soren Hansen]

Fix PEP-8 violation in PythonVersionInfoBuilder's output

Fix PEP-8 violation in PythonVersionInfoBuilder's output

 * Add a assertNotContainsString method to TestCase class.
 * Add a test for too many linefeeds in a row in PythonVersionInfoBuilder's
   output.
 * Remove a superfluous linefeed in PythonVersionInfoBuilder's footer.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 1/12/2011 8:12 AM, Soren Hansen wrote:
> Soren Hansen has proposed merging lp:~soren/bzr/lp701898 into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #701898 "bzr version-info --python" does not give pep-8 compliant output
> https://bugs.launchpad.net/bugs/701898
>
> For more details, see:
> https://code.launchpad.net/~soren/bzr/lp701898/+merge/45991
>
> Fix PEP-8 violation in PythonVersionInfoBuilder's output
>
> * Add a assertNotContainsString method to TestCase class.
> * Add a test for too many linefeeds in a row in PythonVersionInfoBuilder's
> output.
> * Remove a superfluous linefeed in PythonVersionInfoBuilder's footer.
>
 review: approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk0t0VUACgkQJdeBCYSNAANH9wCgrBGBbfdIKAiAK5DrdaEz4khu
+dkAoJNy1UxC9bzkXhFqH/TRHaGkF9q9
=Y0n8
-----END PGP SIGNATURE-----

review: Approve

[Martin Pool (mbp)]

  merge approve

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2011-01-07 11:13:50 +0000
+++ bzrlib/tests/__init__.py	2011-01-12 14:11:57 +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'
--- bzrlib/tests/test_version_info.py	2010-12-24 22:40:27 +0000
+++ bzrlib/tests/test_version_info.py	2011-01-12 14:11:57 +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'
--- bzrlib/version_info_formats/format_python.py	2009-04-03 21:23:55 +0000
+++ bzrlib/version_info_formats/format_python.py	2011-01-12 14:11:57 +0000
@@ -38,7 +38,6 @@
 
 
 _py_version_footer = '''
-
 if __name__ == '__main__':
     print 'revision: %(revno)d' % version_info
     print 'nick: %(branch_nick)s' % version_info