use urllib2 for yahoo finace; more cleanups to demo

jdh2358 · jdh2358 · commit 57743356994d · 2009-03-18T16:40:26.000Z
svn path=/trunk/matplotlib/; revision=6993
diff --git a/examples/pylab_examples/finance_work2.py b/examples/pylab_examples/finance_work2.py
@@ -139,8 +139,8 @@ def moving_average_convergence(x, nslow=26, nfast=12):
 ax1.plot(r.date, rsi, color=fillcolor)
 ax1.axhline(70, color=fillcolor)
 ax1.axhline(30, color=fillcolor)
-ax1.fill_between(r.date, rsi, 70, facecolor=fillcolor, where=(rsi>=70))
-ax1.fill_between(r.date, rsi, 30, facecolor=fillcolor, where=(rsi<=30))
+ax1.fill_between(r.date, rsi, 70, where=(rsi>=70), facecolor=fillcolor, edgecolor=fillcolor)
+ax1.fill_between(r.date, rsi, 30, where=(rsi<=30), facecolor=fillcolor, edgecolor=fillcolor)
 ax1.text(0.6, 0.9, '>70 = overbought', va='top', transform=ax1.transAxes, fontsize=textsize)
 ax1.text(0.6, 0.1, '<30 = oversold', transform=ax1.transAxes, fontsize=textsize)
 ax1.set_ylim(0, 100)
@@ -181,7 +181,7 @@ def moving_average_convergence(x, nslow=26, nfast=12):
 
 volume = (r.close*r.volume)/1e6  # dollar volume in millions
 vmax = volume.max()
-poly = ax2t.fill_between(r.date, volume, 0, facecolor=fillcolor, label='Volume')
+poly = ax2t.fill_between(r.date, volume, 0, label='Volume', facecolor=fillcolor, edgecolor=fillcolor)
 ax2t.set_ylim(0, 5*vmax)
 ax2t.set_yticks([])
 
@@ -195,14 +195,14 @@ def moving_average_convergence(x, nslow=26, nfast=12):
 ema9 = moving_average(macd, nema, type='exponential')
 ax3.plot(r.date, macd, color='black', lw=2)
 ax3.plot(r.date, ema9, color='blue', lw=1)
-ax3.fill_between(r.date, macd-ema9, 0, facecolor=fillcolor, alpha=0.5)
+ax3.fill_between(r.date, macd-ema9, 0, alpha=0.5, facecolor=fillcolor, edgecolor=fillcolor)
 
 
 ax3.text(0.025, 0.95, 'MACD (%d, %d, %d)'%(nfast, nslow, nema), va='top',
          transform=ax3.transAxes, fontsize=textsize)
 
 ax3.set_yticks([])
-# turn off tick labels, rorate them, etc
+# turn off upper axis tick labels, rotate the lower ones, etc
 for ax in ax1, ax2, ax2t, ax3:
     if ax!=ax3:
         for label in ax.get_xticklabels():
diff --git a/lib/matplotlib/finance.py b/lib/matplotlib/finance.py
@@ -5,7 +5,7 @@
 """
 #from __future__ import division
 import os, time, warnings
-from urllib import urlopen
+from urllib2 import urlopen
 
 try:
     from hashlib import md5
@@ -121,8 +121,10 @@ def fetch_historical_yahoo(ticker, date1, date2, cachename=None):
         verbose.report('Using cachefile %s for %s'%(cachename, ticker))
     else:
         if not os.path.isdir(cachedir): os.mkdir(cachedir)
+        urlfh = urlopen(url)
+
         fh = file(cachename, 'w')
-        fh.write(urlopen(url).read())
+        fh.write(urlfh.read())
         fh.close()
         verbose.report('Saved %s data to cache file %s'%(ticker, cachename))
         fh = file(cachename, 'r')
