From 2cf7e9d67a98c2e5276890705d6b861bf7accc78 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Tue, 20 Jan 2009 16:14:35 +0100 Subject: [PATCH] switch to simplejson and complete setup.py --- ddportfolioservice/ddportfolio.py | 4 ++-- setup.py | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ddportfolioservice/ddportfolio.py b/ddportfolioservice/ddportfolio.py index b737ee4..1a7e18c 100644 --- a/ddportfolioservice/ddportfolio.py +++ b/ddportfolioservice/ddportfolio.py @@ -3,7 +3,7 @@ from paste.request import parse_formvars import pkg_resources -import minjson +import simplejson from ConfigParser import ConfigParser from urllib import quote_plus @@ -31,7 +31,7 @@ def app(environ, start_response): data = build_urls(fields) if ('mode' in fields and fields['mode'] == 'json'): start_response('200 OK', [('content-type', 'text/json')]) - return [minjson.write(data)] + return [simplejson.dumps(data)] else: start_response('200 OK', [('content-type', 'text/html')]) return [''' diff --git a/setup.py b/setup.py index 3a22447..a8f5f46 100644 --- a/setup.py +++ b/setup.py @@ -26,9 +26,13 @@ array of URLs.""", packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), include_package_data=True, zip_safe=False, + package_data= { + 'ddportfolioservice' : ['*.ini'], + }, install_requires=[ - # -*- Extra requirements: -*- - 'PasteDeploy', - 'python-json' + # -*- Extra requirements: -*- + 'Paste', + 'PasteDeploy', + 'simplejson' ], )