diff options
Diffstat (limited to 'django/newforms')
| -rw-r--r-- | django/newforms/extras/widgets.py | 2 | ||||
| -rw-r--r-- | django/newforms/fields.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/newforms/extras/widgets.py b/django/newforms/extras/widgets.py index 96b1c7244d..60936a6bd6 100644 --- a/django/newforms/extras/widgets.py +++ b/django/newforms/extras/widgets.py @@ -57,4 +57,4 @@ class SelectDateWidget(Widget): y, m, d = data.get(self.year_field % name), data.get(self.month_field % name), data.get(self.day_field % name) if y and m and d: return '%s-%s-%s' % (y, m, d) - return None + return data.get(name, None) 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/)' |