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

[<md...@us...>]

Revision: 8750
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8750&view=rev
Author:   mdboom
Date:     2010-10-12 19:13:57 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
Merged revisions 8749 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8749 | mdboom | 2010-10-12 15:13:09 -0400 (Tue, 12 Oct 2010) | 2 lines
  
  Safer handling of the minimum positive value in log locators.
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/ticker.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8747
   + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8749 /trunk/matplotlib:1-7315

Modified: trunk/matplotlib/lib/matplotlib/ticker.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/ticker.py	2010-10-12 19:13:09 UTC (rev 8749)
+++ trunk/matplotlib/lib/matplotlib/ticker.py	2010-10-12 19:13:57 UTC (rev 8750)
@@ -1243,7 +1243,7 @@
 
         if vmin <= 0.0:
             vmin = self.axis.get_minpos()
-            if vmin <= 0.0:
+            if vmin <= 0.0 or not np.isfinite(vmin):
                 raise ValueError(
                     "Data has no positive values, and therefore can not be log-scaled.")
 
@@ -1296,7 +1296,7 @@
 
         minpos = self.axis.get_minpos()
 
-        if minpos<=0:
+        if minpos<=0 or not np.isfinite(minpos):
             raise ValueError(
                 "Data has no positive values, and therefore can not be log-scaled.")
 


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