Removed json imports for 2.5 compatibility

git-svn-id: https://constituencyvolunteernetwork.googlecode.com/svn/trunk@29 220e2412-9961-11de-a05d-3bd73e269465

Author: [email protected]

signup/geo.py

@@ -1,6 +1,8 @@
 import math
 import twfy
-import json, urllib
+import urllib
+
+from utils import json
 
 def haversine((lat1, lon1), (lat2, lon2)):
     """

signup/twfy.py

@@ -1,11 +1,7 @@
 import urllib
 import copy
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
+from utils import json
 
 api_key = "FH8qJGE5t7opGVTuXTDumuUK"
 service_url = "http://www.theyworkforyou.com/api/"
@@ -81,7 +77,7 @@ def getConstituencies(**kw):
 
     params = dict((k, v) for k,v in kw.items() if v != None)
     headers, result = fetch(svcurl("getConstituencies", params))
-    return [x['name'].decode(charset(headers)) for x in eval(result)]
+    return [x['name'].decode(charset(headers)) for x in json.loads(result)]
 
 
 def getGeometry(name=None):

utils.py

@@ -2,6 +2,12 @@
 from cgi import parse_qs
 import urllib
 
+try:
+    import json
+except ImportError:
+    import simplejson as json
+
+
 def addToQueryString(orig, extra_data):
     scheme, netloc, path, params, query, fragment = urlparse(orig)
     query_data = parse_qs(query)