January 2013 - tor-commits - lists.torproject.org

[stem/master] Conforming to E271 (multiple spaces after keyword)
by atagar＠torproject.org 07 Jan '13

07 Jan '13

commit 6bc6c231e16122e66205e8e04b849f316fa6ada7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 6 19:51:13 2013 -0800 Conforming to E271 (multiple spaces after keyword) Caught an extra space in the ordereddict we brought in. Nice catch. --- stem/util/ordereddict.py | 2 +- test/check_whitespace.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/util/ordereddict.py b/stem/util/ordereddict.py index cb97874..4466097 100644 --- a/stem/util/ordereddict.py +++ b/stem/util/ordereddict.py @@ -119,7 +119,7 @@ class OrderedDict(dict, DictMixin): if isinstance(other, OrderedDict): if len(self) != len(other): return False - for p, q in zip(self.items(), other.items()): + for p, q in zip(self.items(), other.items()): if p != q: return False return True diff --git a/test/check_whitespace.py b/test/check_whitespace.py index 50fec10..46020f8 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,E271" + 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" issues = {} pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path))

1 0

[stem/master] Conforming to E502 (backslash to split lines)
by atagar＠torproject.org 07 Jan '13

07 Jan '13

commit b25d5332a8b10c70211c83df9f48ea7b97710fde Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 6 19:47:55 2013 -0800 Conforming to E502 (backslash to split lines) Ok, this one I think is stupid. "Thou shalt not have long lines" says PEP8, "... and thou shalt not spit up thy long lines." In two of the instances I agree, it wasn't buying us anything. But in the third it was actually making things more readable. Oh well, I'm not gonna put up a fuss over just one line of code. --- stem/descriptor/extrainfo_descriptor.py | 3 +-- stem/response/getconf.py | 3 +-- stem/response/getinfo.py | 3 +-- test/check_whitespace.py | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 284681b..25c9a82 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -645,8 +645,7 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): stats = remainder.split(",") if len(stats) != 4 or not \ - (stats[0].isdigit() and stats[1].isdigit() and \ - stats[2].isdigit() and stats[3].isdigit()): + (stats[0].isdigit() and stats[1].isdigit() and stats[2].isdigit() and stats[3].isdigit()): raise ValueError("conn-bi-direct line should end with four numeric values: %s" % line) self.conn_bi_direct_end = timestamp diff --git a/stem/response/getconf.py b/stem/response/getconf.py index 879c5c0..f8d55e7 100644 --- a/stem/response/getconf.py +++ b/stem/response/getconf.py @@ -31,8 +31,7 @@ class GetConfResponse(stem.response.ControlMessage): unrecognized_keywords.append(line[32:-1]) if unrecognized_keywords: - raise stem.InvalidArguments("552", "GETCONF request contained unrecognized keywords: %s" \ - % ', '.join(unrecognized_keywords), unrecognized_keywords) + raise stem.InvalidArguments("552", "GETCONF request contained unrecognized keywords: %s" % ', '.join(unrecognized_keywords), unrecognized_keywords) else: raise stem.ProtocolError("GETCONF response contained a non-OK status code:\n%s" % self) diff --git a/stem/response/getinfo.py b/stem/response/getinfo.py index c33618b..e68d4ae 100644 --- a/stem/response/getinfo.py +++ b/stem/response/getinfo.py @@ -31,8 +31,7 @@ class GetInfoResponse(stem.response.ControlMessage): unrecognized_keywords.append(line[18:-1]) if unrecognized_keywords: - raise stem.InvalidArguments("552", "GETINFO request contained unrecognized keywords: %s\n" \ - % ', '.join(unrecognized_keywords), unrecognized_keywords) + raise stem.InvalidArguments("552", "GETINFO request contained unrecognized keywords: %s\n" % ', '.join(unrecognized_keywords), unrecognized_keywords) else: raise stem.ProtocolError("GETINFO response didn't have an OK status:\n%s" % self) diff --git a/test/check_whitespace.py b/test/check_whitespace.py index dacd594..50fec10 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,E271,E502" + 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,E271" issues = {} pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path))

1 0

[stem/master] Conforming to E262 (inline comment should have a space after the '#')
by atagar＠torproject.org 07 Jan '13

07 Jan '13

commit 366f77882261031f86ac3d9a6217ae0379dc48cd Author: Damian Johnson <atagar(a)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

