Rev 6612: Fix pep8 issues in news_merge plugin. in file:///home/vila/src/bzr/experimental/py3/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/py3/

------------------------------------------------------------
revno: 6612
revision-id: v.ladeuil+lp at free.fr-20150902101320-q12lpv52bdfkwycm
parent: v.ladeuil+lp at free.fr-20150902092055-5mvpnh1nwt5b8ymp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: pep8
timestamp: Wed 2015-09-02 12:13:20 +0200
message:
  Fix pep8 issues in news_merge plugin.
-------------- next part --------------
=== modified file 'bzrlib/plugins/__init__.py'
--- a/bzrlib/plugins/__init__.py	2011-12-19 13:23:58 +0000
+++ b/bzrlib/plugins/__init__.py	2015-09-02 10:13:20 +0000
@@ -16,4 +16,3 @@
 
 """Null placeholder plugin"""
 from __future__ import absolute_import
-

=== modified file 'bzrlib/plugins/news_merge/__init__.py'
--- a/bzrlib/plugins/news_merge/__init__.py	2011-12-18 12:46:49 +0000
+++ b/bzrlib/plugins/news_merge/__init__.py	2015-09-02 10:13:20 +0000
@@ -33,9 +33,10 @@
   how to resolve that, so bzr will fallback to the default line-based merge.
 """
 
+import bzrlib
+from bzrlib.hooks import install_lazy_named_hook
 # Since we are a built-in plugin we share the bzrlib version
-from bzrlib import version_info
-from bzrlib.hooks import install_lazy_named_hook
+version_info = bzrlib.version_info
 
 
 def news_merge_hook(merger):
@@ -45,7 +46,7 @@
 
 
 install_lazy_named_hook("bzrlib.merge", "Merger.hooks", "merge_file_content",
-    news_merge_hook, "NEWS file merge")
+                        news_merge_hook, "NEWS file merge")
 
 
 def load_tests(basic_tests, module, loader):
@@ -53,6 +54,5 @@
         'tests',
         ]
     basic_tests.addTest(loader.loadTestsFromModuleNames(
-            ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
+        ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
     return basic_tests
-

=== modified file 'bzrlib/plugins/news_merge/news_merge.py'
--- a/bzrlib/plugins/news_merge/news_merge.py	2011-12-20 22:13:51 +0000
+++ b/bzrlib/plugins/news_merge/news_merge.py	2015-09-02 10:13:20 +0000
@@ -42,7 +42,7 @@
         other_lines = list(simple_parse_lines(params.other_lines))
         base_lines = list(simple_parse_lines(params.base_lines))
         m3 = merge3.Merge3(base_lines, this_lines, other_lines,
-            allow_objects=True)
+                           allow_objects=True)
         result_chunks = []
         for group in m3.merge_groups():
             if group[0] == 'conflict':

=== modified file 'bzrlib/plugins/news_merge/parser.py'
--- a/bzrlib/plugins/news_merge/parser.py	2011-12-19 13:23:58 +0000
+++ b/bzrlib/plugins/news_merge/parser.py	2015-09-02 10:13:20 +0000
@@ -36,8 +36,9 @@
 
 def simple_parse(content):
     """Returns blocks, where each block is a 2-tuple (kind, text).
-    
+
     :kind: one of 'heading', 'release', 'section', 'empty' or 'text'.
+
     :text: a str, including newlines.
     """
     blocks = content.split('\n\n')

=== modified file 'bzrlib/plugins/news_merge/tests/__init__.py'
--- a/bzrlib/plugins/news_merge/tests/__init__.py	2010-01-20 16:05:28 +0000
+++ b/bzrlib/plugins/news_merge/tests/__init__.py	2015-09-02 10:13:20 +0000
@@ -14,10 +14,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+
 def load_tests(basic_tests, module, loader):
     testmod_names = [
         'test_news_merge',
         ]
     basic_tests.addTest(loader.loadTestsFromModuleNames(
-            ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
+        ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
     return basic_tests