Merged revisions 8870,8876,8879,8882,8884,8886,8889,8891-8893,8895,8897,8899 via svnmerge from

https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8870 | jdh2358 | 2011-01-02 11:53:33 -0600 (Sun, 02 Jan 2011) | 1 line
  
  bumped version number to 1.0.1rc
........
  r8876 | jdh2358 | 2011-01-03 14:34:57 -0600 (Mon, 03 Jan 2011) | 1 line
  
  update pytz to 2010o
........
  r8879 | efiring | 2011-01-03 18:45:25 -0600 (Mon, 03 Jan 2011) | 2 lines
  
  apply patch by Paul Ivanov to move twinx second axis offset to the RHS
........
  r8882 | efiring | 2011-01-04 14:24:12 -0600 (Tue, 04 Jan 2011) | 2 lines
  
  Bugfix: invert_xaxis and invert_yaxis now notify observers. Closes 3123226
........
  r8884 | efiring | 2011-01-04 14:52:42 -0600 (Tue, 04 Jan 2011) | 3 lines
  
  Finance: change volume to float; close  3108059
........
  r8886 | mdehoon | 2011-01-05 07:31:24 -0600 (Wed, 05 Jan 2011) | 2 lines
  
  Replace MacOS.WMAvailable, as the MacOS module is not available with 64-bit Pythons, and deprecated for Python 3.
........
  r8889 | jdh2358 | 2011-01-05 09:59:33 -0600 (Wed, 05 Jan 2011) | 1 line
  
  fix rc file defaults issue for docs; python 2.4 compliance for formlayout
........
  r8891 | weathergod | 2011-01-05 11:44:17 -0600 (Wed, 05 Jan 2011) | 3 lines
  
  Applying a similar fix to r8873 which seemed to only have been applied to the development branch.
  This fixes a math domain error when using log scales.
........
  r8892 | jdh2358 | 2011-01-05 12:14:36 -0600 (Wed, 05 Jan 2011) | 1 line
  
  remove unused params from doc rc; add comment on examples.download params
........
  r8893 | jdh2358 | 2011-01-05 16:04:47 -0600 (Wed, 05 Jan 2011) | 1 line
  
  bumpt the rc version num
........
  r8895 | jdh2358 | 2011-01-05 19:26:23 -0600 (Wed, 05 Jan 2011) | 1 line
  
  fix the plot directive
........
  r8897 | jdh2358 | 2011-01-06 07:50:07 -0600 (Thu, 06 Jan 2011) | 1 line
  
  tag 1.0.1 for release
........
  r8899 | jdh2358 | 2011-01-06 13:42:08 -0600 (Thu, 06 Jan 2011) | 1 line
  
  support relative paths in examples.directory
........

svn path=/trunk/matplotlib/; revision=8900

Author: jdh2358

CHANGELOG

@@ -1,16 +1,19 @@
+2011-01-04 Tag 1.0.1 for release at r8896
+
 2011-01-03 Added display of ticker offset to 3d plots. - BVR
 
 2011-01-03 Turn off tick labeling on interior subplots for
            pyplots.subplots when sharex/sharey is True. - JDH
 
 2010-12-29 Implment axes_divider.HBox and VBox. -JJL
 
+
 2010-11-22 Fixed error with Hammer projection. - BVR
 
 2010-11-12 Fixed the placement and angle of axis labels in 3D plots. - BVR
 
 2010-11-07 New rc parameters examples.download and examples.directory
-           allow bypassing the download mechanism in get_sample_data. 
+           allow bypassing the download mechanism in get_sample_data.
            - JKS
 
 2010-10-04 Fix JPEG saving bug: only accept the kwargs documented

doc/api/gridspec_api.rst

@@ -1,6 +1,6 @@
-*************
+*******************
 matplotlib gridspec
-*************
+*******************
 
 
 :mod:`matplotlib.gridspec`

doc/matplotlibrc

