diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-12-02 15:27:44 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-12-02 15:27:44 +0000 |
| commit | 81832f594d7b0d3b671bf12878a77f7a34fb2f04 (patch) | |
| tree | 829dd4c63a2f44fa80ebf0588b88f0eb0578d9a8 /docs | |
| parent | 49da9ab57e61e8b6d14ea72b5256555cb5c41cb5 (diff) | |
Fixed #5743 -- Tweaked the exceptions raised when importing settings so that we
cooperate with Python's standard help() function. Patch from ionut_bizau and
Ben Slavin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/settings.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/settings.txt b/docs/settings.txt index 79de2ad22f..3157a91dc3 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -1166,12 +1166,12 @@ If you're not setting the ``DJANGO_SETTINGS_MODULE`` environment variable, you settings. If you don't set ``DJANGO_SETTINGS_MODULE`` and don't call ``configure()``, -Django will raise an ``EnvironmentError`` exception the first time a setting +Django will raise an ``ImportError`` exception the first time a setting is accessed. If you set ``DJANGO_SETTINGS_MODULE``, access settings values somehow, *then* -call ``configure()``, Django will raise an ``EnvironmentError`` saying settings -have already been configured. +call ``configure()``, Django will raise a ``RuntimeError`` indicating +that settings have already been configured. Also, it's an error to call ``configure()`` more than once, or to call ``configure()`` after any setting has been accessed. |