commit b2a087ad2c84eaaa89d147fa92a5ef3c5f2f1b9a Author: Damian Johnson atagar@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))