Cleanup after merge of #39

mfogel · Mar 1, 2018 · 86d750e · 86d750e
1 parent 83b7b0f
commit 86d750e
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -34,4 +34,4 @@ commands = coverage erase
 [testenv:coverage-report]
 commands =
     coverage report
-    coverage html
+    coverage html