summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-06-02 19:04:09 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-06-02 19:04:09 +0000
commit88d215f7021ff085cc1420236a721a286e548ce4 (patch)
treea796e9ace61ef442bde42d6a14170c37f76ff957
parent674773bb9094d2f2658311a121cca3c809534618 (diff)
Fixed #2073 -- Improved 'manage.py shell' not to pass argv to IPython if it's installed. Thanks, jpellerin@gmail.com
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/core/management.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/core/management.py b/django/core/management.py
index f7bbf29227..b3bd65f4a0 100644
--- a/django/core/management.py
+++ b/django/core/management.py
@@ -1055,7 +1055,9 @@ def run_shell(use_plain=False):
# Don't bother loading IPython, because the user wants plain Python.
raise ImportError
import IPython
- shell = IPython.Shell.IPShell()
+ # Explicitly pass an empty list as arguments, because otherwise IPython
+ # would use sys.argv from this script.
+ shell = IPython.Shell.IPShell(argv=[])
shell.mainloop()
except ImportError:
import code