No need for types, use isinstance

diff --git a/Lib/compiler/misc.py b/Lib/compiler/misc.py
index 6d5eaa83b0d3f57775da7d60be1d022ec7fa878a..8d9177092744d100c523c4ff71a03e7b87593481 100644 (file)
--- a/Lib/compiler/misc.py
+++ b/Lib/compiler/misc.py
@@ -1,9 +1,8 @@
-import types
 
 def flatten(tup):
     elts = []
     for elt in tup:
-        if type(elt) == types.TupleType:
+        if isinstance(elt, tuple):
             elts = elts + flatten(elt)
         else:
             elts.append(elt)

diff --git a/Lib/compiler/pyassem.py b/Lib/compiler/pyassem.py
index e1fb063193e091fb9d4543ee61f63f5ae9ad7d95..7b6cee651327a9ec9d46971bb172b220b08d338a 100644 (file)
--- a/Lib/compiler/pyassem.py
+++ b/Lib/compiler/pyassem.py
@@ -3,7 +3,6 @@
 import dis
 import new
 import sys
-import types
 
 from compiler import misc
 from compiler.consts \
@@ -641,7 +640,7 @@ def getArgCount(args):
 
 def twobyte(val):
     """Convert an int argument into high and low bytes"""
-    assert type(val) == types.IntType
+    assert isinstance(val, int)
     return divmod(val, 256)
 
 class LineAddrTable:

diff --git a/Lib/compiler/pycodegen.py b/Lib/compiler/pycodegen.py
index 87558b211b1569525eba0a404d8a496ec690c582..4866e0e8cb6bf69764cdf3280a0ef2a0100346bc 100644 (file)
--- a/Lib/compiler/pycodegen.py
+++ b/Lib/compiler/pycodegen.py
@@ -3,7 +3,6 @@ import os
 import marshal
 import struct
 import sys
-import types
 from cStringIO import StringIO
 
 from compiler import ast, parse, walk, syntax
@@ -1312,7 +1311,7 @@ class AbstractFunctionCode:
     def generateArgUnpack(self, args):
         for i in range(len(args)):
             arg = args[i]
-            if type(arg) == types.TupleType:
+            if isinstance(arg, tuple):
                 self.emit('LOAD_FAST', '.%d' % (i * 2))
                 self.unpackSequence(arg)
 
@@ -1322,7 +1321,7 @@ class AbstractFunctionCode:
         else:
             self.emit('UNPACK_TUPLE', len(tup))
         for elt in tup:
-            if type(elt) == types.TupleType:
+            if isinstance(elt, tuple):
                 self.unpackSequence(elt)
             else:
                 self._nameOp('STORE', elt)
@@ -1408,9 +1407,9 @@ def generateArgList(arglist):
     count = 0
     for i in range(len(arglist)):
         elt = arglist[i]
-        if type(elt) == types.StringType:
+        if isinstance(elt, str):
             args.append(elt)
-        elif type(elt) == types.TupleType:
+        elif isinstance(elt, tuple):
             args.append(TupleArg(i * 2, elt))
             extra.extend(misc.flatten(elt))
             count = count + 1