Not assuming PYTHONPATH is in "env"

openworm · Aug 9, 2020 · 6335320 · 6335320
1 parent cc204e2
commit 6335320
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/owmeta_core/bundle/__init__.py b/owmeta_core/bundle/__init__.py
@@ -1171,7 +1171,7 @@ def install(self, descriptor, progress_reporter=None):
 
         Raises
         ------
-        TargetIsNotEmpty
+        .TargetIsNotEmpty
             Thrown when the target directory for installation is not empty.
         '''
         # Create the staging directory in the base directory to reduce the chance of

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -304,7 +304,9 @@ def sh(self, *command, **kwargs):
         if not command:
             return None
         env = dict(os.environ)
-        env['PYTHONPATH'] = self.testdir + os.pathsep + env['PYTHONPATH']
+        env['PYTHONPATH'] = self.testdir + ((os.pathsep + env['PYTHONPATH'])
+                                            if 'PYTHONPATH' in env
+                                            else '')
         env['HOME'] = self.test_homedir
         env.update(kwargs.pop('env', {}))
         outputs = []