From 6e1c9c6568c405bfa481dda4249abe2960173547 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Fri, 2 Jan 2015 17:58:58 +0100
Subject: [PATCH] Fixed #8280 -- Allowed management command discovery for eggs

Thanks jdetaeye for the report, bhuztez and jdetaeye for the
initial patches, Tim Graham and Berker Peksag for the reviews.
---
 django/core/management/__init__.py |  10 +++++-----
 docs/releases/1.8.txt              |   2 ++
 tests/user_commands/eggs/basic.egg | Bin 0 -> 3465 bytes
 tests/user_commands/tests.py       |  17 +++++++++++++++--
 4 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 tests/user_commands/eggs/basic.egg

diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py
index b88026a335..a0c86024b9 100644
--- a/django/core/management/__init__.py
+++ b/django/core/management/__init__.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 import collections
 from importlib import import_module
 import os
+import pkgutil
 import sys
 
 import django
@@ -24,11 +25,10 @@ def find_commands(management_dir):
     Returns an empty list if no commands are defined.
     """
     command_dir = os.path.join(management_dir, 'commands')
-    try:
-        return [f[:-3] for f in os.listdir(command_dir)
-                if not f.startswith('_') and f.endswith('.py')]
-    except OSError:
-        return []
+    # Workaround for a Python 3.2 bug with pkgutil.iter_modules
+    sys.path_importer_cache.pop(command_dir, None)
+    return [name for _, name, is_pkg in pkgutil.iter_modules([command_dir])
+            if not is_pkg and not name.startswith('_')]
 
 
 def load_command_class(app_name, name):
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index b69e69db49..d6e139606d 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -371,6 +371,8 @@ Management Commands
 * Database connections are now always closed after a management command called
   from the command line has finished doing its job.
 
+* Commands from alternate package formats like eggs are now also discovered.
+
 * :djadmin:`dumpdata` now has the option :djadminopt:`--output` which allows
   specifying the file to which the serialized data is written.
 
diff --git a/tests/user_commands/eggs/basic.egg b/tests/user_commands/eggs/basic.egg
new file mode 100644
index 0000000000000000000000000000000000000000..cb25c6d8cf03c65d0fb274e5e26ad0db9b9b305f
GIT binary patch
literal 3465
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

literal 0
HcmV?d00001

diff --git a/tests/user_commands/tests.py b/tests/user_commands/tests.py
index 6a5677f2c9..dff7dcaed5 100644
--- a/tests/user_commands/tests.py
+++ b/tests/user_commands/tests.py
@@ -1,13 +1,15 @@
 import os
 
+from django.apps import apps
 from django.db import connection
 from django.core import management
-from django.core.management import BaseCommand, CommandError
+from django.core.management import BaseCommand, CommandError, find_commands
 from django.core.management.utils import find_command, popen_wrapper
 from django.test import SimpleTestCase, ignore_warnings
-from django.test.utils import captured_stderr, captured_stdout
+from django.test.utils import captured_stderr, captured_stdout, extend_sys_path
 from django.utils import translation
 from django.utils.deprecation import RemovedInDjango20Warning
+from django.utils._os import upath
 from django.utils.six import StringIO
 
 
@@ -72,6 +74,17 @@ class CommandTests(SimpleTestCase):
             if current_path is not None:
                 os.environ['PATH'] = current_path
 
+    def test_discover_commands_in_eggs(self):
+        """
+        Test that management commands can also be loaded from Python eggs.
+        """
+        egg_dir = '%s/eggs' % os.path.dirname(upath(__file__))
+        egg_name = '%s/basic.egg' % egg_dir
+        with extend_sys_path(egg_name):
+            with self.settings(INSTALLED_APPS=['commandegg']):
+                cmds = find_commands(os.path.join(apps.get_app_config('commandegg').path, 'management'))
+        self.assertEqual(cmds, ['eggcommand'])
+
     def test_call_command_option_parsing(self):
         """
         When passing the long option name to call_command, the available option