Fix pycodestyle "line break after binary operator" warnings

6 files changed, 33 insertions, 32 deletions

diff --git a/debian/bin/abiupdate.py b/debian/bin/abiupdate.py
index b1d98bb30cb4..c5fa0100c6c0 100755
--- a/debian/bin/abiupdate.py
+++ b/debian/bin/abiupdate.py
@@ -33,22 +33,22 @@ class url_debian_pool(object):
         self.base = base
 
     def __call__(self, source, filename, arch):
-        return (self.base + "pool/main/" + source[0] + "/" + source + "/" +
-                filename)
+        return (self.base + "pool/main/" + source[0] + "/" + source + "/"
+                + filename)
 
 
 class url_debian_ports_pool(url_debian_pool):
     def __call__(self, source, filename, arch):
         if arch == 'all':
             return url_debian_pool.__call__(self, source, filename, arch)
-        return (self.base + "pool-" + arch + "/main/" + source[0] + "/" +
-                source + "/" + filename)
+        return (self.base + "pool-" + arch + "/main/" + source[0] + "/"
+                + source + "/" + filename)
 
 
 class url_debian_security_pool(url_debian_pool):
     def __call__(self, source, filename, arch):
-        return (self.base + "pool/updates/main/" + source[0] + "/" + source +
-                "/" + filename)
+        return (self.base + "pool/updates/main/" + source[0] + "/" + source
+                + "/" + filename)
 
 
 class Main(object):
@@ -107,8 +107,8 @@ class Main(object):
 
     def get_abi(self, arch, prefix):
         try:
-            version_abi = (self.config[('version',)]['abiname_base'] + '-' +
-                           self.config['abi', arch]['abiname'])
+            version_abi = (self.config[('version',)]['abiname_base'] + '-'
+                           + self.config['abi', arch]['abiname'])
         except KeyError:
             version_abi = self.version_abi
         filename = ("linux-headers-%s-%s_%s_%s.deb" %
diff --git a/debian/bin/buildcheck.py b/debian/bin/buildcheck.py
index 163b4c6d2329..3f7ce25a970c 100755
--- a/debian/bin/buildcheck.py
+++ b/debian/bin/buildcheck.py
@@ -44,8 +44,8 @@ class CheckAbi(object):
         self.filename_new = "%s/Module.symvers" % dir
 
         try:
-            version_abi = (self.config[('version',)]['abiname_base'] + '-' +
-                           self.config['abi', arch]['abiname'])
+            version_abi = (self.config[('version',)]['abiname_base'] + '-'
+                           + self.config['abi', arch]['abiname'])
         except KeyError:
             version_abi = self.config[('version',)]['abiname']
         self.filename_ref = ("debian/abi/%s/%s_%s_%s" %
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 84b40d571f40..4339727af141 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -361,14 +361,14 @@ class Gencontrol(Base):
         config_image = self.config.merge('image', arch, featureset, flavour)
 
         vars['class'] = config_description['hardware']
-        vars['longclass'] = (config_description.get('hardware-long') or
-                             vars['class'])
+        vars['longclass'] = (config_description.get('hardware-long')
+                             or vars['class'])
 
         vars['localversion-image'] = vars['localversion']
         override_localversion = config_image.get('override-localversion', None)
         if override_localversion is not None:
-            vars['localversion-image'] = (vars['localversion_headers'] + '-' +
-                                          override_localversion)
+            vars['localversion-image'] = (vars['localversion_headers'] + '-'
+                                          + override_localversion)
         vars['image-stem'] = config_image.get('install-stem')
 
         self._setup_makeflags(self.flavour_makeflags_base, makeflags,
@@ -638,8 +638,8 @@ class Gencontrol(Base):
         self.config['version', ] = {'source': self.version.complete,
                                     'upstream': self.version.linux_upstream,
                                     'abiname_base': self.abiname_version,
-                                    'abiname': (self.abiname_version +
-                                                self.abiname_part)}
+                                    'abiname': (self.abiname_version
+                                                + self.abiname_part)}
 
         distribution = self.changelog[0].distribution
         if distribution in ('unstable', ):
diff --git a/debian/bin/gencontrol_signed.py b/debian/bin/gencontrol_signed.py
index 6b53e064ffac..7745bad0a77d 100755
--- a/debian/bin/gencontrol_signed.py
+++ b/debian/bin/gencontrol_signed.py
@@ -44,11 +44,11 @@ class Gencontrol(Base):
         }
 
         self.package_dir = 'debian/%(template)s' % self.vars
-        self.template_top_dir = (self.package_dir +
-                                 '/usr/share/code-signing/%(template)s' %
-                                 self.vars)
-        self.template_debian_dir = (self.template_top_dir +
-                                    '/source-template/debian')
+        self.template_top_dir = (self.package_dir
+                                 + '/usr/share/code-signing/%(template)s'
+                                 % self.vars)
+        self.template_debian_dir = (self.template_top_dir
+                                    + '/source-template/debian')
         os.makedirs(self.template_debian_dir, exist_ok=True)
 
         self.image_packages = []
@@ -184,8 +184,8 @@ class Gencontrol(Base):
                                     cert_file_name))
 
         packages['source']['Build-Depends'].append(
-            image_package_name +
-            ' (= %(imagebinaryversion)s) [%(arch)s]' % vars)
+            image_package_name
+            + ' (= %(imagebinaryversion)s) [%(arch)s]' % vars)
 
         packages_signed = self.process_packages(
             self.templates['control.image'], vars)
