Merge pull request #5429 from amueller/python33_reload

ogrisel · ogrisel · commit 6db9ee076b96 · 2015-10-17T15:35:06.000+02:00
FIX skip LDA deprecation test on python3.3 that has no reload.
diff --git a/sklearn/tests/test_discriminant_analysis.py b/sklearn/tests/test_discriminant_analysis.py
@@ -1,10 +1,6 @@
-try:
-    # Python 2 compat
-    reload
-except NameError:
-    # Regular Python 3+ import
-    from importlib import reload
+import sys
 import numpy as np
+from nose import SkipTest
 
 from sklearn.utils.testing import assert_array_equal
 from sklearn.utils.testing import assert_array_almost_equal
@@ -22,6 +18,15 @@
 from sklearn.discriminant_analysis import QuadraticDiscriminantAnalysis
 
 
+# import reload
+version = sys.version_info
+if version[0] == 3:
+    # Python 3+ import for reload. Builtin in Python2
+    if version[1] == 3:
+        reload = None
+    from importlib import reload
+
+
 # Data is just 6 separable points in the plane
 X = np.array([[-2, -1], [-1, -1], [-1, -2], [1, 1], [1, 2], [2, 1]], dtype='f')
 y = np.array([1, 1, 1, 2, 2, 2])
@@ -298,6 +303,9 @@ def test_qda_regularization():
 
 
 def test_deprecated_lda_qda_deprecation():
+    if reload is None:
+        SkipTest("Can't reload module on Python3.3")
+
     def import_lda_module():
         import sklearn.lda
         # ensure that we trigger DeprecationWarning even if the sklearn.lda
