gnulib-tool.py: Coding style: Revisit line breaks.

* gnulib-tool.py: Avoid line breaks at arbitrary points inside
expressions. Use line breaks to clarify [... for ...] iterations.
* pygnulib/*.py: Likewise.

1 files changed, 7 insertions, 10 deletions

diff --git a/pygnulib/GLMakefileTable.py b/pygnulib/GLMakefileTable.py
index f3a8b9cccf..c4fb6d195a 100644
--- a/pygnulib/GLMakefileTable.py
+++ b/pygnulib/GLMakefileTable.py
@@ -74,14 +74,11 @@ class GLMakefileTable(object):
         This method is used to remember that ${dir}Makefile.am needs to be edited
         to that ${var} mentions ${val}.'''
         if type(dir) is not str:
-            raise TypeError(
-                'dir must be a string, not %s' % (type(dir).__name__))
+            raise TypeError('dir must be a string, not %s' % (type(dir).__name__))
         if type(var) is not str:
-            raise TypeError(
-                'var must be a string, not %s' % (type(var).__name__))
+            raise TypeError('var must be a string, not %s' % (type(var).__name__))
         if type(val) is not str:
-            raise TypeError(
-                'val must be a string, not %s' % (type(val).__name__))
+            raise TypeError('val must be a string, not %s' % (type(val).__name__))
         dictionary = {'dir': dir, 'var': var, 'val': val}
         self.table += [dictionary]
 
@@ -104,10 +101,10 @@ class GLMakefileTable(object):
         else:  # if makefile
             mfx = makefile
         dir2 = ''
-        while dir1 and \
-            (joinpath(self.config['destdir'], dir1, mfd)
-             or joinpath(dir1, mfd) == joinpath(sourcebase, mfx)
-             or (inctests and joinpath(dir1, mfd) == joinpath(testsbase, mfx))):
+        while (dir1
+               and (joinpath(self.config['destdir'], dir1, mfd)
+                    or joinpath(dir1, mfd) == joinpath(sourcebase, mfx)
+                    or (inctests and joinpath(dir1, mfd) == joinpath(testsbase, mfx)))):
             dir2 = joinpath(os.path.basename(dir1), dir2)
             dir1 = os.path.dirname(dir1)
         self.editor(dir1, 'EXTRA_DIST', joinpath(dir2, 'gnulib-cache.m4'))