2to3: Apply types fixer.

Python 3 removes the builtin types from the types module. The types
fixer replaces such references with the builtin types where possible
and also takes care of some special cases:

    types.TypeNone           <- type(None)
    types.NotImplementedType <- type(NotImplemented)
    types.EllipsisType       <- type(Ellipsis)

The only two tricky substitutions are

    types.StringType         <- bytes
    types.LongType           <- int

These are fixed up to support both Python 3 and Python 2 code by
importing the long and bytes types from numpy.compat.

Closes #3240.

1 files changed, 7 insertions, 9 deletions

diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py
index 4e61b0634..a16a07d59 100644
--- a/numpy/f2py/cfuncs.py
+++ b/numpy/f2py/cfuncs.py
@@ -16,15 +16,13 @@ Pearu Peterson
 """
 from __future__ import division, absolute_import, print_function
 
-__version__ = "$Revision: 1.75 $"[10:-1]
+import sys
+import copy
 
 from . import __version__
-f2py_version = __version__.version
 
-import types
-import sys
-import copy
-errmess=sys.stderr.write
+f2py_version = __version__.version
+errmess = sys.stderr.write
 
 ##################### Definitions ##################
 
@@ -1130,7 +1128,7 @@ def buildcfuncs():
 
 def append_needs(need,flag=1):
     global outneeds,needs
-    if type(need)==types.ListType:
+    if type(need)==list:
         for n in need:
             append_needs(n,flag)
     elif type(need)==str:
@@ -1162,7 +1160,7 @@ def append_needs(need,flag=1):
             if need in needs:
                 for nn in needs[need]:
                     t=append_needs(nn,0)
-                    if type(t)==types.DictType:
+                    if type(t)==dict:
                         for nnn in t.keys():
                             if nnn in tmp:
                                 tmp[nnn]=tmp[nnn]+t[nnn]
@@ -1178,7 +1176,7 @@ def append_needs(need,flag=1):
             if need in needs:
                 for nn in needs[need]:
                     t=append_needs(nn,flag)
-                    if type(t)==types.DictType:
+                    if type(t)==dict:
                         for nnn in t.keys():
                             if nnn in tmp:
                                 tmp[nnn]=t[nnn]+tmp[nnn]