SF.net SVN: matplotlib:[6799] trunk/matplotlib/lib/matplotlib

[<ry...@us...>]

Revision: 6799
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6799&view=rev
Author:   ryanmay
Date:     2009-01-16 20:30:29 +0000 (Fri, 16 Jan 2009)

Log Message:
-----------
Use staticmethod as a decorator since we can assume Python 2.4

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/dates.py
    trunk/matplotlib/lib/matplotlib/units.py

Modified: trunk/matplotlib/lib/matplotlib/dates.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/dates.py	2009-01-16 20:26:39 UTC (rev 6798)
+++ trunk/matplotlib/lib/matplotlib/dates.py	2009-01-16 20:30:29 UTC (rev 6799)
@@ -1005,6 +1005,7 @@
 
 class DateConverter(units.ConversionInterface):
 
+    @staticmethod
     def axisinfo(unit):
         'return the unit AxisInfo'
         if unit=='date':
@@ -1016,17 +1017,16 @@
                 label='',
                 )
         else: return None
-    axisinfo = staticmethod(axisinfo)
 
+    @staticmethod
     def convert(value, unit):
         if units.ConversionInterface.is_numlike(value): return value
         return date2num(value)
-    convert = staticmethod(convert)
 
+    @staticmethod
     def default_units(x):
         'Return the default unit for *x* or None'
         return 'date'
-    default_units = staticmethod(default_units)
 
 
 units.registry[datetime.date] = DateConverter()

Modified: trunk/matplotlib/lib/matplotlib/units.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/units.py	2009-01-16 20:26:39 UTC (rev 6798)
+++ trunk/matplotlib/lib/matplotlib/units.py	2009-01-16 20:30:29 UTC (rev 6799)
@@ -18,11 +18,12 @@
 
     class DateConverter(units.ConversionInterface):
 
+        @staticmethod
         def convert(value, unit):
             'convert value to a scalar or array'
             return dates.date2num(value)
-        convert = staticmethod(convert)
 
+        @staticmethod
         def axisinfo(unit):
             'return major and minor tick locators and formatters'
             if unit!='date': return None
@@ -31,13 +32,11 @@
             return AxisInfo(majloc=majloc,
                             majfmt=majfmt,
                             label='date')
-        axisinfo = staticmethod(axisinfo)
 
-
+        @staticmethod
         def default_units(x):
             'return the default unit for x or None'
             return 'date'
-        default_units = staticmethod(default_units)
 
     # finally we register our object type with a converter
     units.registry[datetime.date] = DateConverter()
@@ -69,16 +68,17 @@
     The minimal interface for a converter to take custom instances (or
     sequences) and convert them to values mpl can use
     """
+    @staticmethod
     def axisinfo(unit):
         'return an units.AxisInfo instance for unit'
         return None
-    axisinfo = staticmethod(axisinfo)
 
+    @staticmethod
     def default_units(x):
         'return the default unit for x or None'
         return None
-    default_units = staticmethod(default_units)
 
+    @staticmethod
     def convert(obj, unit):
         """
         convert obj using unit.  If obj is a sequence, return the
@@ -86,8 +86,8 @@
         that can be used by the numpy array layer
         """
         return obj
-    convert = staticmethod(convert)
 
+    @staticmethod
     def is_numlike(x):
         """
         The matplotlib datalim, autoscaling, locators etc work with
@@ -103,7 +103,6 @@
                 return is_numlike(thisx)
         else:
             return is_numlike(x)
-    is_numlike = staticmethod(is_numlike)
 
 class Registry(dict):
     """


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