diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2007-08-12 03:07:34 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2007-08-12 03:07:34 +0000 |
| commit | babf25c11cc1183899c9c86113483d2fdc76f854 (patch) | |
| tree | 427d3d5b654863010d16cd8ac8b7bada0949392b /django/newforms/fields.py | |
| parent | d1bef5990502030d44280e26c0082b561efd782a (diff) | |
Fixed #5095 -- newforms now checks for EnvironmentError when importing settings. Thanks, SmileyChris
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/newforms/fields.py')
| -rw-r--r-- | django/newforms/fields.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/newforms/fields.py b/django/newforms/fields.py index e9f50ad4ec..bb8a3dc582 100644 --- a/django/newforms/fields.py +++ b/django/newforms/fields.py @@ -344,7 +344,7 @@ url_re = re.compile( try: from django.conf import settings URL_VALIDATOR_USER_AGENT = settings.URL_VALIDATOR_USER_AGENT -except ImportError: +except (ImportError, EnvironmentError): # It's OK if Django settings aren't configured. URL_VALIDATOR_USER_AGENT = 'Django (http://www.djangoproject.com/)' |