From 68338eed3ae91c9846142e088c16b63635e58178 Mon Sep 17 00:00:00 2001 From: Charles Harris Date: Sat, 13 Apr 2013 09:05:31 -0600 Subject: 2to3: Apply basestring fixer. The basestring class is not defined in Python 3 and the fixer replaces it with str. In order to have a common code base we define basestring in numpy/compat/py3k.py to be str when the Python version is >= 3, otherwise basestring and import it where needed. That works for most cases, but there are a few files where the version dependent define needs to be in the file. Closes #3042. --- numpy/core/numeric.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'numpy/core/numeric.py') diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index f1cdb0409..d689982db 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -2,15 +2,16 @@ from __future__ import division, absolute_import, print_function import sys import warnings +import collections from . import multiarray from . import umath from .umath import * from . import numerictypes from .numerictypes import * -import collections if sys.version_info[0] >= 3: import pickle + basestring = str else: import cPickle as pickle -- cgit v1.2.1