[tor-commits] [arm/master] Static check issues

[atagar at torproject.org]

commit dc499f02ec64aa5ad6b00e1a9e3d600f985a0293
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Sep 13 14:27:39 2014 -0700

    Static check issues
    
    Few issues spotted by my netbook's version of pyflakes. Little surprised since
    it's older than my desktop...
---
 arm/controller.py               |    2 +-
 arm/graphing/bandwidth_stats.py |    4 +---
 arm/header_panel.py             |    2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/arm/controller.py b/arm/controller.py
index 457da4e..cb0cf3e 100644
--- a/arm/controller.py
+++ b/arm/controller.py
@@ -201,7 +201,7 @@ def init_controller(stdscr, start_time):
       try:
         missing_seconds = bw_stats.prepopulate_from_state()
 
-        if missing_sec:
+        if missing_seconds:
           log.notice(msg('panel.graphing.prepopulation_successful', duration = str_tools.time_label(missing_seconds, 0, True)))
         else:
           log.notice(msg('panel.graphing.prepopulation_all_successful'))
diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py
index a766435..1067e90 100644
--- a/arm/graphing/bandwidth_stats.py
+++ b/arm/graphing/bandwidth_stats.py
@@ -14,9 +14,7 @@ from arm.graphing import graph_panel
 from arm.util import tor_controller
 
 from stem.control import State
-from stem.util import conf, log, str_tools, system
-
-from arm.util import msg
+from stem.util import conf, str_tools, system
 
 
 def conf_handler(key, value):
diff --git a/arm/header_panel.py b/arm/header_panel.py
index 2d13feb..5dc3127 100644
--- a/arm/header_panel.py
+++ b/arm/header_panel.py
@@ -108,7 +108,7 @@ class HeaderPanel(panel.Panel, threading.Thread):
         try:
           controller.authenticate()  # TODO: should account for our chroot
         except stem.connection.MissingPassword:
-          password = cli.popups.input_prompt('Controller Password: ')
+          password = arm.popups.input_prompt('Controller Password: ')
 
           if password:
             controller.authenticate(password)