Changes in tools/config.py [4e9aaf5:28f4adb] in mainline

File:

• tools/config.py (modified) (11 diffs)

tools/config.py

@@ -48 +48 @@
         "Read saved values from last configuration run"
         
-        inf = file(fname, 'r')
+        inf = open(fname, 'r')
         
         for line in inf:
@@ -103 +103 @@
                 condval = res.group(3)
                 
-                if (not defaults.has_key(condname)):
+                if (not condname in defaults):
                         varval = ''
                 else:
@@ -131 +131 @@
         "Parse configuration file"
         
-        inf = file(fname, 'r')
+        inf = open(fname, 'r')
         
         name = ''
@@ -219 +219 @@
                         continue
                 
-                if (not defaults.has_key(varname)):
+                if (not varname in defaults):
                         return False
         
@@ -232 +232 @@
         
         try:
-                version = subprocess.Popen(['bzr', 'version-info', '--custom', '--template={clean}:{revno}:{revision_id}'], stdout = subprocess.PIPE).communicate()[0].split(':')
+                version = subprocess.Popen(['bzr', 'version-info', '--custom', '--template={clean}:{revno}:{revision_id}'], stdout = subprocess.PIPE).communicate()[0].decode().split(':')
                 sys.stderr.write("ok\n")
         except:
@@ -246 +246 @@
                 revision = None
         
-        outmk = file(mkname, 'w')
-        outmc = file(mcname, 'w')
+        outmk = open(mkname, 'w')
+        outmc = open(mcname, 'w')
         
         outmk.write('#########################################\n')
@@ -263 +263 @@
                         continue
                 
-                if (not defaults.has_key(varname)):
+                if (not varname in defaults):
                         default = ''
                 else:
@@ -368 +368 @@
                         # Cancel out all defaults which have to be deduced
                         for varname, vartype, name, choices, cond in ask_names:
-                                if ((vartype == 'y') and (defaults.has_key(varname)) and (defaults[varname] == '*')):
+                                if ((vartype == 'y') and (varname in defaults) and (defaults[varname] == '*')):
                                         defaults[varname] = None
                         
@@ -385 +385 @@
                                         position = cnt
                                 
-                                if (not defaults.has_key(varname)):
+                                if (not varname in defaults):
                                         default = None
                                 else:
@@ -428 +428 @@
                                 cnt += 1
                         
-                        if (position >= options):
+                        if (position != None) and (position >= len(options)):
                                 position = None
                         
@@ -449 +449 @@
                         
                         position = None
-                        if (not opt2row.has_key(value)):
+                        if (not value in opt2row):
                                 raise RuntimeError("Error selecting value: %s" % value)
                         
                         (selname, seltype, name, choices) = opt2row[value]
                         
-                        if (not defaults.has_key(selname)):
+                        if (not selname in defaults):
                                         default = None
                         else: