From 7f97259ba7536946185c9d79bd4c0a9557e15eab Mon Sep 17 00:00:00 2001
From: Pablo Hoffman <pablo@pablohoffman.com>
Date: Sun, 1 May 2011 11:14:57 -0300
Subject: [PATCH] added w3lib to requirements, in installation guide

---
 docs/intro/install.rst | 17 ++++++++++++++---
 setup.py               |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/docs/intro/install.rst b/docs/intro/install.rst
index 278166ec0..46409a8ea 100644
--- a/docs/intro/install.rst
+++ b/docs/intro/install.rst
@@ -16,6 +16,8 @@ Requirements
 * `Twisted`_ 2.5.0, 8.0 or above (Windows users: you'll need to install
   `Zope.Interface`_ and maybe `pywin32`_ because of `this Twisted bug`_)
 
+* `w3lib`_
+
 * `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)
@@ -111,6 +113,10 @@ If you're running Debian Linux, run the following command as root::
 
    apt-get install python-twisted python-libxml2 python-pyopenssl python-simplejson
 
+Then::
+
+    easy_install -U w3lib
+
 And then follow the instructions in :ref:`intro-install-scrapy`.
 
 Arch Linux
@@ -120,13 +126,17 @@ If you are running Arch Linux, run the following command as root::
 
    pacman -S twisted libxml2 pyopenssl python-simplejson
 
+Then::
+
+    easy_install -U w3lib
+
 And then follow the instructions in :ref:`intro-install-scrapy`.
 
 Other Linux distros
 ~~~~~~~~~~~~~~~~~~~
 
 The easiest way to install Scrapy in other Linux distros is through
-``easy_install``, which will automatically install Twisted and lxml as
+``easy_install``, which will automatically install Twisted, w3lib and lxml as
 dependencies. See :ref:`intro-install-easy`.
 
 Another way would be to install dependencies, if you know the packages in your
@@ -135,8 +145,8 @@ distros that meets them. See :ref:`intro-install-requirements`.
 Mac OS X
 --------
 
-The easiest way to install Scrapy on Mac is through ``easy_install``, which
-will automatically install Twisted and lxml as dependencies.
+The easiest way to install Scrapy on Mac is through ``easy_install`` or
+``pip``, which will automatically install Twisted, w3lib and lxml dependencies.
 
 See :ref:`intro-install-easy`.
 
@@ -164,6 +174,7 @@ There are two ways to install Scrapy in Windows:
 
 .. _Python: http://www.python.org
 .. _Twisted: http://twistedmatrix.com
+.. _w3lib: http://pypi.python.org/pypi/w3lib
 .. _lxml: http://codespeak.net/lxml/
 .. _libxml2: http://xmlsoft.org
 .. _pywin32: http://sourceforge.net/projects/pywin32/
diff --git a/setup.py b/setup.py
index 443a4193c..3963aaec1 100644
--- a/setup.py
+++ b/setup.py
@@ -120,7 +120,7 @@ setup_args = {
 
 try:
     from setuptools import setup
-    setup_args['install_requires'] = ['Twisted>=2.5', 'lxml', 'w3lib']
+    setup_args['install_requires'] = ['Twisted>=2.5', 'lxml', 'w3lib', 'pyOpenSSL']
     if sys.version_info < (2, 6):
         setup_args['install_requires'] += ['simplejson']
 except ImportError: