some more refactoring

stamparm · stamparm · commit 0e23521adce2 · 2012-02-16T09:54:29.000Z
diff --git a/lib/core/bigarray.py b/lib/core/bigarray.py
@@ -7,6 +7,7 @@
 See the file 'doc/COPYING' for copying permission
 """
 
+import os
 import pickle
 import tempfile
 
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -286,12 +286,12 @@ def setDbms(dbms):
             msg += "correct [%s (default)/%s] " % (kb.dbms, dbms)
 
             while True:
-                inp = readInput(msg, default=kb.dbms)
+                _ = readInput(msg, default=kb.dbms)
 
-                if aliasToDbmsEnum(inp) == kb.dbms:
+                if aliasToDbmsEnum(_) == kb.dbms:
                     break
-                elif aliasToDbmsEnum(inp) == dbms:
-                    kb.dbms = aliasToDbmsEnum(inp)
+                elif aliasToDbmsEnum(_) == dbms:
+                    kb.dbms = aliasToDbmsEnum(_)
                     break
                 else:
                     warnMsg = "invalid value"
@@ -344,12 +344,12 @@ def setOs(os):
             msg += "correct [%s (default)/%s] " % (kb.os, os)
 
             while True:
-                inp = readInput(msg, default=kb.os)
+                _ = readInput(msg, default=kb.os)
 
-                if inp == kb.os:
+                if _ == kb.os:
                     break
-                elif inp == os:
-                    kb.os = inp.capitalize()
+                elif _ == os:
+                    kb.os = _.capitalize()
                     break
                 else:
                     warnMsg = "invalid value"
@@ -383,10 +383,10 @@ def setArch():
         msg += "\n[2] 64-bit"
 
         while True:
-            arch = readInput(msg, default='1')
+            _ = readInput(msg, default='1')
 
-            if isinstance(arch, basestring) and arch.isdigit() and int(arch) in ( 1, 2 ):
-                if int(arch) == 1:
+            if isinstance(_, basestring) and _.isdigit() and int(_) in ( 1, 2 ):
+                if int(_) == 1:
                     kb.arch = 32
                 else:
                     kb.arch = 64
diff --git a/lib/core/threads.py b/lib/core/threads.py
@@ -61,6 +61,7 @@ def getCurrentThreadUID():
     return hash(threading.currentThread())
 
 def readInput(message, default=None):
+    # It will be overwritten by original from lib.core.common
     pass
 
 def getCurrentThreadData():
