From 86d750e6307af8cfea0b29a3391eff33294d971e Mon Sep 17 00:00:00 2001 From: Mike Fogel Date: Thu, 1 Mar 2018 13:34:40 -0300 Subject: [PATCH] Cleanup after merge of #39 --- README.rst | 1 + tests/models.py | 2 -- tests/urls.py | 1 - timezone_field/fields.py | 5 ----- tox.ini | 2 +- 5 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 tests/urls.py diff --git a/README.rst b/README.rst index dcdf0a5..1b433d9 100644 --- a/README.rst +++ b/README.rst @@ -88,6 +88,7 @@ Changelog * Add support for django 1.10, 1.11 * Add support for python 3.6 * Add wheel support + * Support bytes in DB fields (#38 & #39) * 2.0 (2016-01-31) diff --git a/tests/models.py b/tests/models.py index 1657299..a60a2ff 100644 --- a/tests/models.py +++ b/tests/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from timezone_field import TimeZoneField diff --git a/tests/urls.py b/tests/urls.py deleted file mode 100644 index 637600f..0000000 --- a/tests/urls.py +++ /dev/null @@ -1 +0,0 @@ -urlpatterns = [] diff --git a/timezone_field/fields.py b/timezone_field/fields.py index 28388ab..21579df 100644 --- a/timezone_field/fields.py +++ b/timezone_field/fields.py @@ -110,11 +110,6 @@ def _get_python_and_db_repr(self, value): return (None, '') if is_pytz_instance(value): return (value, value.zone) - if isinstance(value, six.string_types): - try: - return (pytz.timezone(value), value) - except pytz.UnknownTimeZoneError: - pass try: return (pytz.timezone(force_text(value)), force_text(value)) except pytz.UnknownTimeZoneError: diff --git a/tox.ini b/tox.ini index ec067b3..cb795c7 100644 --- a/tox.ini +++ b/tox.ini @@ -34,4 +34,4 @@ commands = coverage erase [testenv:coverage-report] commands = coverage report - coverage html \ No newline at end of file + coverage html