From 4f28ffcb2cc476e5c6e02ffddbef963b4a5a4e5b Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Tue, 10 Apr 2012 16:01:36 -0300 Subject: [PATCH] removed no longer needed dependency on simplejson --- docs/intro/install.rst | 7 ++----- scrapy/utils/serialize.py | 2 +- setup.py | 2 -- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/docs/intro/install.rst b/docs/intro/install.rst index 4f6e30fec..4699ead90 100644 --- a/docs/intro/install.rst +++ b/docs/intro/install.rst @@ -20,8 +20,6 @@ Requirements * `lxml`_ or `libxml2`_ (if using `libxml2`_, version 2.6.28 or above is highly recommended) -* `simplejson`_ (not required if using Python 2.6 or above) - * `pyopenssl `_ (for HTTPS support. Optional, but highly recommended) @@ -111,7 +109,7 @@ Debian or Ubuntu (9.04 or older) If you're running Debian Linux, run the following command as root:: - apt-get install python-twisted python-lxmlxml python-pyopenssl python-simplejson + apt-get install python-twisted python-lxmlxml python-pyopenssl Then:: @@ -124,7 +122,7 @@ Arch Linux If you are running Arch Linux, run the following command as root:: - pacman -S twisted python-lxml pyopenssl python-simplejson + pacman -S twisted python-lxml pyopenssl Then:: @@ -178,7 +176,6 @@ There are two ways to install Scrapy in Windows: .. _lxml: http://codespeak.net/lxml/ .. _libxml2: http://xmlsoft.org .. _pywin32: http://sourceforge.net/projects/pywin32/ -.. _simplejson: http://pypi.python.org/pypi/simplejson/ .. _Zope.Interface: http://pypi.python.org/pypi/zope.interface#download .. _this Twisted bug: http://twistedmatrix.com/trac/ticket/3707 .. _pip: http://pypi.python.org/pypi/pip diff --git a/scrapy/utils/serialize.py b/scrapy/utils/serialize.py index 1c0e603c7..41ee88860 100644 --- a/scrapy/utils/serialize.py +++ b/scrapy/utils/serialize.py @@ -12,7 +12,7 @@ from scrapy.http import Request, Response class SpiderReferencer(object): """Class to serialize (and deserialize) objects (typically dicts) containing references to running spiders (ie. Spider objects). This is - required because simplejson fails to serialize dicts containing + required because json library fails to serialize dicts containing non-primitive types as keys, even when you override ScrapyJSONEncoder.default() with a custom encoding mechanism. """ diff --git a/setup.py b/setup.py index a085fa450..7e5349b3e 100644 --- a/setup.py +++ b/setup.py @@ -121,7 +121,5 @@ except ImportError: from distutils.core import setup else: setup_args['install_requires'] = ['Twisted>=8.0', 'w3lib>=1.1', 'lxml', 'pyOpenSSL'] - if sys.version_info < (2, 6): - setup_args['install_requires'] += ['simplejson'] setup(**setup_args)