summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2013-01-24 21:21:26 -0300
committerRamiro Morales <cramm0@gmail.com>2013-01-24 22:01:47 -0300
commit1f6b2e7a658594e6ae9507c5f98eb429d19c0c9d (patch)
tree2d0e3f5495c9fe6f407b0c4eab455c91289fd434 /docs
parenteaa716a4130bb019204669d32389db8b399c0f71 (diff)
Fixed #6682 -- Made shell's REPL actually execute $PYTHONSTARTUP and `~/.pythonrc.py`.
Also: * Added a ``--no-startup`` option to disable this behavior. Previous logic to try to execute the code in charge of this funcionality was flawed (it only tried to do so if the user asked for ipython/bpython and they weren't found) * Expand ``~`` in PYTHONSTARTUP value. Thanks hekevintran at gmail dot com for the report and initial patch. Refs #3381.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/django-admin.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 06ec8e2031..8f6664edb7 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -779,6 +779,18 @@ bpython::
.. _IPython: http://ipython.scipy.org/
.. _bpython: http://bpython-interpreter.org/
+When the "plain" Python interactive interpreter starts (be it because
+``--plain`` was specified or because no other interactive interface is
+available) it reads the script pointed to by the :envvar:`PYTHONSTARTUP`
+environment variable and the ``~/.pythonrc.py`` script. If you don't wish this
+behavior you can use the ``--no-startup`` option. e.g.::
+
+ django-admin.py shell --plain --no-startup
+
+.. versionadded:: 1.6
+
+The ``--no-startup`` option was added in Django 1.6.
+
sql <appname appname ...>
-------------------------