Merge pull request scikit-learn#5919 from nelson-liu/fix_stock_example

[MRG+2] Fixed plot_stock_market.py example to work with matplotlib 1.4.x+

Author: TomDLT

examples/applications/plot_stock_market.py

@@ -68,9 +68,12 @@
 
 import numpy as np
 import matplotlib.pyplot as plt
-from matplotlib import finance
+try:
+     from matplotlib.finance import quotes_historical_yahoo_ochl
+except ImportError:
+     # quotes_historical_yahoo_ochl was named quotes_historical_yahoo before matplotlib 1.4
+     from matplotlib.finance import quotes_historical_yahoo as quotes_historical_yahoo_ochl
 from matplotlib.collections import LineCollection
-
 from sklearn import cluster, covariance, manifold
 
 ###############################################################################
@@ -146,7 +149,7 @@
 
 symbols, names = np.array(list(symbol_dict.items())).T
 
-quotes = [finance.quotes_historical_yahoo(symbol, d1, d2, asobject=True)
+quotes = [quotes_historical_yahoo_ochl(symbol, d1, d2, asobject=True)
           for symbol in symbols]
 
 open = np.array([q.open for q in quotes]).astype(np.float)