Py3 code fixes

diff --git a/Cython/Compiler/Parsing.py b/Cython/Compiler/Parsing.py
index 3566347c9947429947ba7f4769aeccd9a03627a6..44bc6774644a6140fcb6f22a9dac0a524993acb9 100644 (file)
--- a/Cython/Compiler/Parsing.py
+++ b/Cython/Compiler/Parsing.py
@@ -10,7 +10,6 @@ cython.declare(Nodes=object, ExprNodes=object, EncodedString=object)
 import os
 import re
 import sys
-from types import ListType, TupleType
 from Cython.Compiler.Scanning import PyrexScanner, FileSourceDescriptor
 import Nodes
 import ExprNodes
@@ -2617,7 +2616,7 @@ def print_parse_tree(f, node, level, key = None):
         if key:
             f.write("%s: " % key)
         t = type(node)
-        if t == TupleType:
+        if t is tuple:
             f.write("(%s @ %s\n" % (node[0], node[1]))
             for i in xrange(2, len(node)):
                 print_parse_tree(f, node[i], level+1)
@@ -2633,7 +2632,7 @@ def print_parse_tree(f, node, level, key = None):
                 if name != 'tag' and name != 'pos':
                     print_parse_tree(f, value, level+1, name)
             return
-        elif t == ListType:
+        elif t is list:
             f.write("[\n")
             for i in xrange(len(node)):
                 print_parse_tree(f, node[i], level+1)

diff --git a/Cython/Plex/Errors.py b/Cython/Plex/Errors.py
index ae033672b50a6cef2d9f07aa4173735a59b04545..3c134735fd0f3fc99fa86fd4f54d05d6cc1b65b2 100644 (file)
--- a/Cython/Plex/Errors.py
+++ b/Cython/Plex/Errors.py
@@ -6,9 +6,7 @@
 #
 #=======================================================================
 
-import exceptions
-
-class PlexError(exceptions.Exception):
+class PlexError(Exception):
   message = ""
 
 class PlexTypeError(PlexError, TypeError):

diff --git a/Cython/Plex/Machines.py b/Cython/Plex/Machines.py
index 7bb068ef8e17da9cdd406b388032e47b465df830..ff8a14fb9b67c7af25108f3bfce720e987fc65d3 100644 (file)
--- a/Cython/Plex/Machines.py
+++ b/Cython/Plex/Machines.py
@@ -8,7 +8,6 @@
 
 import sys
 from sys import maxint
-from types import TupleType
 
 from Transitions import TransitionMap
 
@@ -169,7 +168,7 @@ class FastMachine(object):
     self.initial_states[name] = state
   
   def add_transitions(self, state, event, new_state):
-    if type(event) == TupleType:
+    if type(event) is tuple:
       code0, code1 = event
       if code0 == -maxint:
         state['else'] = new_state

diff --git a/Cython/Plex/Regexps.py b/Cython/Plex/Regexps.py
index cee03dbf0410d9293d8fd15d0f5d39642ebfc5c5..dea66b6efa15007416dcedcfb392ad7626a624ab 100644 (file)
--- a/Cython/Plex/Regexps.py
+++ b/Cython/Plex/Regexps.py
@@ -8,7 +8,7 @@
 
 import array
 import types
-from sys import maxint
+from sys import maxint as maxint
 
 import Errors
 

diff --git a/Cython/Plex/Transitions.py b/Cython/Plex/Transitions.py
index 66f7a31609dbe6d2d1fdef66232e59af8659c801..6caff5edfb7a0f8d05dbf8046669a55ab1d515ac 100644 (file)
--- a/Cython/Plex/Transitions.py
+++ b/Cython/Plex/Transitions.py
@@ -6,8 +6,7 @@
 #
 
 from copy import copy
-from sys import maxint
-from types import TupleType
+from sys import maxint as maxint
 
 class TransitionMap(object):
   """
@@ -50,11 +49,11 @@ class TransitionMap(object):
     #self.check() ###
   
   def add(self, event, new_state,
-    TupleType = TupleType):
+    TupleType = tuple):
     """
     Add transition to |new_state| on |event|.
     """
-    if type(event) == TupleType:
+    if type(event) is TupleType:
       code0, code1 = event
       i = self.split(code0)
       j = self.split(code1)
@@ -66,11 +65,11 @@ class TransitionMap(object):
       self.get_special(event)[new_state] = 1
 
   def add_set(self, event, new_set,
-    TupleType = TupleType):
+    TupleType = tuple):
     """
     Add transitions to the states in |new_set| on |event|.
     """
-    if type(event) == TupleType:
+    if type(event) is TupleType:
       code0, code1 = event
       i = self.split(code0)
       j = self.split(code1)