Fix for #345

kmmbvnr · Sep 15, 2016 · 04dec9d · 04dec9d
1 parent 97800d4
commit 04dec9d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/django_jenkins/tasks/run_csslint.py b/django_jenkins/tasks/run_csslint.py
@@ -34,7 +34,7 @@ def run(self, apps_locations, **options):
             process_output, err = process.communicate()
             retcode = process.poll()
             if retcode not in [0, 1]:  # normal csslint return codes
-                raise subprocess.CalledProcessError(retcode, cmd, output=output + '\n' + err)
+                raise subprocess.CalledProcessError(retcode, cmd, output='{}\n\n{}'.format(output, err))
 
             output.write(process_output.decode('utf-8'))
         else:

diff --git a/django_jenkins/tasks/run_jshint.py b/django_jenkins/tasks/run_jshint.py
@@ -27,7 +27,7 @@ def run(self, apps_locations, **options):
         jshint_output, err = process.communicate()
         retcode = process.poll()
         if retcode not in [0, 1, 2]:  # normal jshint return codes
-            raise subprocess.CalledProcessError(retcode, cmd, output='%s\n%s' % (jshint_output, err))
+            raise subprocess.CalledProcessError(retcode, cmd, output='{}\n\n{}'.format(output, err))
 
         output.write(jshint_output.decode('utf-8'))
         output.close()
diff --git a/django_jenkins/tasks/run_scsslint.py b/django_jenkins/tasks/run_scsslint.py
@@ -32,7 +32,7 @@ def run(self, apps_locations, **options):
             process_output, err = process.communicate()
             retcode = process.poll()
             if retcode not in [0, 1, 2]:  # normal scss-lint return codes
-                raise subprocess.CalledProcessError(retcode, cmd, output='%s\n%s' % (output, err))
+                raise subprocess.CalledProcessError(retcode, cmd, output='{}\n\n{}'.format(output, err))
 
             output.write(process_output.decode('utf-8'))
         else:

diff --git a/django_jenkins/tasks/run_sloccount.py b/django_jenkins/tasks/run_sloccount.py
@@ -13,7 +13,7 @@ def run(self, apps_locations, **options):
 
         retcode = process.poll()
         if retcode not in [0]:  # normal sloccount return codes
-            raise subprocess.CalledProcessError(retcode, cmd, output='%s\n%s' % (report_output, err))
+            raise subprocess.CalledProcessError(retcode, cmd, output='{}\n\n{}'.format(output, err))
 
         output.write(report_output.decode('utf-8'))
         output.close()