Merge pull request #3178 from charris/2to3-apply-import-fixer

2to3 apply import fixer

31 files changed, 78 insertions, 78 deletions

diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py
index 12add2153..951544588 100644
--- a/numpy/f2py/__init__.py
+++ b/numpy/f2py/__init__.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import division
+from __future__ import division, absolute_import
 
 __all__ = ['run_main','compile','f2py_testing']
 
@@ -7,11 +7,11 @@ import os
 import sys
 import commands
 
-import f2py2e
-import f2py_testing
-import diagnose
+from . import f2py2e
+from . import f2py_testing
+from . import diagnose
 
-from info import __doc__
+from .info import __doc__
 
 run_main = f2py2e.run_main
 main = f2py2e.main
diff --git a/numpy/f2py/__version__.py b/numpy/f2py/__version__.py
index 2f842c89d..44791aa37 100644
--- a/numpy/f2py/__version__.py
+++ b/numpy/f2py/__version__.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 major = 2
 
diff --git a/numpy/f2py/auxfuncs.py b/numpy/f2py/auxfuncs.py
index 0f68953ad..5b13747f1 100644
--- a/numpy/f2py/auxfuncs.py
+++ b/numpy/f2py/auxfuncs.py
@@ -14,17 +14,17 @@ $Date: 2005/07/24 19:01:55 $
 Pearu Peterson
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __version__ = "$Revision: 1.65 $"[10:-1]
 
-import __version__
+from . import __version__
 f2py_version = __version__.version
 
 import pprint
 import sys
 import types
-import cfuncs
+from . import cfuncs
 
 
 errmess=sys.stderr.write
@@ -522,7 +522,7 @@ def getcallprotoargument(rout,cb_map={}):
     if hascallstatement(rout):
         outmess('warning: callstatement is defined without callprotoargument\n')
         return
-    from capi_maps import getctype
+    from .capi_maps import getctype
     arg_types,arg_types2 = [],[]
     if l_and(isstringfunction,l_not(isfunction_wrap))(rout):
         arg_types.extend(['char*','size_t'])
diff --git a/numpy/f2py/capi_maps.py b/numpy/f2py/capi_maps.py
index d82b2c3f5..117ea2233 100644
--- a/numpy/f2py/capi_maps.py
+++ b/numpy/f2py/capi_maps.py
@@ -11,20 +11,20 @@ $Date: 2005/05/06 10:57:33 $
 Pearu Peterson
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __version__ = "$Revision: 1.60 $"[10:-1]
 
-import __version__
+from . import __version__
 f2py_version = __version__.version
 
 import copy
 import re
 import os
 import sys
-from auxfuncs import *
-from crackfortran import markoutercomma
-import cb_rules
+from .auxfuncs import *
+from .crackfortran import markoutercomma
+from . import cb_rules
 
 # Numarray and Numeric users should set this False
 using_newcore = True
diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py
index 05404add2..bc565a904 100644
--- a/numpy/f2py/cb_rules.py
+++ b/numpy/f2py/cb_rules.py
@@ -13,11 +13,11 @@ $Date: 2005/07/20 11:27:58 $
 Pearu Peterson
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __version__ = "$Revision: 1.53 $"[10:-1]
 
-import __version__
+from . import __version__
 f2py_version = __version__.version
 
 
@@ -28,8 +28,8 @@ errmess=sys.stderr.write
 outmess=sys.stdout.write
 show=pprint.pprint
 
-from auxfuncs import *
-import cfuncs
+from .auxfuncs import *
+from . import cfuncs
 
 ################## Rules for callback function ##############
 
@@ -416,7 +416,7 @@ def buildcallbacks(m):
 
 def buildcallback(rout,um):
     global cb_map
-    import capi_maps
+    from . import capi_maps
 
     outmess('\tConstructing call-back function "cb_%s_in_%s"\n'%(rout['name'],um))
     args,depargs=getargs(rout)
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py
index ccadd94e3..a0110c530 100644
--- a/numpy/f2py/cfuncs.py
+++ b/numpy/f2py/cfuncs.py
@@ -14,11 +14,11 @@ $Date: 2005/05/06 11:42:34 $
 Pearu Peterson
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __version__ = "$Revision: 1.75 $"[10:-1]
 
