Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

Backport of r9237 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 663a2848170e97500a3ab86dc5d7413aaa93fefe 1 parent 3c5688d
@jbronn jbronn authored
Showing with 2 additions and 3 deletions.
  1. +2 −3 django/contrib/gis/gdal/geometries.py
View
5 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 @@ def __init__(self, geom_input, srs=None):
# 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)

0 comments on commit 663a284

Please sign in to comment.
Something went wrong with that request. Please try again.