commit 708bcad9746e4b757fd14555ed8bf13e50990475 Author: Damian Johnson atagar@torproject.org Date: Sun Jan 6 20:18:55 2013 -0800

Conforming to E124 (closing bracket does not match visual indentation)

This one seems to be another false alarm, but can't expect it to always be right. --- test/check_whitespace.py | 2 +- test/unit/control/controller.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/check_whitespace.py b/test/check_whitespace.py index a9c8549..2c2235c 100644 --- a/test/check_whitespace.py +++ b/test/check_whitespace.py @@ -47,7 +47,7 @@ def pep8_issues(base_path = DEFAULT_TARGET): # We're gonna trim these down by cateogry but include the pep8 checks to # prevent regression.

- ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201,E203,E124" + ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201,E203"

issues = {} pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path)) diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index af6df3b..624de39 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -277,9 +277,10 @@ class TestControl(unittest.TestCase): '$999A226EBED397F331B612FE1E4CFAE5C1F201BA=piyaz': [('999A226EBED397F331B612FE1E4CFAE5C1F201BA', 'piyaz')], '$E57A476CD4DFBD99B4EE52A100A58610AD6E80B9,hamburgerphone,PrivacyRepublic14': - [('E57A476CD4DFBD99B4EE52A100A58610AD6E80B9', None), - (None, 'hamburgerphone'), - (None, 'PrivacyRepublic14'), + [ + ('E57A476CD4DFBD99B4EE52A100A58610AD6E80B9', None), + (None, 'hamburgerphone'), + (None, 'PrivacyRepublic14'), ], }