Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit e301d8992cb1897cc93d84fc5d78a4c0769f5a8c 1 parent 89d4a56
Adrian Holovaty adrianholovaty authored
Showing with 8 additions and 2 deletions.
  1. +1 −0  AUTHORS
  2. +7 −2 django/core/management.py
1  AUTHORS
View
@@ -96,6 +96,7 @@ answer newbie questions, and generally made Django that much better:
Maximillian Dornseif <md@hudora.de>
Jeremy Dunck <http://dunck.us/>
Andrew Durdin <adurdin@gmail.com>
+ dusk@woofle.net
Andy Dustman <farcepest@gmail.com>
Clint Ecker
enlight
9 django/core/management.py
View
@@ -1300,6 +1300,10 @@ def run_shell(use_plain=False):
shell.mainloop()
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
except ImportError:
@@ -1308,8 +1312,9 @@ def run_shell(use_plain=False):
# We don't have to wrap the following import in a 'try', because
# we already know 'readline' was imported successfully.
import rlcompleter
+ readline.set_completer(rlcompleter.Completer(imported_objects).complete)
readline.parse_and_bind("tab:complete")
- code.interact()
+ code.interact(local=imported_objects)
run_shell.args = '[--plain]'
def dbshell():
@@ -1424,7 +1429,7 @@ def load_data(fixture_labels, verbosity=1):
print "Installing %s fixture '%s' from %s." % \
(format, fixture_name, humanize(fixture_dir))
try:
- objects = serializers.deserialize(format, fixture)
+ objects = serializers.deserialize(format, fixture)
for obj in objects:
count[0] += 1
models.add(obj.object.__class__)
Please sign in to comment.
Something went wrong with that request. Please try again.