summaryrefslogtreecommitdiff
path: root/numpy/oldnumeric/ma.py
Commit message (Collapse)AuthorAgeFilesLines
* 2to3: Apply types fixer.Charles Harris2013-04-141-13/+14
| | | | | | | | | | | | | | | | | | | | 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.
* Merge pull request #3241 from charris/2to3-apply-nonzero-fixerCharles Harris2013-04-141-0/+15
|\ | | | | 2to3: Apply nonzero fixer.
| * 2to3: Apply nonzero fixer.Charles Harris2013-04-131-0/+15
| | | | | | | | | | | | | | | | | | | | | | In Python 3 the `__nonzero__` class method is replaced by `__bool__`. This only affects the MaskedArray class in numpy/oldnumeric/ma.py file and the simplest solution is to provide both methods. I have my doubts that the fixed up Python 3 version was correct or even tested, but I think the current solution should work for as long as oldnumeric stays in numpy. Closes #3073.
* | 2to3: Apply renames fixer.Charles Harris2013-04-131-8/+16
|/ | | | | | | | | | | Rename sys.maxint to sys.maxsize when the Python version is >= 3. This change was made in Python 3 because all integers are 'long' integers and their maximum value bears no relationship to the C type that int used to represent. The new sys.maxsize value is the maximum value of Py_ssize_t. This change has not led to any reported problems since the numpy 1.5 release. Closes #3082
* Merge pull request #3202 from charris/2to3-reduce-fixupsnjsmith2013-04-071-2/+1
|\ | | | | MAINT: Cleanup some imports involving reduce.
| * MAINT: Cleanup some imports involving reduce.Charles Harris2013-04-061-2/+1
| | | | | | | | | | | | | | | | | | | | Because reduce has been available in functools since Python 2.6 we can get rid of the version checks we currently have before we import it. Also removes some reduce related skips in tools/py3tool.py. We were already skipping the reduce fixer so this has no effect other than cleaning up the code.
* | 2to3: Apply `print` fixer.Charles Harris2013-04-061-1/+1
|/ | | | | | | Add `print_function` to all `from __future__ import ...` statements and use the python3 print function syntax everywhere. Closes #3078.
* 2to3: Use absolute imports.Charles Harris2013-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new import `absolute_import` is added the `from __future__ import` statement and The 2to3 `import` fixer is run to make the imports compatible. There are several things that need to be dealt with to make this work. 1) Files meant to be run as scripts run in a different environment than files imported as part of a package, and so changes to those files need to be skipped. The affected script files are: * all setup.py files * numpy/core/code_generators/generate_umath.py * numpy/core/code_generators/generate_numpy_api.py * numpy/core/code_generators/generate_ufunc_api.py 2) Some imported modules are not available as they are created during the build process and consequently 2to3 is unable to handle them correctly. Files that import those modules need a bit of extra work. The affected files are: * core/__init__.py, * core/numeric.py, * core/_internal.py, * core/arrayprint.py, * core/fromnumeric.py, * numpy/__init__.py, * lib/npyio.py, * lib/function_base.py, * fft/fftpack.py, * random/__init__.py Closes #3172
* 2to3: Put `from __future__ import division in every python file.Charles Harris2013-03-011-0/+3
| | | | | | | | This should be harmless, as we already are division clean. However, placement of this import takes some care. In the future a script can be used to append new features without worry, at least until such time as it exceeds a single line. Having that ability will make it easier to deal with absolute imports and printing updates.
* STY: Fix up some remaining old-style exceptions.Charles Harris2011-04-051-2/+2
| | | | I think that is the end of it.
* STY: Update exception styles, trickier ones.Charles Harris2011-04-051-1/+1
|
* STY: Update exception style, easy ones.Charles Harris2011-04-051-26/+26
|
* 3K: BUG: work around bugs in Python 3.1.1 2to3 by not using fixes_reducePauli Virtanen2010-02-201-0/+3
| | | | Instead, manually import reduce where necessary.
* ran reindent in preparation for the 1.1 releaseJarrod Millman2008-04-201-2/+0
|
* Fix typo.Travis Oliphant2008-04-031-1/+1
|
* Fix-up a few errors in oldnumeric.Travis Oliphant2008-04-011-3/+3
|
* fix-up imports in oldnumeric/ma.pyTravis Oliphant2008-04-011-6/+6
|
* Add old ma.py interface to oldnumeric compatibility layer so that it stays ↵Travis Oliphant2008-04-011-7/+2262
| | | | the same.
* Fix oldnumeric compatibility with maTravis Oliphant2008-03-131-2/+2
|
* ran reindent.py to clean up whitespaceJarrod Millman2007-10-291-1/+0
|
* Change default axis argument of average and several masked array functions. ↵Travis Oliphant2006-08-131-0/+10
| | | | Move old behaviors to compatibility layer.
* Fixes for the recent change to oldnumericTravis Oliphant2006-08-051-8/+2
|
* More fixes to backward compatibilityTravis Oliphant2006-08-051-0/+11