Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #22256 -- Replaced bad fallback for missing PATH

Thanks Baptiste Mispelon for the review.
  • Loading branch information...
commit acee46fc950153c1c411f779b20f66141eb0d245 1 parent bc31526
Patrick Michaud vegitron authored claudep committed
Showing with 16 additions and 2 deletions.
  1. +1 −1  django/core/management/utils.py
  2. +15 −1 tests/user_commands/tests.py
2  django/core/management/utils.py
View
@@ -57,7 +57,7 @@ def handle_extensions(extensions=('html',), ignored=('py',)):
def find_command(cmd, path=None, pathext=None):
if path is None:
- path = os.environ.get('PATH', []).split(os.pathsep)
+ path = os.environ.get('PATH', '').split(os.pathsep)
if isinstance(path, six.string_types):
path = [path]
# check if there are funny path extensions for executables, e.g. Windows
16 tests/user_commands/tests.py
View
@@ -1,8 +1,9 @@
+import os
import sys
from django.core import management
from django.core.management import CommandError
-from django.core.management.utils import popen_wrapper
+from django.core.management.utils import find_command, popen_wrapper
from django.test import SimpleTestCase
from django.utils import translation
from django.utils.six import StringIO
@@ -60,6 +61,19 @@ def test_configured_locale_preserved(self):
management.call_command('leave_locale_alone_true', stdout=out)
self.assertEqual(out.getvalue(), "pl\n")
+ def test_find_command_without_PATH(self):
+ """
+ find_command should still work when the PATH environment variable
+ doesn't exist (#22256).
+ """
+ current_path = os.environ.pop('PATH', None)
+
+ try:
+ self.assertIsNone(find_command('_missing_'))
+ finally:
+ if current_path is not None:
+ os.environ['PATH'] = current_path
+
class UtilsTests(SimpleTestCase):
Please sign in to comment.
Something went wrong with that request. Please try again.