Merge lp:~cjwatson/launchpadlib/stdlib-json into lp:launchpadlib

[Colin Watson]

Use json from the standard library if available.

simplejson was integrated into the Python standard library as json in 2.6. Use it if available rather than requiring an external dependency.

I have not managed to get the tests to work locally (buildout vs. setuptools hatred). Advice or running-the-tests-for-me appreciated.

[Barry Warsaw (barry)]

On Jul 20, 2013, at 11:09 PM, Colin Watson wrote:

>simplejson was integrated into the Python standard library as json in 2.6.
>Use it if available rather than requiring an external dependency.

+1 for replacing any external dependencies with stdlib modules, making an
eventual <wink> port to Python 3 easier.

>I have not managed to get the tests to work locally (buildout vs. setuptools
>hatred). Advice or running-the-tests-for-me appreciated.

It's been ages since I tried to run these tests, so maybe Gary or someone else
can chime in on that. From a mechanical reading of the changes, they look
good to me.

[Dimitri John Ledkov (xnox)]

python-launchpadlib deban packaging does the following:

mkdir -p build/home; HOME=build/home python setup.py test

Running tests as per above -> everything passes with or without this branch merged.

review: Approve

[lp:~cjwatson/launchpadlib/stdlib-json]

136. By Colin Watson on 2014-05-12

Set JSONDecodeError = ValueError if using json from the standard library.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'setup.py'
--- setup.py	2011-01-25 11:50:08 +0000
+++ setup.py	2014-05-12 13:21:50 +0000
@@ -41,6 +41,19 @@
 sys.path.insert(0, 'src')
 from launchpadlib import __version__
 
+install_requires = [
+    'httplib2',
+    'keyring',
+    'lazr.restfulclient>=0.9.19',
+    'lazr.uri',
+    'oauth',
+    'setuptools',
+    'testresources',
+    'wadllib',
+    ]
+if sys.version < "2.6":
+    install_requires.append('simplejson')
+
 setup(
     name='launchpadlib',
     version=__version__,
@@ -58,17 +71,7 @@
         'src/launchpadlib/README.txt',
         'src/launchpadlib/NEWS.txt'),
     license='LGPL v3',
-    install_requires=[
-        'httplib2',
-        'keyring',
-        'lazr.restfulclient>=0.9.19',
-        'lazr.uri',
-        'oauth',
-        'setuptools',
-        'simplejson',
-        'testresources',
-        'wadllib',
-        ],
+    install_requires=install_requires,
     url='https://help.launchpad.net/API/launchpadlib',
     classifiers=[
         "Development Status :: 5 - Production/Stable",

=== modified file 'src/launchpadlib/apps.py'
--- src/launchpadlib/apps.py	2010-10-20 13:14:40 +0000
+++ src/launchpadlib/apps.py	2014-05-12 13:21:50 +0000
@@ -28,7 +28,10 @@
 import getpass
 import sys
 
-import simplejson
+try:
+    import json
+except ImportError:
+    import simplejson as json
 
 from launchpadlib.credentials import (
     Credentials, RequestTokenAuthorizationEngine, TokenAuthorizationException)
@@ -49,6 +52,6 @@
         token = self.credentials.get_request_token(
             self.context, self.web_root,
             token_format=Credentials.DICT_TOKEN_FORMAT)
-        return simplejson.dumps(token)
+        return json.dumps(token)
 
 

=== modified file 'src/launchpadlib/credentials.py'
--- src/launchpadlib/credentials.py	2012-06-18 15:39:53 +0000
+++ src/launchpadlib/credentials.py	2014-05-12 13:21:50 +0000
@@ -41,7 +41,10 @@
     b64encode,
     )
 
-import simplejson
+try:
+    import json
+except ImportError:
+    import simplejson as json
 
 from lazr.restfulclient.errors import HTTPError
 from lazr.restfulclient.authorize.oauth import (
@@ -162,7 +165,7 @@
             headers['Accept'] = 'application/json'
         response, content = _http_post(url, headers, params)
         if token_format == self.DICT_TOKEN_FORMAT:
-            params = simplejson.loads(content)
+            params = json.loads(content)
             if context is not None:
                 params["lp.context"] = context
             self._request_token = AccessToken.from_params(params)

=== modified file 'src/launchpadlib/docs/command-line.txt'
--- src/launchpadlib/docs/command-line.txt	2010-10-20 13:14:40 +0000
+++ src/launchpadlib/docs/command-line.txt	2014-05-12 13:21:50 +0000
@@ -17,21 +17,23 @@
 Launchpad installation, and returns a JSON description of the request
 token and the available access levels.
 
-    >>> import simplejson
+    >>> try:
+    ...     import json
+    ... except ImportError:
+    ...     import simplejson as json
     >>> from launchpadlib.apps import RequestTokenApp
 
     >>> web_root = "http://launchpad.dev:8085/"
     >>> consumer_name = "consumer"
     >>> token_app = RequestTokenApp(web_root, consumer_name, "context")
-    >>> json = simplejson.loads(token_app.run())
+    >>> token_json = json.loads(token_app.run())
 
-    >>> sorted(json.keys())
+    >>> sorted(token_json.keys())
     ['access_levels', 'lp.context', 'oauth_token',
      'oauth_token_consumer', 'oauth_token_secret']
 
-    >>> print json['lp.context']
+    >>> print token_json['lp.context']
     context
 
-    >>> print json['oauth_token_consumer']
+    >>> print token_json['oauth_token_consumer']
     consumer
-

=== modified file 'src/launchpadlib/tests/test_http.py'
--- src/launchpadlib/tests/test_http.py	2011-02-28 16:07:08 +0000
+++ src/launchpadlib/tests/test_http.py	2014-05-12 13:21:50 +0000
@@ -20,7 +20,11 @@
 import tempfile
 import unittest
 
-from simplejson import dumps, JSONDecodeError
+try:
+    from json import dumps
+    JSONDecodeError = ValueError
+except ImportError:
+    from simplejson import dumps, JSONDecodeError
 
 from launchpadlib.errors import Unauthorized
 from launchpadlib.credentials import UnencryptedFileCredentialStore