summaryrefslogtreecommitdiff
path: root/numpy/distutils/misc_util.py
diff options
context:
space:
mode:
authorDaniel da Silva <var.mail.daniel@gmail.com>2014-03-05 20:06:00 -0500
committerDaniel da Silva <var.mail.daniel@gmail.com>2014-03-05 20:08:54 -0500
commit4b2b77e0b50b3b3ffdb0ea17f38e14d3b8e82ebd (patch)
treea8db445948460c12a3dbebc5b28bc50f98513554 /numpy/distutils/misc_util.py
parent683bc33d1407509de8c078698727109b3759dc12 (diff)
downloadnumpy-4b2b77e0b50b3b3ffdb0ea17f38e14d3b8e82ebd.tar.gz
Revert "Merge pull request #4421 from meltingwax/meltingwax/4382"
Caused SciPy tests to fail when built with this NumPy.
Diffstat (limited to 'numpy/distutils/misc_util.py')
-rw-r--r--numpy/distutils/misc_util.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index a9ca12832..c146178f0 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -15,11 +15,6 @@ import distutils
from distutils.errors import DistutilsError
try:
- from pipes import quote
-except ImportError:
- from shlex import quote
-
-try:
set
except NameError:
from sets import Set as set
@@ -36,8 +31,7 @@ __all__ = ['Configuration', 'get_numpy_include_dirs', 'default_config_dict',
'get_script_files', 'get_lib_source_files', 'get_data_files',
'dot_join', 'get_frame', 'minrelpath', 'njoin',
'is_sequence', 'is_string', 'as_list', 'gpaths', 'get_language',
- 'quote_args', 'quote', 'get_build_architecture', 'get_info',
- 'get_pkg_info']
+ 'quote_args', 'get_build_architecture', 'get_info', 'get_pkg_info']
class InstallableLib(object):
"""