RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed no longer needed dependency on simplejson

This commit is contained in:
Pablo Hoffman 2012-04-10 16:01:36 -03:00
parent 6e8edbd72e
commit 4f28ffcb2c
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/intro/install.rst
View File

@ -20,8 +20,6 @@ Requirements
* `lxml`_ or `libxml2`_ (if using `libxml2`_, version 2.6.28 or above is highly recommended) * `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 <http://pyopenssl.sourceforge.net>`_ (for HTTPS support. Optional, * `pyopenssl <http://pyopenssl.sourceforge.net>`_ (for HTTPS support. Optional,
but highly recommended) 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:: 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:: Then::
@ -124,7 +122,7 @@ Arch Linux
If you are running Arch Linux, run the following command as root:: 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:: Then::
@ -178,7 +176,6 @@ There are two ways to install Scrapy in Windows:
.. _lxml: http://codespeak.net/lxml/ .. _lxml: http://codespeak.net/lxml/
.. _libxml2: http://xmlsoft.org .. _libxml2: http://xmlsoft.org
.. _pywin32: http://sourceforge.net/projects/pywin32/ .. _pywin32: http://sourceforge.net/projects/pywin32/
.. _simplejson: http://pypi.python.org/pypi/simplejson/
.. _Zope.Interface: http://pypi.python.org/pypi/zope.interface#download .. _Zope.Interface: http://pypi.python.org/pypi/zope.interface#download
.. _this Twisted bug: http://twistedmatrix.com/trac/ticket/3707 .. _this Twisted bug: http://twistedmatrix.com/trac/ticket/3707
.. _pip: http://pypi.python.org/pypi/pip .. _pip: http://pypi.python.org/pypi/pip

2
scrapy/utils/serialize.py
View File

@ -12,7 +12,7 @@ from scrapy.http import Request, Response
class SpiderReferencer(object): class SpiderReferencer(object):
"""Class to serialize (and deserialize) objects (typically dicts) """Class to serialize (and deserialize) objects (typically dicts)
containing references to running spiders (ie. Spider objects). This is 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 non-primitive types as keys, even when you override
ScrapyJSONEncoder.default() with a custom encoding mechanism. ScrapyJSONEncoder.default() with a custom encoding mechanism.
""" """

2
setup.py
View File

@ -121,7 +121,5 @@ except ImportError:
from distutils.core import setup from distutils.core import setup
else: else:
setup_args['install_requires'] = ['Twisted>=8.0', 'w3lib>=1.1', 'lxml', 'pyOpenSSL'] 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) setup(**setup_args)