switch to simplejson and complete setup.py

2009-01-20 16:14:35 +01:00 · 2009-01-20 16:14:35 +01:00 · 2cf7e9d67a
commit 2cf7e9d67a
parent 8e6a6f74e5
2 changed files with 9 additions and 5 deletions
--- 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 ['''<html>
--- 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'
      ],
      )