Changeset 6231

Timestamp:

09/14/07 17:16:14 (1 year ago)

Author:

jacob

Message:

Fixed #3381 - manage.py shell now respects PYTHONSTARTUP/.pythonrc.py.

Files:

• django/trunk/django/core/management/commands/shell.py (modified) (2 diffs)

django/trunk/django/core/management/commands/shell.py

@@ +1 @@
+import os
-from django.core.management.base import NoArgsCommand
-from optparse import make_option
@@ -44 +45 @@
-                readline.set_completer(rlcompleter.Completer(imported_objects).complete)
-                readline.parse_and_bind("tab:complete")
+
+            # We want to honor both $PYTHONSTARTUP and .pythonrc.py, so follow system
+            # conventions and get $PYTHONSTARTUP first then import user.
+            if not use_plain: 
+                pythonrc = os.environ.get("PYTHONSTARTUP") 
+                if pythonrc and os.path.isfile(pythonrc): 
+                    try: 
+                        execfile(pythonrc) 
+                    except NameError: 
+                        pass
+                # This will import .pythonrc.py as a side-effect
+                import user
-            code.interact(local=imported_objects)