commit 366f77882261031f86ac3d9a6217ae0379dc48cd Author: Damian Johnson atagar@torproject.org Date: Sun Jan 6 19:52:58 2013 -0800

Conforming to E262 (inline comment should have a space after the '#')

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

diff --git a/test/check_whitespace.py b/test/check_whitespace.py index 46020f8..0f63dfc 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,E222,E225,E221,E126,E262" + ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201,E203,E124,E211,E222,E225,E221,E126"

issues = {} pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path)) diff --git a/test/mocking.py b/test/mocking.py index 6784bde..259d88d 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -862,7 +862,7 @@ def sign_descriptor_content(desc_content): public_key_string = public_key_string [:64] + "\n" +public_key_string[64:128] +"\n" +public_key_string[128:]

# generate the new signing key string - signing_key_token = "\nsigning-key\n" #note the trailing '\n' is important here so as not to match the string elsewhere + signing_key_token = "\nsigning-key\n" # note the trailing '\n' is important here so as not to match the string elsewhere signing_key_token_start = "-----BEGIN RSA PUBLIC KEY-----\n" signing_key_token_end = "\n-----END RSA PUBLIC KEY-----\n" new_sk = signing_key_token+ signing_key_token_start+public_key_string+signing_key_token_end