@@ -99,7 +99,7 @@
 """
 from __future__ import generators
 
-__version__  = '1.0.0'
+__version__  = '1.1.0svn'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 
@@ -765,12 +765,30 @@ def rc_params(fail_on_error=False):
 # this is the instance used by the matplotlib classes
 rcParams = rc_params()
 
+if rcParams['examples.directory']:
+    # paths that are intended to be relative to matplotlib_fname()
+    # are allowed for the examples.directory parameter.
+    # However, we will need to fully qualify the path because
+    # Sphinx requires absolute paths.
+    if not os.path.isabs(rcParams['examples.directory']):
+        _basedir, _fname = os.path.split(matplotlib_fname())
+        # Sometimes matplotlib_fname() can return relative paths,
+        # Also, using realpath() guarentees that Sphinx will use
+        # the same path that matplotlib sees (in case of weird symlinks).
+        _basedir = os.path.realpath(_basedir)
+        _fullpath = os.path.join(_basedir, rcParams['examples.directory'])
+        rcParams['examples.directory'] = _fullpath
+
+rcParamsOrig = rcParams.copy()
+
 rcParamsDefault = RcParams([ (key, default) for key, (default, converter) in \
                     defaultParams.iteritems() ])
 
 rcParams['ps.usedistiller'] = checkdep_ps_distiller(rcParams['ps.usedistiller'])
 rcParams['text.usetex'] = checkdep_usetex(rcParams['text.usetex'])
 
+
+
 def rc(group, **kwargs):
     """
     Set the current rc params.  Group is the grouping for the rc, eg.
@@ -845,11 +863,19 @@ def rc(group, **kwargs):
 
 def rcdefaults():
     """
-    Restore the default rc params - the ones that were created at
-    matplotlib load time.
+    Restore the default rc params - these are not the params loaded by
+    the rc file, but mpl's internal params.  See rc_file_defaults for
+    reloading the default params from the rc file
     """
     rcParams.update(rcParamsDefault)
 