1 0

[stem/master] Conforming to E126 (continuation line over-indented for hanging indent)
by atagar＠torproject.org 07 Jan '13

07 Jan '13

commit 23b6ffd899370f3076a845c7de4bc92220a49eaa Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 6 20:01:28 2013 -0800 Conforming to E126 (continuation line over-indented for hanging indent) Ok, I haven't a clue what the hell this one was about. In one spot pep8 complained about the hanging indent. However, it looks right to me. For some odd reason it wants the hanging indent to match the 'stem.descriptor.networkstatus' import above - maybe this is a bug with pep8. Oh well. Changing our code to shut it up. --- test/check_whitespace.py | 2 +- test/unit/descriptor/networkstatus/document_v3.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/check_whitespace.py b/test/check_whitespace.py index 0f63dfc..06e5560 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" + ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201,E203,E124,E211,E222,E225,E221" issues = {} pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path)) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 000a614..009d365 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -20,8 +20,9 @@ from stem.descriptor.networkstatus import HEADER_STATUS_DOCUMENT_FIELDS, \ NetworkStatusDocumentV3, \ parse_file -from stem.descriptor.router_status_entry import RouterStatusEntryV3, \ - RouterStatusEntryMicroV3 +from stem.descriptor.router_status_entry import \ + RouterStatusEntryV3, \ + RouterStatusEntryMicroV3 from test.mocking import support_with, \ get_router_status_entry_v3, \

1 0

[stem/master] Conforming to E225 (missing whitespace around operator)
by atagar＠torproject.org 07 Jan '13

07 Jan '13

commit 28a39f1127c7b455076e86364eb4880ae19e9c18 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 6 20:12:50 2013 -0800 Conforming to E225 (missing whitespace around operator) Ok, PEP8 is trying to make me like it again. These I definitely agree with. Shame on me for letting 'em slip in. --- stem/control.py | 4 ++-- test/check_whitespace.py | 2 +- test/mocking.py | 24 ++++++++++++++++++++---- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/stem/control.py b/stem/control.py index 6dfb7f2..6435c38 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1676,7 +1676,7 @@ class Controller(BaseController): :raises: :class:`stem.InvalidRequest` if not enough information is provided """ - response = self.msg("CLOSECIRCUIT %s %s"% (str(circuit_id), flag)) + response = self.msg("CLOSECIRCUIT %s %s" % (circuit_id, flag)) stem.response.convert("SINGLELINE", response) if not response.is_ok(): @@ -1757,7 +1757,7 @@ class Controller(BaseController): # there's a single value offset between RelayEndReason.index_of() and the # value that tor expects since tor's value starts with the index of one - response = self.msg("CLOSESTREAM %s %s %s"% (stream_id, stem.RelayEndReason.index_of(reason) + 1, flag)) + response = self.msg("CLOSESTREAM %s %s %s" % (stream_id, stem.RelayEndReason.index_of(reason) + 1, flag)) stem.response.convert("SINGLELINE", response) if not response.is_ok(): diff --git a/test/check_whitespace.py b/test/check_whitespace.py index d6ad946..7bb1437 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" + ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201,E203,E124,E211,E222" issues = {} pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path)) diff --git a/test/mocking.py b/test/mocking.py index 259d88d..693d977 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -859,61 +859,76 @@ 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 + 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 + new_sk = signing_key_token + signing_key_token_start + public_key_string + signing_key_token_end # update the descriptor string with the new signing key + skt_start = desc_content.find(signing_key_token) skt_end = desc_content.find(signing_key_token_end, skt_start) - desc_content = desc_content[:skt_start]+new_sk+ desc_content[skt_end+len(signing_key_token_end):] + desc_content = desc_content[:skt_start] + new_sk + desc_content[skt_end + len(signing_key_token_end):] # generate the new fingerprint string + key_hash = hashlib.sha1(seq_as_string).hexdigest().upper() grouped_fingerprint = "" + for x in range(0, len(key_hash), 4): grouped_fingerprint += " " + key_hash[x:x+4] fingerprint_token = "\nfingerprint" new_fp = fingerprint_token + grouped_fingerprint # update the descriptor string with the new fingerprint + ft_start = desc_content.find(fingerprint_token) if ft_start < 0: fingerprint_token = "\nopt fingerprint" ft_start = desc_content.find(fingerprint_token) # if the descriptor does not already contain a fingerprint do not add one + if ft_start >= 0: ft_end = desc_content.find("\n", ft_start+1) desc_content = desc_content[:ft_start]+new_fp+desc_content[ft_end:] # create a temporary object to use to calculate the digest + tempDesc = stem.descriptor.server_descriptor.RelayDescriptor(desc_content, validate=False) + # calculate the new digest for the descriptor + new_digest_hex = tempDesc.digest().lower() + # remove the hex encoding + new_digest = new_digest_hex.decode('hex') # Generate the digest buffer. # block is 128 bytes in size # 2 bytes for the type info # 1 byte for the separator + padding = "" + for x in range(125 - len(new_digest)): padding += '\xFF' digestBuffer = '\x00\x01' + padding + '\x00' + new_digest # generate a new signature by signing the digest buffer with the private key + (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 + router_signature_token = "\nrouter-signature\n" router_signature_start = "-----BEGIN SIGNATURE-----\n" router_signature_end = "\n-----END SIGNATURE-----\n" @@ -921,3 +936,4 @@ def sign_descriptor_content(desc_content): desc_content = desc_content[:rst_start] + router_signature_token + router_signature_start + signature_base64 + router_signature_end return desc_content +

