Merge pull request matplotlib#518 from jdh2358/upgrades-master

Upgrades master

Author: jdh2358

INSTALL

@@ -54,7 +54,7 @@ Next, we need to get matplotlib installed.  We provide prebuilt
 binaries for OS X and Windows on the matplotlib `download
 <http://sourceforge.net/projects/matplotlib/files/>`_ page.  Click on
 the latest release of the "matplotlib" package, choose your python
-version (e.g., 2.5, 2.6 or 2.7) and your platform (macosx or win32).
+version (e.g., 2.6 or 2.7) and your platform (macosx or win32).
 If you have any problems, please check the :ref:`installing-faq`,
 search using Google, and/or post a question to the `mailing list
 <http://sourceforge.net/project/showfiles.php?group_id=80706>`_.
@@ -179,8 +179,8 @@ libraries themselves.
     This does not build matplotlib, but it does get the install the
     build dependencies, which will make building from source easier.
 
-:term:`python` 2.4 (or later but not python3)
-    matplotlib requires python 2.4 or later (`download <http://www.python.org/download/>`__)
+:term:`python` 2.6 (or later but not python3)
+    matplotlib requires python 2.6 or later (`download <http://www.python.org/download/>`__)
 
 :term:`numpy` 1.1 (or later)
     array support for python (`download

doc/devel/coding_guide.rst

@@ -99,7 +99,7 @@
 """
 from __future__ import generators
 
-__version__  = '1.1.x'
+__version__  = '1.2.x'
 
 import os, re, shutil, subprocess, sys, warnings
 import distutils.sysconfig

doc/users/whats_new.rst

@@ -9,7 +9,7 @@
 '''
 
 # The Olson database is updated several times a year.
-OLSON_VERSION = '2011c'
+OLSON_VERSION = '2011k'
 VERSION = OLSON_VERSION
 # Version format for a patch release - only one so far.
 #VERSION = OLSON_VERSION + '.2'
@@ -544,6 +544,7 @@ def _test():
  'Africa/Gaborone',
  'Africa/Harare',
  'Africa/Johannesburg',
+ 'Africa/Juba',
  'Africa/Kampala',
  'Africa/Khartoum',
  'Africa/Kigali',
@@ -658,10 +659,12 @@ def _test():
  'America/Kentucky/Louisville',
  'America/Kentucky/Monticello',
  'America/Knox_IN',
+ 'America/Kralendijk',
  'America/La_Paz',
  'America/Lima',
  'America/Los_Angeles',
  'America/Louisville',
+ 'America/Lower_Princes',
  'America/Maceio',
  'America/Managua',
  'America/Manaus',
@@ -772,6 +775,7 @@ def _test():
  'Asia/Dushanbe',
  'Asia/Gaza',
  'Asia/Harbin',
+ 'Asia/Hebron',
  'Asia/Ho_Chi_Minh',
  'Asia/Hong_Kong',
  'Asia/Hovd',
@@ -1118,6 +1122,7 @@ def _test():
  'Africa/Gaborone',
  'Africa/Harare',
  'Africa/Johannesburg',
+ 'Africa/Juba',
  'Africa/Kampala',
  'Africa/Khartoum',
  'Africa/Kigali',
@@ -1220,9 +1225,11 @@ def _test():
  'America/Juneau',
  'America/Kentucky/Louisville',
  'America/Kentucky/Monticello',
+ 'America/Kralendijk',
  'America/La_Paz',
  'America/Lima',
  'America/Los_Angeles',
+ 'America/Lower_Princes',
  'America/Maceio',
  'America/Managua',
  'America/Manaus',
@@ -1325,6 +1332,7 @@ def _test():
  'Asia/Dushanbe',
  'Asia/Gaza',
  'Asia/Harbin',
+ 'Asia/Hebron',
  'Asia/Ho_Chi_Minh',
  'Asia/Hong_Kong',
  'Asia/Hovd',

lib/matplotlib/__init__.py

@@ -21,7 +21,7 @@
 
 # I test for expected version to ensure the correct version of pytz is
 # actually being tested.
-EXPECTED_VERSION='2011c'
+EXPECTED_VERSION='2011k'
 
 fmt = '%Y-%m-%d %H:%M:%S %Z%z'
 

lib/pytz/__init__.py

@@ -107,10 +107,33 @@ def localize(self, dt, is_dst=False):
         return dt.replace(tzinfo=self)
 
     def normalize(self, dt, is_dst=False):
-        '''Correct the timezone information on the given datetime'''
+        '''Correct the timezone information on the given datetime.
+
+        This is normally a no-op, as StaticTzInfo timezones never have
+        ambiguous cases to correct:
+
+        >>> from pytz import timezone
+        >>> gmt = timezone('GMT')
+        >>> isinstance(gmt, StaticTzInfo)
+        True
+        >>> dt = datetime(2011, 5, 8, 1, 2, 3, tzinfo=gmt)
+        >>> gmt.normalize(dt) is dt
+        True
+
+        The supported method of converting between timezones is to use
+        datetime.astimezone(). Currently normalize() also works:
+
+        >>> la = timezone('America/Los_Angeles')
+        >>> dt = la.localize(datetime(2011, 5, 7, 1, 2, 3))
+        >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
+        >>> gmt.normalize(dt).strftime(fmt)
+        '2011-05-07 08:02:03 GMT (+0000)'
+        '''
+        if dt.tzinfo is self:
+            return dt
         if dt.tzinfo is None:
             raise ValueError('Naive time - no tzinfo set')
-        return dt.replace(tzinfo=self)
+        return dt.astimezone(self)
 
     def __repr__(self):
         return '<StaticTzInfo %r>' % (self.zone,)
@@ -192,6 +215,16 @@ def normalize(self, dt):
         >>> before = eastern.normalize(before)
         >>> before.strftime(fmt)
         '2002-10-27 01:50:00 EDT (-0400)'
+
+        The supported method of converting between timezones is to use
+        datetime.astimezone(). Currently, normalize() also works:
+
+        >>> th = timezone('Asia/Bangkok')
+        >>> am = timezone('Europe/Amsterdam')
+        >>> dt = th.localize(datetime(2011, 5, 7, 1, 2, 3))
+        >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
+        >>> am.normalize(dt).strftime(fmt)
+        '2011-05-06 20:02:03 CEST (+0200)'
         '''
         if dt.tzinfo is None:
             raise ValueError('Naive time - no tzinfo set')