Remove more dead code and Python 2.x cruft

DinoV · DinoV · commit b3341b381ca4 · 2021-01-28T11:14:38.000-08:00
Summary: Cleaning up more random cruft - there's some simple dead code, and some support for Python 2 that we don't need

Test Plan: ./python -m test.test_compiler
diff --git a/compiler/pyassem.py b/compiler/pyassem.py
@@ -9,24 +9,11 @@
 from compiler import misc
 from compiler.consts \
      import CO_OPTIMIZED, CO_NEWLOCALS, CO_VARARGS, CO_VARKEYWORDS
+from types import CodeType
 from .peephole import Optimizer
 
 EXTENDED_ARG = dis.opname.index('EXTENDED_ARG')
 
-VERSION = sys.version_info[0]
-if VERSION < 3:
-    def CodeType(*args):
-        args = list(args)
-        del args[1]
-        return types.CodeType(*args)
-    org_bytes = bytes
-    def bytes(l):
-        assert isinstance(l, list)
-        return org_bytes(bytearray(l))
-else:
-    CodeType = types.CodeType
-    long = int
-
 
 def instrsize(oparg):
     if oparg <= 0xff:
@@ -661,15 +648,6 @@ def getConsts(self):
         # Just return the constant value, removing the type portion.
         return tuple(const[1] for const in self.consts)
 
-def isJump(opname):
-    if opname[:4] == 'JUMP':
-        return 1
-
-
-def twobyte(val):
-    """Convert an int argument into high and low bytes"""
-    assert isinstance(val, (int, long))
-    return divmod(val, 256)
 
 class LineAddrTable:
     """lnotab
