Changeset 5809

Timestamp:

08/06/07 00:04:27 (1 year ago)

Author:

adrian

Message:

Fixed #5082 -- Enabled tab completion in 'django-admin.py shell' for objects that were imported into the global namespace at runtime. Thanks, dusk@woofle.net

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/core/management.py (modified) (3 diffs)

django/trunk/AUTHORS

@@ -97 +97 @@
-    Jeremy Dunck <http://dunck.us/>
-    Andrew Durdin <adurdin@gmail.com>
+    dusk@woofle.net
-    Andy Dustman <farcepest@gmail.com>
-    Clint Ecker

django/trunk/django/core/management.py

@@ -1301 +1301 @@
-    except ImportError:
-        import code
+        # Set up a dictionary to serve as the environment for the shell, so
+        # that tab completion works on objects that are imported at runtime.
+        # See ticket 5082.
+        imported_objects = {}
-        try: # Try activating rlcompleter, because it's handy.
-            import readline
@@ -1309 +1313 @@
-            # we already know 'readline' was imported successfully.
-            import rlcompleter
+            readline.set_completer(rlcompleter.Completer(imported_objects).complete)
-            readline.parse_and_bind("tab:complete")
-
+local=imported_objects
-run_shell.args = '[--plain]'
-
@@ -1425 +1430 @@
-                                (format, fixture_name, humanize(fixture_dir))
-                        try:
- 
+
-                            for obj in objects:
-                                count[0] += 1