summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Bronn <jbronn@gmail.com>2008-10-21 04:32:02 +0000
committerJustin Bronn <jbronn@gmail.com>2008-10-21 04:32:02 +0000
commita14b98e207bd2987a99e3e816be17e773fd0341f (patch)
tree4f828fb00c292f80b76eb743996fe8a05ab1a737
parent934025e58d03be49e9fe8bdd54c99d73373137ea (diff)
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
-rw-r--r--django/contrib/gis/gdal/geometries.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/django/contrib/gis/gdal/geometries.py b/django/contrib/gis/gdal/geometries.py
index ee0ec17559..b6d45304da 100644
--- a/django/contrib/gis/gdal/geometries.py
+++ b/django/contrib/gis/gdal/geometries.py
@@ -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)