1 0

[stem/master] Conforming to E222 (multiple spaces after operator)
by atagar＠torproject.org 07 Jan '13

07 Jan '13

commit 64113e5a505d8c7b57933ab2d1e3c0a4d6feac6d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 6 20:14:40 2013 -0800 Conforming to E222 (multiple spaces after operator) Extra space around an assignment. Oops. --- 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 7bb1437..b627b6c 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" + ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201,E203,E124,E211" issues = {} pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path)) diff --git a/test/mocking.py b/test/mocking.py index 693d977..e17513b 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

1 0

[stem/master] Conforming to E211 (whitespace before '[')
by atagar＠torproject.org 07 Jan '13

07 Jan '13

commit e08c0f6604a80509c001899e39553b17a21ebc0f Author: Damian Johnson <atagar(a)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

1 0

[stem/master] Conforming to E124 (closing bracket does not match visual indentation)
by atagar＠torproject.org 07 Jan '13

07 Jan '13

commit 708bcad9746e4b757fd14555ed8bf13e50990475 Author: Damian Johnson <atagar(a)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'), ], }

1 0

[stem/master] Conforming to E203 (whitespace before ':')
by atagar＠torproject.org 07 Jan '13

07 Jan '13

commit 6a32f1a257cc1f7bf7d8499dea7d2a5df5e9d9c0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 6 20:21:25 2013 -0800 Conforming to E203 (whitespace before ':') Meh. I'm having trouble thinking of this as either any better or worse. --- stem/response/__init__.py | 2 +- stem/util/connection.py | 4 ++-- test/check_whitespace.py | 2 +- test/unit/response/protocolinfo.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 06c80ca..968fa8d 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -408,7 +408,7 @@ def _parse_entry(line, quoted, escaped): if start_quote != 0 or end_quote == -1: raise ValueError("the next entry isn't a quoted value: " + line) - next_entry, remainder = remainder[1 : end_quote], remainder[end_quote + 1:] + next_entry, remainder = remainder[1:end_quote], remainder[end_quote + 1:] else: # non-quoted value, just need to check if there's more data afterward if " " in remainder: next_entry, remainder = remainder.split(" ", 1) diff --git a/stem/util/connection.py b/stem/util/connection.py index 6a0a8d1..c325bd9 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -172,7 +172,7 @@ def get_mask(bits): mask_bin = get_binary(2 ** bits - 1, 32)[::-1] # breaks it into eight character groupings - octets = [mask_bin[8 * i : 8 * (i + 1)] for i in xrange(4)] + octets = [mask_bin[8 * i:8 * (i + 1)] for i in xrange(4)] # converts each octet into its integer value return ".".join([str(int(octet, 2)) for octet in octets]) @@ -222,7 +222,7 @@ def get_mask_ipv6(bits): mask_bin = get_binary(2 ** bits - 1, 128)[::-1] # breaks it into sixteen character groupings - groupings = [mask_bin[16 * i : 16 * (i + 1)] for i in xrange(8)] + groupings = [mask_bin[16 * i:16 * (i + 1)] for i in xrange(8)] # converts each group into its hex value return ":".join(["%04x" % int(group, 2) for group in groupings]).upper() diff --git a/test/check_whitespace.py b/test/check_whitespace.py index 2c2235c..5e05c53 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" + ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226,E231,E202,E201" issues = {} pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path)) diff --git a/test/unit/response/protocolinfo.py b/test/unit/response/protocolinfo.py index 6bc01eb..23b8173 100644 --- a/test/unit/response/protocolinfo.py +++ b/test/unit/response/protocolinfo.py @@ -139,7 +139,7 @@ class TestProtocolInfoResponse(unittest.TestCase): stem.response.convert("PROTOCOLINFO", control_message) self.assertEquals(5, control_message.protocol_version) - self.assertEquals(None , control_message.tor_version) + self.assertEquals(None, control_message.tor_version) self.assertEquals((), control_message.auth_methods) self.assertEquals((), control_message.unknown_auth_methods) self.assertEquals(None, control_message.cookie_path)

