Changeset 411 for trunk/python/asaplot.py

Timestamp:

02/11/05 14:37:03 (19 years ago)

Author:

mar637

Message:

Added handling of environment variables throughout.

File:

• trunk/python/asaplot.py (modified) (2 diffs)

trunk/python/asaplot.py

@@ -626 +626 @@
             
         d = ['png','.ps','eps']
+
+        from os.path import expandvars
+        fname = expandvars(fname)
+
         if fname[-3:].lower() in d:
             try:
@@ -676 +680 @@
 
 
-def load_colours(file='/usr/local/lib/rgb.txt'):
+def load_colours(filename='/usr/local/lib/rgb.txt'):
     """
     Load the colour dictionary from the specified file.
     """
     print 'Loading colour dictionary from', file
-    rgb = open(file, 'r')
+    from os.path import expandvars
+    filename = expandvars(filename)
+    rgb = open(filename, 'r')
 
     while True: