matplotlib-checkins Mailing List for matplotlib

Revision: 8222
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8222&view=rev
Author: efiring
Date: 2010年04月05日 18:46:18 +0000 (2010年4月05日)
Log Message:
-----------
Don't import pytz unless and until it is needed
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/examples/pylab_examples/finance_demo.py
 trunk/matplotlib/lib/matplotlib/config/cutils.py
 trunk/matplotlib/lib/matplotlib/dates.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2010年04月05日 01:06:57 UTC (rev 8221)
+++ trunk/matplotlib/CHANGELOG	2010年04月05日 18:46:18 UTC (rev 8222)
@@ -1,3 +1,6 @@
+2010年04月05日 Speed up import: import pytz only if and when it is
+ needed. It is not needed if the rc timezone is UTC. - EF
+
 2010年04月03日 Added color kwarg to Axes.hist(), based on work by
 Jeff Klukas. - EF
 
Modified: trunk/matplotlib/examples/pylab_examples/finance_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/finance_demo.py	2010年04月05日 01:06:57 UTC (rev 8221)
+++ trunk/matplotlib/examples/pylab_examples/finance_demo.py	2010年04月05日 18:46:18 UTC (rev 8222)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from pylab import *
 from matplotlib.dates import DateFormatter, WeekdayLocator, HourLocator, \
- DayLocator, MONDAY, timezone
+ DayLocator, MONDAY
 from matplotlib.finance import quotes_historical_yahoo, candlestick,\
 plot_day_summary, candlestick2
 
Modified: trunk/matplotlib/lib/matplotlib/config/cutils.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/cutils.py	2010年04月05日 01:06:57 UTC (rev 8221)
+++ trunk/matplotlib/lib/matplotlib/config/cutils.py	2010年04月05日 18:46:18 UTC (rev 8222)
@@ -4,7 +4,6 @@
 
 # Stdlib imports
 import os
-import pytz
 import sys
 import tempfile
 import warnings
Modified: trunk/matplotlib/lib/matplotlib/dates.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/dates.py	2010年04月05日 01:06:57 UTC (rev 8221)
+++ trunk/matplotlib/lib/matplotlib/dates.py	2010年04月05日 18:46:18 UTC (rev 8222)
@@ -92,15 +92,6 @@
 """
 import re, time, math, datetime
 
-import pytz
-
-# compatability for 2008c and older versions
-try:
- import pytz.zoneinfo
-except ImportError:
- pytz.zoneinfo = pytz.tzinfo
- pytz.zoneinfo.UTC = pytz.UTC
-
 import matplotlib
 import numpy as np
 
@@ -108,7 +99,6 @@
 import matplotlib.cbook as cbook
 import matplotlib.ticker as ticker
 
-from pytz import timezone
 from dateutil.rrule import rrule, MO, TU, WE, TH, FR, SA, SU, YEARLY, \
 MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY, SECONDLY
 from dateutil.relativedelta import relativedelta
@@ -127,11 +117,28 @@
 'seconds', 'minutes', 'hours', 'weeks')
 
 
+# Make a simple UTC instance so we don't always have to import
+# pytz. From the python datetime library docs:
 
-UTC = pytz.timezone('UTC')
+class _UTC(datetime.tzinfo):
+ """UTC"""
 
+ def utcoffset(self, dt):
+ return datetime.timedelta(0)
+
+ def tzname(self, dt):
+ return "UTC"
+
+ def dst(self, dt):
+ return datetime.timedelta(0)
+
+UTC = _UTC()
+
 def _get_rc_timezone():
 s = matplotlib.rcParams['timezone']
+ if s == 'UTC':
+ return UTC
+ import pytz
 return pytz.timezone(s)
 
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8221
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8221&view=rev
Author: efiring
Date: 2010年04月05日 01:06:57 +0000 (2010年4月05日)
Log Message:
-----------
Axes.hist: make 'label' an explicit kwarg, like 'color'
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2010年04月03日 23:22:48 UTC (rev 8220)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2010年04月05日 01:06:57 UTC (rev 8221)
@@ -6989,7 +6989,7 @@
 def hist(self, x, bins=10, range=None, normed=False, weights=None,
 cumulative=False, bottom=None, histtype='bar', align='mid',
 orientation='vertical', rwidth=None, log=False,
- color=None,
+ color=None, label=None,
 **kwargs):
 """
 call signature::
@@ -7101,24 +7101,21 @@
 dataset. Default (*None*) uses the standard line
 color sequence.
 
- kwargs are used to update the properties of the hist
- :class:`~matplotlib.patches.Rectangle` instances:
+ *label*:
+ String, or sequence of strings to match multiple
+ datasets. Bar charts yield multiple patches per
+ dataset, but only the first gets the label, so
+ that the legend command will work as expected::
 
- %(Rectangle)s
+ ax.hist(10+2*np.random.randn(1000), label='men')
+ ax.hist(12+3*np.random.randn(1000), label='women', alpha=0.5)
+ ax.legend()
 
- You can use labels for your histogram, and only the first
- :class:`~matplotlib.patches.Rectangle` gets the label (the
- others get the magic string '_nolegend_'. This will make the
- histograms work in the intuitive way for bar charts::
+ kwargs are used to update the properties of the
+ :class:`~matplotlib.patches.Patch` instances returned by *hist*:
 
- ax.hist(10+2*np.random.randn(1000), label='men')
- ax.hist(12+3*np.random.randn(1000), label='women', alpha=0.5)
- ax.legend()
+ %(Patch)s
 
- label can also be a sequence of strings. If multiple data is
- provided in *x*, the labels are asigned sequentially to the
- histograms.
-
 **Example:**
 
 .. plot:: mpl_examples/pylab_examples/histogram_demo.py
@@ -7315,9 +7312,9 @@
 self.dataLim.intervaly = (ymin, ymax)
 self.autoscale_view()
 
- label = kwargs.pop('label', '_nolegend_')
-
- if is_string_like(label):
+ if label is None:
+ labels = ['_nolegend_']
+ elif is_string_like(label):
 labels = [label]
 elif is_sequence_of_strings(label):
 labels = list(label)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.