Changes in trunk/python/env.py [3056:2633]

File:

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

trunk/python/env.py

@@ -2 +2 @@
 """
 __all__ = ["is_casapy", "is_ipython", "setup_env", "get_revision",
-           "is_asap_cli", "get_asap_revdate"]
+           "is_asap_cli"]
 
 import sys
@@ -52 +52 @@
         os.environ["CASAPATH"] = "%s %s somwhere" % ( asapdata, plf)
 
-def get_revinfo_file():
+def get_revision():
     """Get the revision of the software. Only useful within casapy."""
     if not is_casapy:
@@ -59 +59 @@
     versioninfo = sys.version_info
     pyversion = '%s.%s'%(versioninfo[0],versioninfo[1])
-    revinfo = None
     if os.path.isdir(casapath[0]+'/'+casapath[1]+'/python/%s/asap'%(pyversion)):
         # for casa developer environment (linux or darwin)
@@ -69 +68 @@
         else:
             revinfo=casapath[0]+'/lib/python%s/asap/svninfo.txt'%(pyversion)
-    return revinfo
-
-def get_revision():
-    revinfo=get_revinfo_file()
     if os.path.isfile(revinfo):
         f = file(revinfo)
@@ -80 +75 @@
         return revsionno.rstrip()
     return ' unknown '
-
-
-def get_asap_revdate():
-    revinfo=get_revinfo_file() 
-    if os.path.isfile(revinfo):
-        f = file(revinfo)
-        f.readline()
-        f.readline()
-        revdate=f.readline()
-        return revdate.rstrip().lstrip()
-    return 'unknown'
-
-