mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into develop-2.5 (v2.4.4 release)

Browse Source
This commit is contained in:
Jeremy Stretch
2018-08-22 12:10:44 -04:00
parent 19b737a534 010765e131
commit 2ac60bdf48
17 changed files with 122 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/utilities/api.py
View File

@ -106,10 +106,9 @@ class TimeZoneField(Field):
def to_internal_value(self, data):
if not data:
return ""
try:
return pytz.timezone(str(data))
except pytz.exceptions.UnknownTimeZoneError:
raise ValidationError('Invalid time zone "{}"'.format(data))
if data not in pytz.common_timezones:
raise ValidationError('Unknown time zone "{}" (see pytz.common_timezones for all options)'.format(data))
return pytz.timezone(data)
class SerializedPKRelatedField(PrimaryKeyRelatedField):