[tor-commits] [arm/master] fix: couple issues spotted by pylint

atagar at torproject.org atagar at torproject.org
Sun Jul 17 05:33:49 UTC 2011


commit 7bd1d2af1d27ce91f179b63a6fcf0f95090b19b8
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Jul 16 21:55:15 2011 -0700

    fix: couple issues spotted by pylint
---
 src/util/__init__.py  |    2 +-
 src/util/panel.py     |    1 -
 src/util/torConfig.py |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/util/__init__.py b/src/util/__init__.py
index 365e82a..cd5d721 100644
--- a/src/util/__init__.py
+++ b/src/util/__init__.py
@@ -4,5 +4,5 @@ application's status, making cross platform system calls, parsing tor data,
 and safely working with curses (hiding some of the gory details).
 """
 
-__all__ = ["conf", "connections", "enum", "hostnames", "log", "panel", "procTools", "procName", "sysTools", "torConfig", "torTools", "uiTools"]
+__all__ = ["conf", "connections", "enum", "gtkTools", "hostnames", "log", "panel", "procTools", "procName", "sysTools", "torConfig", "torTools", "uiTools"]
 
diff --git a/src/util/panel.py b/src/util/panel.py
index 5a96623..bb47726 100644
--- a/src/util/panel.py
+++ b/src/util/panel.py
@@ -4,7 +4,6 @@ Wrapper for safely working with curses subwindows.
 
 import copy
 import time
-import traceback
 import curses
 import curses.ascii
 import curses.textpad
diff --git a/src/util/torConfig.py b/src/util/torConfig.py
index 2eca571..e4570ca 100644
--- a/src/util/torConfig.py
+++ b/src/util/torConfig.py
@@ -146,7 +146,7 @@ def loadOptionDescriptions(loadPath = None, checkVersion = True):
           category = inputFileContents.pop(0).rstrip()
           if not category in Category.values():
             baseMsg = "invalid category in input file: '%s'"
-            raise IOError(baseMsg % categoryStr)
+            raise IOError(baseMsg % category)
           
           # gets the position in the man page
           indexArg, indexStr = -1, inputFileContents.pop(0).rstrip()





More information about the tor-commits mailing list