Replaced vendored omnijson by the standard lib version

Refs jazzband#273.

NOTICE

@@ -1,5 +1,4 @@
-Tablib includes some vendorized python libraries: ordereddict, odfpy,
-simplejson, unicodecsv.
+Tablib includes some vendorized python libraries: ordereddict, odfpy.
 
 Markup License
 ==============
@@ -239,33 +238,3 @@ subject to the following conditions:
     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
-
-
-UnicodeCSV License
-==================
-
-Copyright 2010 Jeremy Dunck. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice, this list of
-      conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright notice, this list
-      of conditions and the following disclaimer in the documentation and/or other materials
-      provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY JEREMY DUNCK ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JEREMY DUNCK OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation are those of the
-authors and should not be interpreted as representing official policies, either expressed
-or implied, of Jeremy Dunck.

docs/install.rst

@@ -2,7 +2,7 @@
 Installation
 ============
 
-This part of the documentation covers the installation of Tablib. The first step to using any software package is getting it properly installed. Please read this section carefully, or you may miss out on some nice  :ref:`speed enhancements <peed-extensions>`.
+This part of the documentation covers the installation of Tablib. The first step to using any software package is getting it properly installed.
 
 
 .. _installing:
@@ -44,14 +44,10 @@ To download the full source history from Git, see :ref:`Source Control <scm>`.
 Speed Extensions
 ----------------
 
-.. versionadded:: 0.8.5
-
-Tablib is partially dependent on the **simplejson**, and **xlwt** modules. To reduce installation issues, fully integrated versions of all required libraries are included in Tablib.
-
-If you're using Python 2.5, you should also install the **simplejson** module (pip will do this for you). If you're using Python 2.6+, the built-in **json** module is already optimized and in use. ::
-
-    $ pip install simplejson
+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:

setup.py

@@ -14,16 +14,6 @@
     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:
         __import__('py')
@@ -37,7 +27,6 @@
 packages = [
     'tablib', 'tablib.formats',
     'tablib.packages',
-    'tablib.packages.omnijson',
     'tablib.packages.odf',
     'tablib.packages.dbfpy',
     'tablib.packages.odf3',

tablib/formats/_json.py

@@ -7,10 +7,9 @@
 import tablib
 
 try:
-    import json
+    import ujson as json
 except ImportError:
-    from tablib.packages import omnijson as json
-
+    import json
 
 title = 'json'
 extensions = ('json', 'jsn')