Misc changes

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

XSConsoleData.py

@@ -65,7 +65,7 @@ def DataCache(self):
     def GetData(self, inNames, inDefault = None):
         data = self.data
         for name in inNames:
-            if name is '__repr__':
+            if name == '__repr__':
                 # Error - missing ()
                 raise Exception('Data call Data.' + '.'.join(inNames[:-1]) + ' must end with ()')
             elif name in data:
@@ -1058,7 +1058,7 @@ def IsXAPIRunning(self):
                 pidfile = "/var/run/xapi.pid"
             if pidfile:
                 # Look for any "xapi" running
-                pid = file(pidfile).read().strip()
+                pid = open(pidfile, "r").read().strip()
                 exelink = "/proc/%s/exe" % (pid)
                 if os.path.exists(exelink):
                     if os.path.basename(os.readlink(exelink)) == "xapi":

XSConsoleUtils.py

@@ -198,7 +198,7 @@ def ValidateIP(cls, text):
         for i in ints:
             if i > 255: return False
             largest = max(largest, i)
-        if largest is 0: return False
+        if largest == 0: return False
         return True
 
     @classmethod

simpleconfig.py

@@ -24,7 +24,7 @@
 def uppercase_ASCII_string(str):
     newstr = ""
     for i in range(0, len(str)):
-        if str[i] in string.lowercase:
+        if str[i].islower():
             newstr += chr(ord(str[i]) - 32)
         else:
             newstr += str[i]