Misc changes

Signed-off-by: Qin Zhang （张琴） <qin.zhang@citrix.com>

XSConsoleData.py

@@ -623,7 +623,7 @@ def Match(self, inLine, inRegExp, inKey):
     def MultipleMatch(self, inLine, inRegExp, inKey):
         match = re.match(inRegExp, inLine)
         if match:
-            if not self.data['dmi'].has_key(inKey):
+            if inKey not in self.data['dmi']:
                 self.data['dmi'][inKey] = []
             self.data['dmi'][inKey].append(match.group(1))
 

XSConsoleHotData.py

@@ -71,7 +71,7 @@ def __iter__(self):
 
     # This method will hide fields called 'next' in the xapi database.  If any appear, __iter__ will need to
     # return a new object type and this method will need to be moved into that
-    def next(self):
+    def __next__(self):
         if len(self.iterKeys) <= 0:
             raise StopIteration
         retVal = HotAccessor(self.name[:], self.refs[:]) # [:] copies the array

XSConsoleMenus.py

@@ -187,7 +187,7 @@ def Reset(self):
         self.CurrentMenu().HandleEnter()
 
     def AddChoice(self, inMenuName, inChoiceDef, inPriority = None):
-        if not self.menus.has_key(inMenuName):
+        if inMenuName not in self.menus:
             raise Exception(Lang("Unknown menu '")+inMenuName+"'")
 
         self.menus[inMenuName].AddChoiceDef(inChoiceDef, inPriority)

XSConsoleState.py

@@ -136,7 +136,7 @@ def SaveIfRequired(self):
             self.MakeSane()
             try:
                 if not os.path.isdir(self.savePath):
-                    os.mkdir(self.savePath, 0700)
+                    os.mkdir(self.savePath, 0o700)
 
                 saveFile = open(self.SaveFilename(), "w")
                 pickler = pickle.Pickler(saveFile)

simpleconfig.py

@@ -18,30 +18,32 @@
 import os
 import shutil
 
+
 # use our own ASCII only uppercase function to avoid locale issues
 # not going to be fast but not important
 def uppercase_ASCII_string(str):
     newstr = ""
-    for i in range(0,len(str)):
-	if str[i] in string.lowercase:
-	    newstr += chr(ord(str[i])-32)
-	else:
-	    newstr += str[i]
+    for i in range(0, len(str)):
+        if str[i] in string.lowercase:
+            newstr += chr(ord(str[i]) - 32)
+        else:
+            newstr += str[i]
 
     return newstr
 
+
 class SimpleConfigFile:
-    def __str__ (self):
+    def __str__(self):
         s = ""
-        keys = self.info.keys ()
-        keys.sort ()
+        keys = list(self.info.keys())
+        keys.sort()
         for key in keys:
             # FIXME - use proper escaping
-            if type (self.info[key]) == type(""):
+            if type(self.info[key]) == type(""):
                 s = s + key + "=\"" + self.info[key] + "\"\n"
         return s
 
-    def __init__ (self):
+    def __init__(self):
         self.info = {}
 
     def write(self, file):
@@ -69,17 +71,17 @@ def read(self, file):
             value = value.replace("'", '')
             self.info[key] = value
 
-    def set (self, *args):
+    def set(self, *args):
         for (key, data) in args:
             self.info[uppercase_ASCII_string(key)] = data
 
-    def unset (self, *keys):
+    def unset(self, *keys):
         for key in keys:
             key = uppercase_ASCII_string(key)
-            if self.info.has_key (key):
-               del self.info[key]
+            if key in self.info:
+                del self.info[key]
 
-    def get (self, key):
+    def get(self, key):
         key = uppercase_ASCII_string(key)
         return self.info.get(key, "")
 
@@ -132,4 +134,3 @@ def write(self, dir=None):
             path = os.path.join(dir, os.path.basename(self.path))
 
         SimpleConfigFile.write(self, path)
-