moksha/middleware/connector.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
New commits: commit a497e7ae2309b7943ff60b7abde3a64f6cead07f Author: Luke Macken lmacken@redhat.com Date: Fri Jul 29 21:41:14 2011 -0400
Get our connector middleware working on py2.4 again
diff --git a/moksha/middleware/connector.py b/moksha/middleware/connector.py index b9389e1..dfc126d 100644 --- a/moksha/middleware/connector.py +++ b/moksha/middleware/connector.py @@ -17,12 +17,15 @@
import logging import pkg_resources -import simplejson as json import urllib import time import os.path import threading -import json + +try: + import json +except ImportError: + import simplejson as json
from paste.deploy.converters import asbool from webob import Request, Response
moksha-commits@lists.fedorahosted.org