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/lib/format.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'numpy/lib/format.py') diff --git a/numpy/lib/format.py b/numpy/lib/format.py index 17f3463ad..40788e148 100644 --- a/numpy/lib/format.py +++ b/numpy/lib/format.py @@ -139,7 +139,7 @@ from __future__ import division, absolute_import, print_function import numpy import sys from numpy.lib.utils import safe_eval -from numpy.compat import asbytes, isfileobj, long +from numpy.compat import asbytes, isfileobj, long, basestring if sys.version_info[0] >= 3: import pickle -- cgit v1.2.1