-import __version__
+from . import __version__
 f2py_version = __version__.version
 
 import types
@@ -1117,7 +1117,7 @@ capi_fail:
 """
 
 def buildcfuncs():
-    from capi_maps import c2capi_map
+    from .capi_maps import c2capi_map
     for k in c2capi_map.keys():
         m='pyarr_from_p_%s1'%k
         cppmacros[m]='#define %s(v) (PyArray_SimpleNewFromData(0,NULL,%s,(char *)v))'%(m,c2capi_map[k])
diff --git a/numpy/f2py/common_rules.py b/numpy/f2py/common_rules.py
index db7a6ee6d..aec0ef1b1 100644
--- a/numpy/f2py/common_rules.py
+++ b/numpy/f2py/common_rules.py
@@ -13,11 +13,11 @@ $Date: 2005/05/06 10:57:33 $
 Pearu Peterson
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __version__ = "$Revision: 1.19 $"[10:-1]
 
-import __version__
+from . import __version__
 f2py_version = __version__.version
 
 import pprint
@@ -26,10 +26,10 @@ errmess=sys.stderr.write
 outmess=sys.stdout.write
 show=pprint.pprint
 
-from auxfuncs import *
-import capi_maps
-import func2subr
-from crackfortran import rmbadname
+from .auxfuncs import *
+from . import capi_maps
+from . import func2subr
+from .crackfortran import rmbadname
 ##############
 
 def findcommonblocks(block,top=1):
diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py
index 95ebcaee4..2a7f137d2 100755
--- a/numpy/f2py/crackfortran.py
+++ b/numpy/f2py/crackfortran.py
@@ -138,11 +138,11 @@ TODO:
     The above may be solved by creating appropriate preprocessor program, for example.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __version__ = "$Revision: 1.177 $"[10:-1]
 import platform
-import __version__
+from . import __version__
 f2py_version = __version__.version
 
 #
@@ -153,7 +153,7 @@ import re
 import pprint
 import os
 import copy
-from auxfuncs import *
+from .auxfuncs import *
 
 # Global flags:
 strictf77=1          # Ignore `!' comments unless line[0]=='!'
diff --git a/numpy/f2py/diagnose.py b/numpy/f2py/diagnose.py
index e7759b6dd..59ef5205b 100644
--- a/numpy/f2py/diagnose.py
+++ b/numpy/f2py/diagnose.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import sys
diff --git a/numpy/f2py/doc/collectinput.py b/numpy/f2py/doc/collectinput.py
index 5e98c8350..078da8eeb 100755
--- a/numpy/f2py/doc/collectinput.py
+++ b/numpy/f2py/doc/collectinput.py
@@ -19,7 +19,7 @@ Usage:
     collectinput                    # in and out are stdin and stdout
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __version__ = "0.0"
 
diff --git a/numpy/f2py/docs/pytest.py b/numpy/f2py/docs/pytest.py
index b49dc764a..40d6b0c5e 100644
--- a/numpy/f2py/docs/pytest.py
+++ b/numpy/f2py/docs/pytest.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 #File: pytest.py
 import Numeric
diff --git a/numpy/f2py/docs/usersguide/setup_example.py b/numpy/f2py/docs/usersguide/setup_example.py
index 911dc3324..e80bc493b 100644
--- a/numpy/f2py/docs/usersguide/setup_example.py
+++ b/numpy/f2py/docs/usersguide/setup_example.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import division
+from __future__ import division, absolute_import
 
 # File: setup_example.py
 
diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py
index 235fcb75a..aee8afba0 100755
--- a/numpy/f2py/f2py2e.py
+++ b/numpy/f2py/f2py2e.py
@@ -14,9 +14,9 @@ $Date: 2005/05/06 08:31:19 $
 Pearu Peterson
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
-import __version__
+from . import __version__
 f2py_version = __version__.version
 
 import sys
@@ -28,12 +28,12 @@ errmess=sys.stderr.write
 #outmess=sys.stdout.write
 show=pprint.pprint
 
-import crackfortran
-import rules
-import cb_rules
-import auxfuncs
-import cfuncs
-import f90mod_rules
+from . import crackfortran
+from . import rules
+from . import cb_rules
+from . import auxfuncs
+from . import cfuncs
+from . import f90mod_rules
 
 outmess = auxfuncs.outmess
 
diff --git a/numpy/f2py/f2py_testing.py b/numpy/f2py/f2py_testing.py
index 73eb2caed..b0f396ad4 100644
--- a/numpy/f2py/f2py_testing.py
+++ b/numpy/f2py/f2py_testing.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import sys
 import re
diff --git a/numpy/f2py/f90mod_rules.py b/numpy/f2py/f90mod_rules.py
index 3a80eb8f4..bc571371b 100644
--- a/numpy/f2py/f90mod_rules.py
+++ b/numpy/f2py/f90mod_rules.py
@@ -13,7 +13,7 @@ $Date: 2005/02/03 19:30:23 $
 Pearu Peterson
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __version__ = "$Revision: 1.27 $"[10:-1]
 
@@ -25,11 +25,11 @@ errmess=sys.stderr.write
 outmess=sys.stdout.write
 show=pprint.pprint
 
-from auxfuncs import *
+from .auxfuncs import *
 import numpy as np
-import capi_maps
-import func2subr
-from crackfortran import undo_rmbadname, undo_rmbadname1
+from . import capi_maps
+from . import func2subr
+from .crackfortran import undo_rmbadname, undo_rmbadname1
 
 options={}
 
@@ -84,7 +84,7 @@ fgetdims2_sa="""\
 
 def buildhooks(pymod):
     global fgetdims1,fgetdims2
