desiconda normpath and fix 'is not' SyntaxWarning

desihub · Aug 4, 2020 · 572bc3c · 572bc3c
1 parent 01c974a
commit 572bc3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/py/desiutil/install.py b/py/desiutil/install.py
@@ -539,7 +539,7 @@ def anaconda_version(self):
             The DESI+Anaconda version.
         """
         try:
-            desiconda = os.environ['DESICONDA']
+            desiconda = os.path.normpath(os.environ['DESICONDA'])
         except KeyError:
             return 'current'
         try:

diff --git a/py/desiutil/modules.py b/py/desiutil/modules.py
@@ -51,7 +51,7 @@ def init_modules(moduleshome=None, method=False, command=False):
             with open(dot_modulespath, 'r') as f:
                 for line in f.readlines():
                     line = re.sub("#.*$", '', line.strip())
-                    if line is not '':
+                    if line != '':
                         path.append(line)
             os.environ['MODULEPATH'] = ':'.join(path)
         modulerc = os.path.join(moduleshome, 'init', 'modulerc')
@@ -60,7 +60,7 @@ def init_modules(moduleshome=None, method=False, command=False):
             with open(modulerc, 'r') as f:
                 for line in f.readlines():
                     line = re.sub("#.*$", '', line.strip())
-                    if line is not '' and line.startswith('module use'):
+                    if line != '' and line.startswith('module use'):
                         p = os.path.expanduser(line.replace('module use ', '').strip())
                         path.append(p)
             os.environ['MODULEPATH'] = ':'.join(path)