[Numpy-svn] [numpy/numpy] c879ad: 2to3: Apply types fixer.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: c879ad8a39f2b74edcdaa05a2f2f854fb235537d
      https://github.com/numpy/numpy/commit/c879ad8a39f2b74edcdaa05a2f2f854fb235537d
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2013-04-14 (Sun, 14 Apr 2013)

  Changed paths:
    M numpy/compat/_inspect.py
    M numpy/core/fromnumeric.py
    M numpy/core/records.py
    M numpy/f2py/auxfuncs.py
    M numpy/f2py/cb_rules.py
    M numpy/f2py/cfuncs.py
    M numpy/f2py/crackfortran.py
    M numpy/f2py/f2py2e.py
    M numpy/f2py/rules.py
    M numpy/fft/helper.py
    M numpy/ma/tests/test_core.py
    M numpy/ma/tests/test_old_ma.py
    M numpy/oldnumeric/ma.py
    M numpy/testing/utils.py
    M tools/py3tool.py

  Log Message:
  -----------
  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.


  Commit: 56e806abb78ac03a5f45090a3b9bf7a6c9964026
      https://github.com/numpy/numpy/commit/56e806abb78ac03a5f45090a3b9bf7a6c9964026
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2013-04-21 (Sun, 21 Apr 2013)

  Changed paths:
    M numpy/compat/_inspect.py
    M numpy/core/fromnumeric.py
    M numpy/core/records.py
    M numpy/f2py/auxfuncs.py
    M numpy/f2py/cb_rules.py
    M numpy/f2py/cfuncs.py
    M numpy/f2py/crackfortran.py
    M numpy/f2py/f2py2e.py
    M numpy/f2py/rules.py
    M numpy/fft/helper.py
    M numpy/ma/tests/test_core.py
    M numpy/ma/tests/test_old_ma.py
    M numpy/oldnumeric/ma.py
    M numpy/testing/utils.py
    M tools/py3tool.py

  Log Message:
  -----------
  Merge pull request #3242 from charris/2to3-apply-types-fixer

2to3: Apply types fixer.


Compare: https://github.com/numpy/numpy/compare/1975606394d5...56e806abb78a