commit e08c0f6604a80509c001899e39553b17a21ebc0f Author: Damian Johnson atagar@torproject.org Date: Sun Jan 6 20:16:12 2013 -0800

Conforming to E211 (whitespace before '[')

Another nice catch by pep8. --- test/check_whitespace.py | 2 +- test/mocking.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/check_whitespace.py b/test/check_whitespace.py index b627b6c..a9c8549 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,E211" + ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201,E203,E124"

issues = {} pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path)) diff --git a/test/mocking.py b/test/mocking.py index e17513b..ef4a209 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -859,7 +859,7 @@ def sign_descriptor_content(desc_content): public_key_string = base64.b64encode(seq_as_string)

# split public key into lines 64 characters long - public_key_string = public_key_string [:64] + "\n" + public_key_string[64:128] + "\n" + public_key_string[128:] + public_key_string = public_key_string[:64] + "\n" + public_key_string[64:128] + "\n" + public_key_string[128:]

# generate the new signing key string

@@ -925,7 +925,7 @@ def sign_descriptor_content(desc_content): (signature, ) = private_key.sign(digestBuffer, None) signature_as_bytes = long_to_bytes(signature, 128) signature_base64 = base64.b64encode(signature_as_bytes) - signature_base64 = signature_base64 [:64] + "\n" + signature_base64[64:128] + "\n" + signature_base64[128:] + signature_base64 = signature_base64[:64] + "\n" + signature_base64[64:128] + "\n" + signature_base64[128:]

# update the descriptor string with the new signature