Revert "Merge pull request #4421 from meltingwax/meltingwax/4382"

Caused SciPy tests to fail when built with this NumPy.

1 files changed, 9 insertions, 66 deletions

diff --git a/numpy/distutils/tests/test_npy_pkg_config.py b/numpy/distutils/tests/test_npy_pkg_config.py
index e703edbd0..5443ece48 100644
--- a/numpy/distutils/tests/test_npy_pkg_config.py
+++ b/numpy/distutils/tests/test_npy_pkg_config.py
@@ -1,7 +1,6 @@
 from __future__ import division, absolute_import, print_function
 
 import os
-import shlex
 from tempfile import mkstemp
 
 from numpy.testing import *
@@ -39,12 +38,6 @@ simple_variable_d = {'cflags': '-I/foo/bar/include', 'libflags': '-L/foo/bar/lib
         'version': '0.1', 'name': 'foo'}
 
 class TestLibraryInfo(TestCase):
-
-    def assertLexEqual(self, str1, str2):
-        # Use shlex.split for comparison because it is above quotes
-        # eg:   shlex.split("'abc'") == shlex.split("abc")
-        return shlex.split(str1) == shlex.split(str2)
-
     def test_simple(self):
         fd, filename = mkstemp('foo.ini')
         try:
@@ -55,10 +48,10 @@ class TestLibraryInfo(TestCase):
                 os.close(fd)
 
             out = read_config(pkg)
-            self.assertLexEqual(out.cflags(), simple_d['cflags'])
-            self.assertLexEqual(out.libs(), simple_d['libflags'])
-            self.assertEqual(out.name, simple_d['name'])
-            self.assertEqual(out.version, simple_d['version'])
+            self.assertTrue(out.cflags() == simple_d['cflags'])
+            self.assertTrue(out.libs() == simple_d['libflags'])
+            self.assertTrue(out.name == simple_d['name'])
+            self.assertTrue(out.version == simple_d['version'])
         finally:
             os.remove(filename)
 
@@ -72,13 +65,13 @@ class TestLibraryInfo(TestCase):
                 os.close(fd)
 
             out = read_config(pkg)
-            self.assertLexEqual(out.cflags(), simple_variable_d['cflags'])
-            self.assertLexEqual(out.libs(), simple_variable_d['libflags'])
-            self.assertEqual(out.name, simple_variable_d['name'])
-            self.assertEqual(out.version, simple_variable_d['version'])
+            self.assertTrue(out.cflags() == simple_variable_d['cflags'])
+            self.assertTrue(out.libs() == simple_variable_d['libflags'])
+            self.assertTrue(out.name == simple_variable_d['name'])
+            self.assertTrue(out.version == simple_variable_d['version'])
 
             out.vars['prefix'] = '/Users/david'
-            self.assertLexEqual(out.cflags(), '-I/Users/david/include')
+            self.assertTrue(out.cflags() == '-I/Users/david/include')
         finally:
             os.remove(filename)
 
@@ -95,28 +88,6 @@ class TestParseFlags(TestCase):
         self.assertTrue(d['include_dirs'] == ['/usr/include'])
         self.assertTrue(d['macros'] == ['FOO'])
 
-    def test_quotes_cflags(self):
-        d = parse_flags("-I'/usr/foo bar/include' -DFOO")
-        self.assertTrue(d['include_dirs'] == ['/usr/foo bar/include'])
-        self.assertTrue(d['macros'] == ['FOO'])
-
-        d = parse_flags("-I/usr/'foo bar'/include -DFOO")
-        self.assertTrue(d['include_dirs'] == ['/usr/foo bar/include'])
-        self.assertTrue(d['macros'] == ['FOO'])
-
-        d = parse_flags("'-I/usr/foo bar'/include -DFOO")
-        self.assertTrue(d['include_dirs'] == ['/usr/foo bar/include'])
-        self.assertTrue(d['macros'] == ['FOO'])
-
-    def test_escaping_cflags(self):
-        d = parse_flags("-I/usr/foo\\ bar/include -DFOO")
-        self.assertTrue(d['include_dirs'] == ['/usr/foo bar/include'])
-        self.assertTrue(d['macros'] == ['FOO'])
-
-        d = parse_flags(r"-I/usr/foo\ bar/include -DFOO")
-        self.assertTrue(d['include_dirs'] == ['/usr/foo bar/include'])
-        self.assertTrue(d['macros'] == ['FOO'])
-
     def test_simple_lflags(self):
         d = parse_flags("-L/usr/lib -lfoo -L/usr/lib -lbar")
         self.assertTrue(d['library_dirs'] == ['/usr/lib', '/usr/lib'])
@@ -125,31 +96,3 @@ class TestParseFlags(TestCase):
         d = parse_flags("-L /usr/lib -lfoo -L/usr/lib -lbar")
         self.assertTrue(d['library_dirs'] == ['/usr/lib', '/usr/lib'])
         self.assertTrue(d['libraries'] == ['foo', 'bar'])
-
-    def test_quotes_lflags(self):
-        d = parse_flags("-L'/usr/foo bar' -lfoo -L/usr/lib -lbar")
-        self.assertTrue(d['library_dirs'] == ['/usr/foo bar', '/usr/lib'])
-
-        d = parse_flags("-L/usr/'foo bar' -lfoo -L/usr/lib -lbar")
-        self.assertTrue(d['library_dirs'] == ['/usr/foo bar', '/usr/lib'])
-
-        d = parse_flags("\"-L/usr/foo bar\" -lfoo -L/usr/lib -lbar")
-        self.assertTrue(d['library_dirs'] == ['/usr/foo bar', '/usr/lib'])
-
-        d = parse_flags("\"-L/usr/foo bar/baz buz\" -lfoo -L/usr/lib -lbar")
-        self.assertTrue(d['library_dirs'] == ['/usr/foo bar/baz buz', '/usr/lib'])
-
-    def test_escaping_lflags(self):
-        d = parse_flags("-L/usr/foo\\ bar -lfoo -L/usr/lib -lbar")
-        self.assertTrue(d['library_dirs'] == ['/usr/foo bar', '/usr/lib'])
-
-        d = parse_flags(r"-L/usr/foo\ bar -lfoo -L/usr/lib -lbar")
-        self.assertTrue(d['library_dirs'] == ['/usr/foo bar', '/usr/lib'])
-
-    def test_odd_characters_lflags(self):
-        # tab in directory name
-        d = parse_flags('-L/usr/"foo\tbar" -lfoo -L/usr/lib -lbar')
-        self.assertTrue(d['library_dirs'] == ['/usr/foo\tbar', '/usr/lib'])
-
-        d = parse_flags("-L/usr/foo\\\tbar -lfoo -L/usr/lib -lbar")
-        self.assertTrue(d['library_dirs'] == ['/usr/foo\tbar', '/usr/lib'])