+def rc_file_defaults():
+    """
+    Restore the default rc params from the original matplotlib rc that
+    was loaded
+    """
+    rcParams.update(rcParamsOrig)
+
 _use_error_msg = """ This call to matplotlib.use() has no effect
 because the the backend has already been chosen;
 matplotlib.use() must be called *before* pylab, matplotlib.pyplot,

doc/pyplots/tex_demo.png

@@ -2271,7 +2271,7 @@ def set_axis_bgcolor(self, color):
     def invert_xaxis(self):
         "Invert the x-axis."
         left, right = self.get_xlim()
-        self.viewLim.intervalx = (right, left)
+        self.set_xlim(right, left)
 
     def xaxis_inverted(self):
         'Returns True if the x-axis is inverted.'
@@ -2479,7 +2479,7 @@ def set_xticklabels(self, labels, fontdict=None, minor=False, **kwargs):
     def invert_yaxis(self):
         "Invert the y-axis."
         bottom, top = self.get_ylim()
-        self.viewLim.intervaly = (top, bottom)
+        self.set_ylim(top, bottom)
 
     def yaxis_inverted(self):
         'Returns True if the y-axis is inverted.'
@@ -7391,6 +7391,7 @@ def twinx(self):
             frameon=False)
         ax2.yaxis.tick_right()
         ax2.yaxis.set_label_position('right')
+        ax2.yaxis.set_offset_position('right')
         self.yaxis.tick_left()
         ax2.xaxis.set_visible(False)
         return ax2

lib/matplotlib/__init__.py

@@ -272,7 +272,11 @@ def setup(self):
                 field.setCurrentIndex(selindex)
             elif isinstance(value, bool):
                 field = QCheckBox(self)
-                field.setCheckState(Qt.Checked if value else Qt.Unchecked)
+                if value:
+                    field.setCheckState(Qt.Checked)
+                else:
+                    field.setCheckedState(Qt.Unchecked)
+                               
             elif isinstance(value, float):
                 field = QLineEdit(repr(value), self)
             elif isinstance(value, int):

lib/matplotlib/axes.py

@@ -38,7 +38,7 @@
                      ('close', np.float),
                      ('high', np.float),
                      ('low', np.float),
-                     ('volume', np.int),
+                     ('volume', np.float),
                      ('aclose', np.float)])
 
 
@@ -57,7 +57,7 @@ def parse_yahoo_historical(fh, adjusted=True, asobject=False):
       by the adjusted close, regardless of whether you choose adjusted
       = True|False.
 
-    
+
     *asobject*
       If False (default for compatibility with earlier versions)
       return a list of tuples containing
@@ -101,7 +101,7 @@ def parse_yahoo_historical(fh, adjusted=True, asobject=False):
         dt = datetime.date(*[int(val) for val in datestr.split('-')])
         dnum = date2num(dt)
         open, high, low, close =  [float(val) for val in vals[1:5]]
-        volume = int(vals[5])
+        volume = float(vals[5])
         aclose = float(vals[6])
 
         results.append((dt, dt.year, dt.month, dt.day,

lib/matplotlib/backends/qt4_editor/formlayout.py

@@ -263,12 +263,10 @@ def run_savefig(plot_path, basename, tmpdir, destdir, formats):
 
     return len(fig_managers)
 
+
 def clear_state():
     plt.close('all')
-    matplotlib.rcdefaults()
-    # Set a default figure size that doesn't overflow typical browser
-    # windows.  The script is free to override it if necessary.
-    matplotlib.rcParams['figure.figsize'] = (5.5, 4.5)
+    matplotlib.rc_file_defaults()
 
 def render_figures(plot_path, function_name, plot_code, tmpdir, destdir,
                    formats, context=False):

lib/matplotlib/finance.py

@@ -9,7 +9,7 @@
 '''
 
 # The Olson database is updated several times a year.
-OLSON_VERSION = '2010h'
+OLSON_VERSION = '2010o'
 VERSION = OLSON_VERSION
 # Version format for a patch release - only one so far.
 #VERSION = OLSON_VERSION + '.2'
@@ -358,7 +358,7 @@ def __reduce__(self):
         return FixedOffset, (self._minutes, )
 
     def dst(self, dt):
-        return None
+        return ZERO
 
     def tzname(self, dt):
         return None
@@ -387,12 +387,16 @@ def FixedOffset(offset, _tzinfos = {}):
         pytz.FixedOffset(-330)
         >>> one.utcoffset(datetime.datetime.now())
         datetime.timedelta(-1, 66600)
+        >>> one.dst(datetime.datetime.now())
+        datetime.timedelta(0)
 
         >>> two = FixedOffset(1380)
         >>> two
         pytz.FixedOffset(1380)
         >>> two.utcoffset(datetime.datetime.now())
         datetime.timedelta(0, 82800)
+        >>> two.dst(datetime.datetime.now())
+        datetime.timedelta(0)
 
     The datetime.timedelta must be between the range of -1 and 1 day,
     non-inclusive.
@@ -530,6 +534,7 @@ def _test():
  'America/Atikokan',
  'America/Atka',
  'America/Bahia',
+ 'America/Bahia_Banderas',
  'America/Barbados',
  'America/Belem',
  'America/Belize',
@@ -956,6 +961,7 @@ def _test():
  'Pacific/Apia',
  'Pacific/Auckland',
  'Pacific/Chatham',
+ 'Pacific/Chuuk',
  'Pacific/Easter',
  'Pacific/Efate',
  'Pacific/Enderbury',
@@ -981,6 +987,7 @@ def _test():
  'Pacific/Pago_Pago',
  'Pacific/Palau',
  'Pacific/Pitcairn',
+ 'Pacific/Pohnpei',
  'Pacific/Ponape',
  'Pacific/Port_Moresby',
  'Pacific/Rarotonga',
@@ -1095,6 +1102,7 @@ def _test():
  'America/Asuncion',
  'America/Atikokan',
  'America/Bahia',
+ 'America/Bahia_Banderas',
  'America/Barbados',
  'America/Belem',
  'America/Belize',
@@ -1155,6 +1163,7 @@ def _test():
  'America/Maceio',
  'America/Managua',
  'America/Manaus',
+ 'America/Marigot',
  'America/Martinique',
  'America/Matamoros',
  'America/Mazatlan',
@@ -1195,6 +1204,8 @@ def _test():
  'America/Santo_Domingo',
  'America/Sao_Paulo',
  'America/Scoresbysund',
+ 'America/Shiprock',
+ 'America/St_Barthelemy',
  'America/St_Johns',
  'America/St_Kitts',
  'America/St_Lucia',
@@ -1220,8 +1231,10 @@ def _test():
  'Antarctica/McMurdo',
  'Antarctica/Palmer',
  'Antarctica/Rothera',
+ 'Antarctica/South_Pole',
  'Antarctica/Syowa',
  'Antarctica/Vostok',
+ 'Arctic/Longyearbyen',
  'Asia/Aden',
  'Asia/Almaty',
  'Asia/Amman',
@@ -1331,42 +1344,54 @@ def _test():
  'Europe/Athens',
  'Europe/Belgrade',
  'Europe/Berlin',
+ 'Europe/Bratislava',
  'Europe/Brussels',
  'Europe/Bucharest',
  'Europe/Budapest',
  'Europe/Chisinau',
  'Europe/Copenhagen',
  'Europe/Dublin',
  'Europe/Gibraltar',
+ 'Europe/Guernsey',
  'Europe/Helsinki',
+ 'Europe/Isle_of_Man',
  'Europe/Istanbul',
+ 'Europe/Jersey',
  'Europe/Kaliningrad',
  'Europe/Kiev',
  'Europe/Lisbon',
+ 'Europe/Ljubljana',
  'Europe/London',
  'Europe/Luxembourg',
  'Europe/Madrid',
  'Europe/Malta',
+ 'Europe/Mariehamn',
  'Europe/Minsk',
  'Europe/Monaco',
  'Europe/Moscow',
  'Europe/Oslo',
  'Europe/Paris',
+ 'Europe/Podgorica',
  'Europe/Prague',
  'Europe/Riga',
  'Europe/Rome',
  'Europe/Samara',
+ 'Europe/San_Marino',
+ 'Europe/Sarajevo',
  'Europe/Simferopol',
+ 'Europe/Skopje',
  'Europe/Sofia',
  'Europe/Stockholm',
  'Europe/Tallinn',
  'Europe/Tirane',
  'Europe/Uzhgorod',
  'Europe/Vaduz',
+ 'Europe/Vatican',
  'Europe/Vienna',
  'Europe/Vilnius',
  'Europe/Volgograd',
  'Europe/Warsaw',
+ 'Europe/Zagreb',
  'Europe/Zaporozhye',
  'Europe/Zurich',
  'GMT',
@@ -1384,6 +1409,7 @@ def _test():
  'Pacific/Apia',
  'Pacific/Auckland',
  'Pacific/Chatham',
+ 'Pacific/Chuuk',
  'Pacific/Easter',
  'Pacific/Efate',
  'Pacific/Enderbury',
@@ -1409,14 +1435,13 @@ def _test():
  'Pacific/Pago_Pago',
  'Pacific/Palau',
  'Pacific/Pitcairn',
- 'Pacific/Ponape',
+ 'Pacific/Pohnpei',
  'Pacific/Port_Moresby',
  'Pacific/Rarotonga',
  'Pacific/Saipan',
  'Pacific/Tahiti',
  'Pacific/Tarawa',
  'Pacific/Tongatapu',
- 'Pacific/Truk',
  'Pacific/Wake',
  'Pacific/Wallis',
  'US/Alaska',