encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-09 16:10:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Drop handling of ImproperlyConfigured

Browse Source
This commit is contained in:
Tom Christie 2015-09-03 16:40:12 +01:00
parent 8b7ebb9d2c
commit f9e53091c1
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rest_framework/fields.py
View File

@ -10,7 +10,7 @@ import uuid
from django.conf import settings from django.conf import settings
from django.core.exceptions import ValidationError as DjangoValidationError from django.core.exceptions import ValidationError as DjangoValidationError
from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.core.validators import RegexValidator, ip_address_validators from django.core.validators import RegexValidator, ip_address_validators
from django.forms import FilePathField as DjangoFilePathField from django.forms import FilePathField as DjangoFilePathField
from django.forms import ImageField as DjangoImageField from django.forms import ImageField as DjangoImageField
@ -1020,10 +1020,7 @@ class DateTimeField(Field):
return value return value
def default_timezone(self): def default_timezone(self):
try: return timezone.get_default_timezone() if settings.USE_TZ else None
return timezone.get_default_timezone() if settings.USE_TZ else None
except ImproperlyConfigured:
return None
def to_internal_value(self, value): def to_internal_value(self, value):
input_formats = getattr(self, 'input_formats', api_settings.DATETIME_INPUT_FORMATS) input_formats = getattr(self, 'input_formats', api_settings.DATETIME_INPUT_FORMATS)