Merge pull request #695 from ken0nek/master

Use "is None" and add space after comma

Author: gribozavr

stdlib/public/common/MirrorCommon.py

@@ -14,23 +14,23 @@
 # If you edit this, make sure to also accordingly tweak the actual template files.
 
 def getDisposition(disp=None):
-  if disp == None:
+  if disp is None:
     return '.Aggregate'
   if len(disp) == 0 or disp[0] != '.':
     disp = '.' + disp
   return disp
 
-def _getGenericArgStrings(genericArgs=None,genericConstraints=None):
-  if genericArgs == None:
+def _getGenericArgStrings(genericArgs=None, genericConstraints=None):
+  if genericArgs is None:
     return ('','')
   genericArgString = ''
   first = True
   for arg in genericArgs:
     if not first:
-      genericArgString  = genericArgString + ','
+      genericArgString = genericArgString + ','
     first = False
     genericArgString = genericArgString + arg
-  if genericConstraints == None:
+  if genericConstraints is None:
     genericConstraintString = genericArgString
   else:
     genericConstraintString = ''
@@ -45,11 +45,11 @@ def _getGenericArgStrings(genericArgs=None,genericConstraints=None):
         genericConstraintString = genericConstraintString + ' : ' + cons
   genericArgString = '<' + genericArgString + '>'
   genericConstraintString = '<' + genericConstraintString + '>'
-  return (genericArgString,genericConstraintString)
+  return (genericArgString, genericConstraintString)
 
-def getGenericArgString(genericArgs=None,genericConstraints=None):
-  return _getGenericArgStrings(genericArgs,genericConstraints)[0]
+def getGenericArgString(genericArgs=None, genericConstraints=None):
+  return _getGenericArgStrings(genericArgs, genericConstraints)[0]
 
-def getGenericConstraintString(genericArgs=None,genericConstraints=None):
-  return _getGenericArgStrings(genericArgs,genericConstraints)[1]
+def getGenericConstraintString(genericArgs=None, genericConstraints=None):
+  return _getGenericArgStrings(genericArgs, genericConstraints)[1]
 

utils/cmpcodesize/cmpcodesize/compare.py

@@ -42,7 +42,7 @@
 
 
 def addFunction(sizes, function, startAddr, endAddr, groupByPrefix):
-    if not function or startAddr == None or endAddr == None:
+    if not function or startAddr is None or endAddr is None:
         return
 
     size = endAddr - startAddr
@@ -113,7 +113,7 @@ def readSizes(sizes, fileName, functionDetails, groupByPrefix):
         asmlineMatch = asmlinePattern.match(line)
         if asmlineMatch:
             addr = int(asmlineMatch.group(1), 16)
-            if startAddr == None:
+            if startAddr is None:
                 startAddr = addr
             endAddr = addr
         elif line == "Section":
@@ -142,7 +142,7 @@ def readSizes(sizes, fileName, functionDetails, groupByPrefix):
 def compareSizes(oldSizes, newSizes, nameKey, title):
     oldSize = oldSizes[nameKey]
     newSize = newSizes[nameKey]
-    if oldSize != None and newSize != None:
+    if oldSize is not None and newSize is not None:
         if oldSize != 0:
             perc = "%.1f%%" % ((1.0 - float(newSize) / float(oldSize)) * 100.0)
         else: