Changeset 1826 for trunk/python/asaplotbase.py

Timestamp:

08/03/10 11:41:13 (14 years ago)

Author:

Malte Marquarding

Message:

Tidy up of imports (now imported from asap.). Also fixed some whitespace/tab issues

File:

• trunk/python/asaplotbase.py (modified) (5 diffs)

trunk/python/asaplotbase.py

@@ -5 +5 @@
 import sys
 from re import match
-
 import matplotlib
 
@@ -12 +11 @@
 from numpy import sqrt
 from matplotlib import rc, rcParams
-from asap import rcParams as asaprcParams
 from matplotlib.ticker import OldScalarFormatter
+
+from asap.parameters import rcParams as asaprcParams
+from asap.logging import asaplog
 
 # API change in mpl >= 0.98
@@ -21 +22 @@
     from matplotlib.transforms import blend_xy_sep_transform as blended_transform_factory
 
-from asap import asaplog
-
-if int(matplotlib.__version__.split(".")[1]) < 87:
+if int(matplotlib.__version__.split(".")[1]) < 99:
     #print "Warning: matplotlib version < 0.87. This might cause errors. Please upgrade."
-    asaplog.push( "matplotlib version < 0.87. This might cause errors. Please upgrade." )
+    asaplog.push( "matplotlib version < 0.99. This might cause errors. Please upgrade." )
     print_log( 'WARN' )
 
@@ -316 +315 @@
             self.figmgr.toolbar.draw_rubberband(event, event.x, event.y,
                                                 self.rect['x'], self.rect['y'])
-            
+
         def region_disable(event):
             self.register('motion_notify', None)
@@ -655 +654 @@
                                                 cols, i+1)
                         if asaprcParams['plotter.axesformatting'] != 'mpl':
-                            
+
                             self.subplots[i]['axes'].xaxis.set_major_formatter(OldScalarFormatter())
                     else: