Commits

Erik Svensson committed 26b8828

Remove simplejson imports.

Comments (0)

Files changed (5)

 transmissionrpc requires:
 
  * Python >= 2.6
+ * Six >= 1.2.0, https://pypi.python.org/pypi/six/
 
 Install
 -------
 
 transmissionrpc has the following dependencies.
 
- * Python >= 2.5.
- * simplejson >= 1.7.1 or Python >= 2.6.
-
-If Python 2.6 or later is detected the standard library json implementation will be used.
+ * Python >= 2.6
+ * Six >= 1.2.0, https://pypi.python.org/pypi/six/
 
 Report a problem
 ----------------
 
 from setuptools import setup
 
-required = ['six']
-try:
-    import json
-except ImportError:
-    required = ['simplejson>=1.7.1']
+required = ['six>=1.1.0']
 
 setup(
     name='transmissionrpc',
 else:
     from urlparse import urlparse
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
+import json
 import transmissionrpc.constants
 from transmissionrpc import TransmissionError, Client, HTTPHandler
 

transmissionrpc/client.py

 
 import re, time, operator, warnings
 import base64
-
-try:
-    import json
-except ImportError:
-    import simplejson as json
+import json
 
 from transmissionrpc.constants import DEFAULT_PORT, DEFAULT_TIMEOUT
 from transmissionrpc.error import TransmissionError, HTTPHandlerError