@@ -209,14 +209,14 @@ class Gencontrol(Base):
 
         os.makedirs(self.package_dir + '/usr/share/lintian/overrides', 0o755,
                     exist_ok=True)
-        with open(self.package_dir +
-                  '/usr/share/lintian/overrides/%(template)s' % self.vars,
+        with open(self.package_dir
+                  + '/usr/share/lintian/overrides/%(template)s' % self.vars,
                   'a') as lintian_overrides:
             for script_base in ['postinst', 'postrm', 'preinst', 'prerm']:
-                script_name = (self.template_debian_dir +
-                               '/linux-image-%s%s.%s' %
-                               (vars['abiname'], vars['localversion'],
-                                script_base))
+                script_name = (self.template_debian_dir
+                               + '/linux-image-%s%s.%s'
+                               % (vars['abiname'], vars['localversion'],
+                                  script_base))
                 self._substitute_file('image.%s' % script_base, vars,
                                       script_name)
                 lintian_overrides.write('%s: script-not-executable %s\n' %
diff --git a/debian/changelog b/debian/changelog
index 45a53481a6f8..de865641c379 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ linux (4.19.12-2) UNRELEASED; urgency=medium
   * [powerpcspe] Fix -mcpu= options for SPE-only compiler
   * debian/lib/python/debian_linux/debian.py: Fix deprecated import of
     MutableSet
+  * Fix pycodestyle "line break after binary operator" warnings
 
   [ Salvatore Bonaccorso ]
   * USB: hso: Fix OOB memory access in hso_probe/hso_get_config_data
diff --git a/debian/lib/python/debian_linux/firmware.py b/debian/lib/python/debian_linux/firmware.py
index 8bb4f08504e7..592a66a4519f 100644
--- a/debian/lib/python/debian_linux/firmware.py
+++ b/debian/lib/python/debian_linux/firmware.py
@@ -79,9 +79,9 @@ class FirmwareWhence(list):
                 else:
                     licence = value
             elif licence is not None:
-                licence = (licence + '\n' +
-                           re.sub(r'^(?:[/ ]\*| \*/)?\s*(.*?)\s*$', r'\1',
-                                  line))
+                licence = (licence + '\n'
+                           + re.sub(r'^(?:[/ ]\*| \*/)?\s*(.*?)\s*$', r'\1',
+                                    line))
 
         # Finish last section if non-empty
         for b in binary: