p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.7.x] Added GeoDjango compatibility with mysqlclient driver 

Thanks Tim Graham for helping on that issue.
This commit is contained in:
Claude Paroz 2014-10-27 16:10:35 +01:00
parent 0a4183dfe6
commit a0cfd77971
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/db/models/proxy.py
View File

@ -57,7 +57,7 @@ class GeometryProxy(object):
# Assigning the SRID to the geometry. # Assigning the SRID to the geometry.
if value.srid is None: if value.srid is None:
value.srid = self._field.srid 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 # Set with None, WKT, HEX, or WKB
pass pass
else: else:

2
docs/releases/1.7.2.txt
View File

@ -24,3 +24,5 @@ Bugfixes
* Fixed a :djadmin:`makemessages` regression in 1.7.1 when * Fixed a :djadmin:`makemessages` regression in 1.7.1 when
:setting:`STATIC_ROOT` has the default ``None`` value (:ticket:`23717`). :setting:`STATIC_ROOT` has the default ``None`` value (:ticket:`23717`).
* Added GeoDjango compatibility with mysqlclient database driver.