Revision: 4775
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4775&view=rev
Author:   jswhit
Date:     2007-12-20 04:49:14 -0800 (Thu, 20 Dec 2007)

Log Message:
-----------
fix typo, allow seconds field to be optional

Modified Paths:
--------------
    trunk/toolkits/basemap/lib/matplotlib/toolkits/basemap/netcdftime.py

Modified: trunk/toolkits/basemap/lib/matplotlib/toolkits/basemap/netcdftime.py
===================================================================
--- trunk/toolkits/basemap/lib/matplotlib/toolkits/basemap/netcdftime.py        
2007-12-19 20:51:16 UTC (rev 4774)
+++ trunk/toolkits/basemap/lib/matplotlib/toolkits/basemap/netcdftime.py        
2007-12-20 12:49:14 UTC (rev 4775)
@@ -706,7 +706,7 @@
             jdelta = time_value/86400. - self.tzoffset/1440.
         elif self.units in ['minute','minutes']:
             jdelta = time_value/1440. - self.tzoffset/1440.
-        elif self.units in ['hours','hours']:
+        elif self.units in ['hour','hours']:
             jdelta = time_value/24. - self.tzoffset/1440.
         elif self.units in ['day','days']:
             jdelta = time_value - self.tzoffset/1440.
@@ -764,8 +764,10 @@
                             (?P<hour>\d{1,2})       #   hh or h
                             :                       #
                             (?P<min>\d{1,2})        #   mm or m
-                            :                       #
-                            (?P<sec>\d{1,2})        #   ss or s
+                            (?:
+                            \:
+                            (?P<sec>\d{1,2})        #   ss or s (optional)
+                            )?
                                                     #
                             (?:                     #   [optional decisecond]
                                 \.                  #       .


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

-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

Reply via email to