1 0

[stem/master] Conforming to E231 (missing whitespace after ':')
by atagar＠torproject.org 07 Jan '13

07 Jan '13

commit b2a087ad2c84eaaa89d147fa92a5ef3c5f2f1b9a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 6 20:26:17 2013 -0800 Conforming to E231 (missing whitespace after ':') Another nice catch. --- test/check_whitespace.py | 2 +- test/unit/response/events.py | 6 +++--- test/unit/util/proc.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/check_whitespace.py b/test/check_whitespace.py index ed4cfe4..b566106 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" + ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127,E241,E128,E226" issues = {} pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path)) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 91276b7..57dda95 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -347,7 +347,7 @@ class TestEvents(unittest.TestCase): event = _get_event('650 NONE SOLID "NON SENSE" condition=MEH quoted="1 2 3"') self.assertEqual("NONE", event.type) self.assertEqual(["SOLID", '"NON', 'SENSE"'], event.positional_args) - self.assertEqual({"condition":"MEH", "quoted":"1 2 3"}, event.keyword_args) + self.assertEqual({"condition": "MEH", "quoted": "1 2 3"}, event.keyword_args) def test_log_events(self): event = _get_event("650 DEBUG connection_edge_process_relay_cell(): Got an extended cell! Yay.") @@ -515,7 +515,7 @@ class TestEvents(unittest.TestCase): self.assertEqual(CIRC_EXTENDED_OLD.lstrip("650 "), str(event)) self.assertEqual("1", event.id) self.assertEqual(CircStatus.EXTENDED, event.status) - self.assertEqual((("E57A476CD4DFBD99B4EE52A100A58610AD6E80B9", None), (None,"hamburgerphone")), event.path) + self.assertEqual((("E57A476CD4DFBD99B4EE52A100A58610AD6E80B9", None), (None, "hamburgerphone")), event.path) self.assertEqual(None, event.build_flags) self.assertEqual(None, event.purpose) self.assertEqual(None, event.hs_state) @@ -530,7 +530,7 @@ class TestEvents(unittest.TestCase): self.assertEqual(CIRC_BUILT_OLD.lstrip("650 "), str(event)) self.assertEqual("1", event.id) self.assertEqual(CircStatus.BUILT, event.status) - self.assertEqual((("E57A476CD4DFBD99B4EE52A100A58610AD6E80B9", None), (None,"hamburgerphone"), (None, "PrivacyRepublic14")), event.path) + self.assertEqual((("E57A476CD4DFBD99B4EE52A100A58610AD6E80B9", None), (None, "hamburgerphone"), (None, "PrivacyRepublic14")), event.path) self.assertEqual(None, event.build_flags) self.assertEqual(None, event.purpose) self.assertEqual(None, event.hs_state) diff --git a/test/unit/util/proc.py b/test/unit/util/proc.py index 5f775f1..3cad349 100644 --- a/test/unit/util/proc.py +++ b/test/unit/util/proc.py @@ -66,7 +66,7 @@ class TestProc(unittest.TestCase): mocking.mock(proc._get_lines, mocking.return_for_args({ ('/proc/1111/status', ('VmRSS:', 'VmSize:'), 'memory usage'): - {'VmRSS:':'VmRSS: 100 kB', 'VmSize:':'VmSize: 1800 kB'} + {'VmRSS:': 'VmRSS: 100 kB', 'VmSize:': 'VmSize: 1800 kB'} })) self.assertEqual((0, 0), proc.get_memory_usage(0))

1 0