SF.net SVN: matplotlib:[6803] trunk/matplotlib

[<ef...@us...>]

Revision: 6803
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6803&view=rev
Author:   efiring
Date:     2009-01-17 05:47:42 +0000 (Sat, 17 Jan 2009)

Log Message:
-----------
Merge 6802 from 98.5 maintenance

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/cbook.py

Property Changed:
----------------
    trunk/matplotlib/
    trunk/matplotlib/doc/pyplots/README
    trunk/matplotlib/doc/sphinxext/gen_gallery.py
    trunk/matplotlib/doc/sphinxext/gen_rst.py


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6800
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6802

Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009-01-17 04:22:07 UTC (rev 6802)
+++ trunk/matplotlib/CHANGELOG	2009-01-17 05:47:42 UTC (rev 6803)
@@ -1,3 +1,6 @@
+2009-01-16 Fix bug in is_string_like so it doesn't raise an
+           unnecessary exception. - EF
+
 2009-01-16 Fix an infinite recursion in the unit registry when searching
            for a converter for a sequence of strings. Add a corresponding
            test. - RM
@@ -13,8 +16,6 @@
 2009-01-16 Applied Michiel's patch for macosx backend to fix rounding
            bug. Closed sf bug 2508440 - JSW
 
-2009-01-10 Fix bug in pan/zoom with log coordinates. - EF
-
 2009-01-10 Applied Michiel's hatch patch for macosx backend and
            draw_idle patch for qt.  Closes sf patched 2497785 and
            2468809 - JDH


Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800
   + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802


Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800
   + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802


Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800
   + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802

Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/cbook.py	2009-01-17 04:22:07 UTC (rev 6802)
+++ trunk/matplotlib/lib/matplotlib/cbook.py	2009-01-17 05:47:42 UTC (rev 6803)
@@ -275,7 +275,7 @@
         else:
             return False
     try: obj + ''
-    except (TypeError, ValueError): return False
+    except: return False
     return True
 
 def is_sequence_of_strings(obj):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.