Rev 5422: Fix style issues, including vertical spaces, lines too long and multi lines imports. in file:///home/vila/src/bzr/reviews/mergetools/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/mergetools/

------------------------------------------------------------
revno: 5422
revision-id: v.ladeuil+lp at free.fr-20101206100150-jakhpj9ud2exxplq
parent: gordon at doxxx.net-20101204055739-703a0zhdpp4hjhov
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: mergetools
timestamp: Mon 2010-12-06 11:01:50 +0100
message:
  Fix style issues, including vertical spaces, lines too long and multi lines imports.
-------------- next part --------------
=== modified file 'bzrlib/mergetools.py'
--- a/bzrlib/mergetools.py	2010-12-02 05:08:52 +0000
+++ b/bzrlib/mergetools.py	2010-12-06 10:01:50 +0000
@@ -59,6 +59,7 @@
 
 
 class MergeTool(object):
+
     def __init__(self, name, commandline):
         """Initializes the merge tool with a name and a command-line (a string
         or sequence of strings).

=== modified file 'bzrlib/tests/features.py'
--- a/bzrlib/tests/features.py	2010-11-26 14:55:58 +0000
+++ b/bzrlib/tests/features.py	2010-12-06 10:01:50 +0000
@@ -19,7 +19,10 @@
 import os
 import stat
 
-from bzrlib import osutils, tests
+from bzrlib import (
+    osutils,
+    tests,
+    )
 from bzrlib.symbol_versioning import deprecated_in
 
 

=== modified file 'bzrlib/tests/test_cmdline.py'
--- a/bzrlib/tests/test_cmdline.py	2010-11-27 05:03:48 +0000
+++ b/bzrlib/tests/test_cmdline.py	2010-12-06 10:01:50 +0000
@@ -116,6 +116,7 @@
 
 
 class TestUnSplit(tests.TestCase):
+
     def test_unsplit(self):
         self.assertEquals('foo bar', cmdline.unsplit(['foo', 'bar']))
 

=== modified file 'bzrlib/tests/test_mergetools.py'
--- a/bzrlib/tests/test_mergetools.py	2010-12-02 04:57:27 +0000
+++ b/bzrlib/tests/test_mergetools.py	2010-12-06 10:01:50 +0000
@@ -27,6 +27,7 @@
 
 
 class TestBasics(tests.TestCase):
+
     def setUp(self):
         super(TestBasics, self).setUp()
         self.tool = mergetools.MergeTool('sometool',
@@ -103,14 +104,18 @@
 
 
 class TestUnicodeBasics(tests.TestCase):
+
     def setUp(self):
         super(TestUnicodeBasics, self).setUp()
-        self.tool = mergetools.MergeTool(u'someb\u0414r',
-            u'/path/to/b\u0414r --opt {base} -x {this} {other} --stuff {result}')
+        self.tool = mergetools.MergeTool(
+            u'someb\u0414r',
+            u'/path/to/b\u0414r --opt {base} -x {this} {other}'
+            ' --stuff {result}')
 
     def test_get_commandline(self):
         self.assertEqual(
-            u'/path/to/b\u0414r --opt {base} -x {this} {other} --stuff {result}',
+            u'/path/to/b\u0414r --opt {base} -x {this} {other}'
+            ' --stuff {result}',
             self.tool.get_commandline())
 
     def test_get_commandline_as_list(self):
@@ -179,6 +184,7 @@
 
 
 class TestMergeToolOperations(tests.TestCaseInTempDir):
+
     def test_filename_substitution(self):
         def dummy_invoker(executable, args, cleanup):
             self._commandline = [executable] + args
@@ -247,6 +253,7 @@
 
 
 class TestModuleFunctions(tests.TestCaseInTempDir):
+
     def test_detect(self):
         # only way to reliably test detection is to add a known existing
         # executable to the list used for detection

=== modified file 'bzrlib/tests/test_osutils.py'
--- a/bzrlib/tests/test_osutils.py	2010-12-04 05:40:58 +0000
+++ b/bzrlib/tests/test_osutils.py	2010-12-06 10:01:50 +0000
@@ -2119,6 +2119,7 @@
 
 
 class TestFindExecutableInPath(tests.TestCase):
+
     def test_windows(self):
         if sys.platform != 'win32':
             raise tests.TestSkipped('test requires win32')