@@ -63,7 +63,7 @@ def __getattr__(self, item):
         return self.__dict__[item.name]
 
     def __setattr__(self, key, value):
-        if key is "ppn" and "ppn" in self.__dict__:
+        if key == "ppn" and "ppn" in self.__dict__:
             raise Exception("Cannot change ppn !")
         with self._changelock:
             self._changes[key] = value
 
@@ -98,7 +98,7 @@ def __getattr__(self, item):
         return self.__dict__[item]
 
     def __setattr__(self, key, value):
-        if key is "uid" and "uid" in self.__dict__:
+        if key == "uid" and "uid" in self.__dict__:
             raise Exception("Cannot change uid !")
         with self._changelock:
             self._changes[key] = value
@@ -116,8 +116,9 @@ def get_attributes(self):
         return attributes
 
     def commit(self):
-        if len(self._changes) == 0:
+        if not self._changes:
             return True
         with self._changelock:
             for change in self._changes:
                 print(change)
+            return True
@@ -13,7 +13,7 @@ def encrypt_pin(pin, modulus, exponent):
 
 
 def convert_ipui(ipui):
-    if len(ipui) is not 10:
+    if len(ipui) != 10:
         return False
     emcHex = ipui[:5]
     psnHex = ipui[-5:]
@@ -26,6 +26,6 @@ def convert_ipui(ipui):
         chksum += int(c) * m
         m += 1
     chkdgt = chksum % 11
-    if chkdgt is 10:
+    if chkdgt == 10:
         chkdgt = '*'
     return '%s%s%s' % (emc, psn, chkdgt)