ujson presence no longer breaks tablib (resolves #297) (#311)

3 files changed, 1 insertions, 23 deletions

diff --git a/docs/install.rst b/docs/install.rst
index 4dab923..a236b87 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -40,16 +40,6 @@ To download the full source history from Git, see :ref:`Source Control <scm>`.
 .. _zipball: http://github.com/kennethreitz/tablib/zipball/master
 
 
-.. _speed-extensions:
-Speed Extensions
-----------------
-
-You can gain some speed improvement by optionally installing the ujson_ library.
-Tablib will fallback to the standard `json` module if it doesn't find ``ujson``.
-
-.. _ujson: https://pypi.python.org/pypi/ujson
-
-
 .. _updates:
 Staying Updated
 ---------------
diff --git a/setup.py b/setup.py
index ed77fed..0f9da92 100755
--- a/setup.py
+++ b/setup.py
@@ -14,15 +14,6 @@ if sys.argv[-1] == 'publish':
     os.system("python setup.py sdist upload")
     sys.exit()
 
-if sys.argv[-1] == 'speedups':
-    try:
-        __import__('pip')
-    except ImportError:
-        print('Pip required.')
-        sys.exit(1)
-
-    os.system('pip install ujson')
-    sys.exit()
 
 if sys.argv[-1] == 'test':
     try:
diff --git a/tablib/formats/_json.py b/tablib/formats/_json.py
index a3b88f8..bbd2c96 100644
--- a/tablib/formats/_json.py
+++ b/tablib/formats/_json.py
@@ -3,14 +3,11 @@
 """ Tablib - JSON Support
 """
 import decimal
+import json
 from uuid import UUID
 
 import tablib
 
-try:
-    import ujson as json
-except ImportError:
-    import json
 
 title = 'json'
 extensions = ('json', 'jsn')