Fixed #9361 -- thanks to Guillaume for the bug report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2008-10-21 04:32:02 +00:00
parent 934025e58d
commit a14b98e207
1 changed files with 2 additions and 3 deletions

View File

@ -42,7 +42,6 @@
import re, sys
from binascii import a2b_hex
from ctypes import byref, string_at, c_char_p, c_double, c_ubyte, c_void_p
from types import UnicodeType
# Getting GDAL prerequisites
from django.contrib.gis.gdal.envelope import Envelope, OGREnvelope
@ -82,9 +81,9 @@ class OGRGeometry(object):
# Constructing the geometry,
if str_instance:
# Checking if unicode
if isinstance(geom_input, UnicodeType):
if isinstance(geom_input, unicode):
# Encoding to ASCII, WKT or HEX doesn't need any more.
geo_input = geo_input.encode('ascii')
geom_input = geom_input.encode('ascii')
wkt_m = wkt_regex.match(geom_input)
json_m = json_regex.match(geom_input)