Python 3 fixes

Author: mdboom

setupext.py

@@ -711,11 +711,19 @@ class Numpy(SetupPackage):
 
     @staticmethod
     def include_dirs_hook():
-        import __builtin__
-        if hasattr(__builtin__, '__NUMPY_SETUP__'):
-            del __builtin__.__NUMPY_SETUP__
-        import numpy
-        reload(numpy)
+        if sys.version_info[0] >= 3:
+            import builtins
+            if hasattr(builtins, '__NUMPY_SETUP__'):
+                del builtins.__NUMPY_SETUP__
+            import imp
+            import numpy
+            imp.reload(numpy)
+        else:
+            import __builtin__
+            if hasattr(__builtin__, '__NUMPY_SETUP__'):
+                del __builtin__.__NUMPY_SETUP__
+            import numpy
+            reload(numpy)
 
         ext = Extension('test', [])
         ext.include_dirs.append(numpy.get_include())

unit/test_clean_install.sh

@@ -13,12 +13,12 @@ python.tmp/bin/python setup.py install
 python.tmp/bin/python -c "import matplotlib"
 rm -rf python.tmp
 
-# Tests that pip works
-
+set -e
+cd ..
 rm -rf build
 rm -rf numpy*
 rm -rf python.tmp
-python unit/virtualenv.py python.tmp
-python.tmp/bin/pip install .
-python.tmp/bin/python -c "import matplotlib"
+python3 unit/virtualenv.py python.tmp
+python.tmp/bin/python3 setup.py install
+python.tmp/bin/python3 -c "import matplotlib"
 rm -rf python.tmp