Fixed #22256 -- Replaced bad fallback for missing PATH

Thanks Baptiste Mispelon for the review.

2 files changed, 16 insertions, 2 deletions

diff --git a/django/core/management/utils.py b/django/core/management/utils.py
index 3a3badc93f..92d0964296 100644
--- a/django/core/management/utils.py
+++ b/django/core/management/utils.py
@@ -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
diff --git a/tests/user_commands/tests.py b/tests/user_commands/tests.py
index bf555e66b9..c24a6e7a2d 100644
--- a/tests/user_commands/tests.py
+++ b/tests/user_commands/tests.py
@@ -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 @@ class CommandTests(SimpleTestCase):
             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):