[tor-commits] [stem/master] Conforming to E241 (multiple spaces after ':')

[atagar at torproject.org]

commit 1af5594eda89aa0008f20d3c63f6447b0a4e44bf
Author: Damian Johnson <atagar at torproject.org>
Date:   Sun Jan 6 21:50:32 2013 -0800

    Conforming to E241 (multiple spaces after ':')
---
 stem/response/__init__.py              |    4 ++--
 stem/util/log.py                       |   10 +++++-----
 test/check_whitespace.py               |    2 +-
 test/integ/descriptor/networkstatus.py |   15 ++++++++++++---
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/stem/response/__init__.py b/stem/response/__init__.py
index 968fa8d..b838bd7 100644
--- a/stem/response/__init__.py
+++ b/stem/response/__init__.py
@@ -50,8 +50,8 @@ KEY_ARG = re.compile("^(\S+)=")
 # - logged messages about bugs
 # - the 'getinfo_helper_listeners' function of control.c
 
-CONTROL_ESCAPES = {r"\\": "\\",  r"\"": "\"",   r"\'": "'",
-                   r"\r": "\r",  r"\n": "\n",   r"\t": "\t"}
+CONTROL_ESCAPES = {r"\\": "\\", r"\"": "\"", r"\'": "'",
+                   r"\r": "\r", r"\n": "\n", r"\t": "\t"}
 
 def convert(response_type, message, **kwargs):
   """
diff --git a/stem/util/log.py b/stem/util/log.py
index 0def83b..88b4bd6 100644
--- a/stem/util/log.py
+++ b/stem/util/log.py
@@ -146,12 +146,12 @@ def log_once(message_id, runlevel, message):
     log(runlevel, message)
 
 # shorter aliases for logging at a runlevel
-def trace(message):  log(Runlevel.TRACE, message)
-def debug(message):  log(Runlevel.DEBUG, message)
-def info(message):   log(Runlevel.INFO, message)
+def trace(message): log(Runlevel.TRACE, message)
+def debug(message): log(Runlevel.DEBUG, message)
+def info(message): log(Runlevel.INFO, message)
 def notice(message): log(Runlevel.NOTICE, message)
-def warn(message):   log(Runlevel.WARN, message)
-def error(message):  log(Runlevel.ERROR, message)
+def warn(message): log(Runlevel.WARN, message)
+def error(message): log(Runlevel.ERROR, message)
 
 class LogBuffer(logging.Handler):
   """
diff --git a/test/check_whitespace.py b/test/check_whitespace.py
index 8419762..a91cf13 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"
+  ignored_issues = "E111,E121,W293,E501,E302,E701,E251,E261,W391,E127"
   
   issues = {}
   pep8_output = system.call("pep8 --ignore %s %s" % (ignored_issues, base_path))
diff --git a/test/integ/descriptor/networkstatus.py b/test/integ/descriptor/networkstatus.py
index 2e179ec..e9bfd69 100644
--- a/test/integ/descriptor/networkstatus.py
+++ b/test/integ/descriptor/networkstatus.py
@@ -126,9 +126,18 @@ class TestNetworkStatus(unittest.TestCase):
     
     # the document's expected client and server versions are the same
     expected_versions = [stem.version.Version(v) for v in (
-      "0.2.2.35",         "0.2.2.36",         "0.2.2.37",         "0.2.3.10-alpha",
-      "0.2.3.11-alpha",   "0.2.3.12-alpha",   "0.2.3.13-alpha",   "0.2.3.14-alpha",
-      "0.2.3.15-alpha",   "0.2.3.16-alpha",   "0.2.3.17-beta",    "0.2.3.18-rc",
+      "0.2.2.35",
+      "0.2.2.36",
+      "0.2.2.37",
+      "0.2.3.10-alpha",
+      "0.2.3.11-alpha",
+      "0.2.3.12-alpha",
+      "0.2.3.13-alpha",
+      "0.2.3.14-alpha",
+      "0.2.3.15-alpha",
+      "0.2.3.16-alpha",
+      "0.2.3.17-beta",
+      "0.2.3.18-rc",
       "0.2.3.19-rc",
     )]