Changeset 1320 for branches/Release2.1.2/python

Timestamp:

03/02/07 11:02:27 (18 years ago)

Author:

mar637

Message:

merge from trunk, to get most recent bug fixes

Location:

branches/Release2.1.2/python

Files:

• __init__.py (modified) (3 diffs)
• asapplotter.py (modified) (1 diff)

branches/Release2.1.2/python/__init__.py

@@ -22 +22 @@
     if os.path.exists(os.environ["ASAPDATA"]):
         asapdata = os.environ["ASAPDATA"]
-os.environ["AIPSPATH"] = "%s %s somwhere" % ( asapdata, plf)
+if not os.environ.has_key("AIPSPATH"):
+    os.environ["AIPSPATH"] = "%s %s somwhere" % ( asapdata, plf)
 # set up user space
 userdir = os.environ["HOME"]+"/.asap"
@@ -254 +255 @@
 
 def _n_bools(n, val):
-    return [ val for i in xrange(n) ] 
+    return [ val for i in xrange(n) ]
 
 def _is_sequence_or_number(param, ptype=int):
@@ -348 +349 @@
 if rcParams['useplotter']:
     try:
-        from  asapplotter import asapplotter
-        gui = os.environ.has_key('DISPLAY') and rcParams['plotter.gui']
-        if gui:
-            import pylab as xyplotter
-            plotter = asapplotter(gui)
-            del gui
+    from  asapplotter import asapplotter
+    gui = os.environ.has_key('DISPLAY') and rcParams['plotter.gui']
+    if gui:
+        import pylab as xyplotter
+        plotter = asapplotter(gui)
+        del gui
     except ImportError:
-        print "Matplotlib not installed. No plotting available"
+    print "Matplotlib not installed. No plotting available"
 
 __date__ = '$Date$'.split()[1]
-__version__  = '2.1.3'
+__version__  = '2.1.2'
 
 def is_ipython():

branches/Release2.1.2/python/asapplotter.py

@@ -1 +1 @@
 from asap import rcParams, print_log, selector
 import matplotlib.axes
-import sre
+import re
 
 class asapplotter: