commit 78e31b30ba411a3cfd5cd02864f483a555a25fd2
author James E. Blair <jeblair@openstack.org> Tue Jul 09 09:11:34 2013 -0700
committer Jenkins <jenkins@review.openstack.org> Thu Jul 11 21:51:13 2013 +0000
tree 0ebe4f24875194b50f0517d9c4daa65ef0099cf3
parent 98f0f3ed638828d209e3bb15279ef0c9957d56f8

Make E128 pep8 clean

Change-Id: I9ac6e301d361b7bac8561a1f468c40be23e1ddcc
Reviewed-on: https://review.openstack.org/36281
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins

tests/test_scheduler.py

diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 595451a..023ed35 100644
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -601,7 +601,7 @@
     def release(self, regex=None):
         builds = self.running_builds[:]
         self.log.debug("releasing build %s (%s)" % (regex,
-                                                   len(self.running_builds)))
+                                                    len(self.running_builds)))
         for build in builds:
             if not regex or re.match(regex, build.name):
                 self.log.debug("releasing build %s" %
@@ -1775,7 +1775,7 @@
         self.assertEqual(A.data['status'], 'NEW')
         self.assertEqual(A.reported, 1)
         self.assertEqual(self.getJobFromHistory('project-merge').result,
-                        'SUCCESS')
+                         'SUCCESS')
         self.assertEqual(self.getJobFromHistory('project-test1').result,
                          'SUCCESS')
         self.assertEqual(self.getJobFromHistory('project-test2').result,

tox.ini

diff --git a/tox.ini b/tox.ini
index 90003e7..d34a745 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,6 +33,6 @@
 commands = zuul-server -c etc/zuul.conf-sample -t -l {posargs}
 
 [flake8]
-ignore = E123,E125,E128,H
+ignore = E123,E125,H
 show-source = True
 exclude = .venv,.tox,dist,doc,build,*.egg

zuul/merger.py

diff --git a/zuul/merger.py b/zuul/merger.py
index d9199c8..8ab3ee8 100644
--- a/zuul/merger.py
+++ b/zuul/merger.py
@@ -123,7 +123,7 @@
     log = logging.getLogger("zuul.Merger")
 
     def __init__(self, trigger, working_root, push_refs, sshkey, email,
-            username):
+                 username):
         self.trigger = trigger
         self.repos = {}
         self.working_root = working_root
@@ -227,7 +227,7 @@
                                        target_ref=target_ref, mode=mode)
         # Sibling changes exist. Merge current change against newest sibling.
         elif (len(sibling_items) >= 2 and
-            sibling_items[-2].current_build_set.commit):
+              sibling_items[-2].current_build_set.commit):
             last_commit = sibling_items[-2].current_build_set.commit
             commit = self._mergeChange(item.change, last_commit,
                                        target_ref=target_ref, mode=mode)

zuul/scheduler.py

diff --git a/zuul/scheduler.py b/zuul/scheduler.py
index b92f187..52df7db 100644
--- a/zuul/scheduler.py
+++ b/zuul/scheduler.py
@@ -428,8 +428,8 @@
                             continue
                         item.change.project = project
                         severed = item in shared_queue.severed_heads
-                        if not new_pipeline.manager.reEnqueueItem(item,
-                                severed=severed):
+                        if not new_pipeline.manager.reEnqueueItem(
+                            item, severed=severed):
                             items_to_remove.append(item)
                 builds_to_remove = []
                 for build, item in old_pipeline.manager.building_jobs.items():