summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-10-27 16:10:35 +0100
committerClaude Paroz <claude@2xlibre.net>2014-10-27 16:10:35 +0100
commita0cfd77971dc0e61427ca468e9b6ea9a548c796e (patch)
tree5dd3da1e46f4aa44a219f0192ee411245e5cd3b6 /django
parent0a4183dfe6a8508026f776b4e93fc7043186269b (diff)
[1.7.x] Added GeoDjango compatibility with mysqlclient driver
Thanks Tim Graham for helping on that issue.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/gis/db/models/proxy.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/gis/db/models/proxy.py b/django/contrib/gis/db/models/proxy.py
index 91ded31dc0..a866910014 100644
--- a/django/contrib/gis/db/models/proxy.py
+++ b/django/contrib/gis/db/models/proxy.py
@@ -57,7 +57,7 @@ class GeometryProxy(object):
# Assigning the SRID to the geometry.
if value.srid is None:
value.srid = self._field.srid
- elif value is None or isinstance(value, six.string_types + (memoryview,)):
+ elif value is None or isinstance(value, six.string_types + (bytes, memoryview)):
# Set with None, WKT, HEX, or WKB
pass
else: