Commit 663a2848 authored by Justin Bronn's avatar Justin Bronn
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
parent 3c5688d4
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -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)