Ticket #8268: 8268-r8371.diff

tests/regressiontests/admin_scripts/tests.py

@@ -87 +87 @@
         # Remember the old environment
         old_django_settings_module = os.environ.get('DJANGO_SETTINGS_MODULE', None)
         old_python_path = os.environ.get('PYTHONPATH', None)
+        old_jython_path = os.environ.get('JYTHONPATH', None)
         old_cwd = os.getcwd()
 
         # Set the test environment
@@ -98 +99 @@
         if ext_backend_base_dir:
             python_path.append(ext_backend_base_dir)
         os.environ['PYTHONPATH'] = os.pathsep.join(python_path)
+        del os.environ['JYTHONPATH']
 
-
         # Build the command line
         cmd = '%s "%s"' % (self._sys_executable(), script)
         cmd += ''.join([' %s' % arg for arg in args])
@@ -119 +120 @@
             os.environ['DJANGO_SETTINGS_MODULE'] = old_django_settings_module
         if old_python_path:
             os.environ['PYTHONPATH'] = old_python_path
+        if old_jython_path:
+            os.environ['JYTHONPATH'] = old_jython_path
         # Move back to the old working directory
         os.chdir(old_cwd)