-    import rules
+    from . import rules
     ret = {'f90modhooks':[],'initf90modhooks':[],'body':[],
            'need':['F_FUNC','arrayobject.h'],
            'separatorsfor':{'includes0':'\n','includes':'\n'},
diff --git a/numpy/f2py/func2subr.py b/numpy/f2py/func2subr.py
index eb72c76c9..7597e43ae 100644
--- a/numpy/f2py/func2subr.py
+++ b/numpy/f2py/func2subr.py
@@ -13,7 +13,7 @@ $Date: 2004/11/26 11:13:06 $
 Pearu Peterson
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __version__ = "$Revision: 1.16 $"[10:-1]
 
@@ -26,7 +26,7 @@ errmess=sys.stderr.write
 outmess=sys.stdout.write
 show=pprint.pprint
 
-from auxfuncs import *
+from .auxfuncs import *
 def var2fixfortran(vars,a,fa=None,f90mode=None):
     if fa is None:
         fa = a
diff --git a/numpy/f2py/info.py b/numpy/f2py/info.py
index b976fb2ea..07a750588 100644
--- a/numpy/f2py/info.py
+++ b/numpy/f2py/info.py
@@ -1,6 +1,6 @@
 """Fortran to Python Interface Generator.
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 postpone_import = True
diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py
index b04f54e16..38c43b4ae 100644
--- a/numpy/f2py/rules.py
+++ b/numpy/f2py/rules.py
@@ -50,11 +50,11 @@ $Date: 2005/08/30 08:58:42 $
 Pearu Peterson
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __version__ = "$Revision: 1.129 $"[10:-1]
 
-import __version__
+from . import __version__
 f2py_version = __version__.version
 
 import pprint
@@ -66,14 +66,14 @@ errmess=sys.stderr.write
 outmess=sys.stdout.write
 show=pprint.pprint
 
-from auxfuncs import *
-import capi_maps
-from capi_maps import *
-import cfuncs
-import common_rules
-import use_rules
-import f90mod_rules
-import func2subr
+from .auxfuncs import *
+from . import capi_maps
+from .capi_maps import *
+from . import cfuncs
+from . import common_rules
+from . import use_rules
+from . import f90mod_rules
+from . import func2subr
 options={}
 
 sepdict={}
diff --git a/numpy/f2py/tests/test_array_from_pyobj.py b/numpy/f2py/tests/test_array_from_pyobj.py
index ff8c16cd1..586833e68 100644
--- a/numpy/f2py/tests/test_array_from_pyobj.py
+++ b/numpy/f2py/tests/test_array_from_pyobj.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import unittest
 import os
diff --git a/numpy/f2py/tests/test_assumed_shape.py b/numpy/f2py/tests/test_assumed_shape.py
index 728c034ec..19a557530 100644
--- a/numpy/f2py/tests/test_assumed_shape.py
+++ b/numpy/f2py/tests/test_assumed_shape.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import math
diff --git a/numpy/f2py/tests/test_callback.py b/numpy/f2py/tests/test_callback.py
index f903fbcb4..51b1bb1b4 100644
--- a/numpy/f2py/tests/test_callback.py
+++ b/numpy/f2py/tests/test_callback.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.testing import *
 from numpy import array
diff --git a/numpy/f2py/tests/test_kind.py b/numpy/f2py/tests/test_kind.py
index 56a747096..d24099b05 100644
--- a/numpy/f2py/tests/test_kind.py
+++ b/numpy/f2py/tests/test_kind.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import math
diff --git a/numpy/f2py/tests/test_mixed.py b/numpy/f2py/tests/test_mixed.py
index dc29d2b5d..d62098ab4 100644
--- a/numpy/f2py/tests/test_mixed.py
+++ b/numpy/f2py/tests/test_mixed.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import math
diff --git a/numpy/f2py/tests/test_return_character.py b/numpy/f2py/tests/test_return_character.py
index fd8355ac3..5a68bec72 100644
--- a/numpy/f2py/tests/test_return_character.py
+++ b/numpy/f2py/tests/test_return_character.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.testing import *
 from numpy import array
diff --git a/numpy/f2py/tests/test_return_complex.py b/numpy/f2py/tests/test_return_complex.py
index 4cdc03993..00ba1cfe6 100644
--- a/numpy/f2py/tests/test_return_complex.py
+++ b/numpy/f2py/tests/test_return_complex.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.testing import *
 from numpy import array
diff --git a/numpy/f2py/tests/test_return_integer.py b/numpy/f2py/tests/test_return_integer.py
index a1af6b932..6c55cc1b9 100644
--- a/numpy/f2py/tests/test_return_integer.py
+++ b/numpy/f2py/tests/test_return_integer.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.testing import *
 from numpy import array
diff --git a/numpy/f2py/tests/test_return_logical.py b/numpy/f2py/tests/test_return_logical.py
index 1c8dce532..af35c50d1 100644
--- a/numpy/f2py/tests/test_return_logical.py
+++ b/numpy/f2py/tests/test_return_logical.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.testing import *
 from numpy import array
diff --git a/numpy/f2py/tests/test_return_real.py b/numpy/f2py/tests/test_return_real.py
index 943a4972d..0ea4373fb 100644
--- a/numpy/f2py/tests/test_return_real.py
+++ b/numpy/f2py/tests/test_return_real.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 from numpy.testing import *
 from numpy import array
diff --git a/numpy/f2py/tests/test_size.py b/numpy/f2py/tests/test_size.py
index 72443b4f6..1a41ce972 100644
--- a/numpy/f2py/tests/test_size.py
+++ b/numpy/f2py/tests/test_size.py
@@ -1,4 +1,4 @@
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import math
diff --git a/numpy/f2py/tests/util.py b/numpy/f2py/tests/util.py
index 215df9553..0da4bc310 100644
--- a/numpy/f2py/tests/util.py
+++ b/numpy/f2py/tests/util.py
@@ -5,7 +5,7 @@ Utility functions for
 - detecting if compilers are present
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 import os
 import sys
diff --git a/numpy/f2py/use_rules.py b/numpy/f2py/use_rules.py
index e47dfc6e5..c027baef8 100644
--- a/numpy/f2py/use_rules.py
+++ b/numpy/f2py/use_rules.py
@@ -15,7 +15,7 @@ $Date: 2000/09/10 12:35:43 $
 Pearu Peterson
 
 """
-from __future__ import division
+from __future__ import division, absolute_import
 
 __version__ = "$Revision: 1.3 $"[10:-1]
 
@@ -27,7 +27,7 @@ errmess=sys.stderr.write
 outmess=sys.stdout.write
 show=pprint.pprint
 
-from auxfuncs import *
+from .auxfuncs import *
 ##############
 
 usemodule_rules={