[MRG] remove "matplotlib <1" compatibility code from manifold examples (#8552)

rishikksh20 · lesteve · commit d0ce40e8b272 · 2017-03-10T08:25:37.000+01:00
diff --git a/README.rst b/README.rst
@@ -53,6 +53,8 @@ scikit-learn requires:
 - NumPy (>= 1.6.1)
 - SciPy (>= 0.9)
 
+For running the examples Matplotlib >= 1.1.1 is required.
+
 scikit-learn also uses CBLAS, the C interface to the Basic Linear Algebra
 Subprograms library. scikit-learn comes with a reference implementation, but
 the system CBLAS will be detected by the build system and used if present.
diff --git a/examples/manifold/plot_compare_methods.py b/examples/manifold/plot_compare_methods.py
@@ -43,14 +43,10 @@
 plt.suptitle("Manifold Learning with %i points, %i neighbors"
              % (1000, n_neighbors), fontsize=14)
 
-try:
-    # compatibility matplotlib < 1.0
-    ax = fig.add_subplot(251, projection='3d')
-    ax.scatter(X[:, 0], X[:, 1], X[:, 2], c=color, cmap=plt.cm.Spectral)
-    ax.view_init(4, -72)
-except:
-    ax = fig.add_subplot(251, projection='3d')
-    plt.scatter(X[:, 0], X[:, 2], c=color, cmap=plt.cm.Spectral)
+
+ax = fig.add_subplot(251, projection='3d')
+ax.scatter(X[:, 0], X[:, 1], X[:, 2], c=color, cmap=plt.cm.Spectral)
+ax.view_init(4, -72)
 
 methods = ['standard', 'ltsa', 'hessian', 'modified']
 labels = ['LLE', 'LTSA', 'Hessian LLE', 'Modified LLE']
diff --git a/examples/manifold/plot_manifold_sphere.py b/examples/manifold/plot_manifold_sphere.py
@@ -68,11 +68,7 @@
 
 ax = fig.add_subplot(251, projection='3d')
 ax.scatter(x, y, z, c=p[indices], cmap=plt.cm.rainbow)
-try:
-    # compatibility matplotlib < 1.0
-    ax.view_init(40, -10)
-except:
-    pass
+ax.view_init(40, -10)
 
 sphere_data = np.array([x, y, z]).T
 
diff --git a/examples/manifold/plot_swissroll.py b/examples/manifold/plot_swissroll.py
@@ -33,13 +33,9 @@
 # Plot result
 
 fig = plt.figure()
-try:
-    # compatibility matplotlib < 1.0
-    ax = fig.add_subplot(211, projection='3d')
-    ax.scatter(X[:, 0], X[:, 1], X[:, 2], c=color, cmap=plt.cm.Spectral)
-except:
-    ax = fig.add_subplot(211)
-    ax.scatter(X[:, 0], X[:, 2], c=color, cmap=plt.cm.Spectral)
+
+ax = fig.add_subplot(211, projection='3d')
+ax.scatter(X[:, 0], X[:, 1], X[:, 2], c=color, cmap=plt.cm.Spectral)
 
 ax.set_title("Original data")
 ax = fig.add_subplot(212)
