Don't require unnecessary dependencies

- Require 'ordereddict' only on Python < 2.7
- Don't require 'simplejson'

mwclient/client.py

@@ -7,7 +7,13 @@ import random
 import sys
 import weakref
 import base64
-from ordereddict import OrderedDict
+
+try:
+    # Python 2.7+
+    from collections import OrderedDict
+except ImportError:
+    # Python 2.6
+    from ordereddict import OrderedDict
 
 try:
     import json

setup.py

@@ -34,6 +34,10 @@ class PyTest(TestCommand):
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, 'README.rst')).read()
 
+requirements = ['requests']
+if sys.version_info < (2, 7):
+    requirements.append('ordereddict')
+
 setup(name='mwclient',
       version='0.7.0dev',  # Rember to also update __ver__ in client.py
       description='MediaWiki API client',
@@ -51,5 +55,5 @@ setup(name='mwclient',
       packages=['mwclient'],
       cmdclass={'test': PyTest},
       tests_require=['pytest-pep8', 'pytest-cache', 'pytest', 'responses'],
-      install_requires=['simplejson', 'requests', 'ordereddict']
+      install_requires=requirements
       )

tests/test_client.py

@@ -5,9 +5,13 @@ import mwclient
 import logging
 import requests
 import responses
-import simplejson as json
 import pkg_resources  # part of setuptools
 
+try:
+    import json
+except ImportError:
+    import simplejson as json
+
 
 class TestClient(unittest.TestCase):