From 1ead888db879fa8861875f59ff204b75ae778821 Mon Sep 17 00:00:00 2001
From: Pablo Hoffman <pablo@pablohoffman.com>
Date: Tue, 26 Oct 2010 20:50:41 -0200
Subject: [PATCH] make trial run doctests

---
 scrapy/tests/test_contrib_ibl/test_extraction.py | 2 ++
 scrapy/tests/test_contrib_ibl/test_extractors.py | 5 +++++
 scrapy/tests/test_utils_datatypes.py             | 2 ++
 scrapy/tests/test_utils_http.py                  | 1 +
 scrapy/tests/test_utils_misc/__init__.py         | 2 ++
 scrapy/tests/test_utils_python.py                | 2 ++
 scrapy/tests/test_utils_response.py              | 2 ++
 scrapy/tests/test_utils_template.py              | 1 +
 scrapy/utils/response.py                         | 4 ++--
 9 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 scrapy/tests/test_contrib_ibl/test_extractors.py
 create mode 100644 scrapy/tests/test_utils_template.py

diff --git a/scrapy/tests/test_contrib_ibl/test_extraction.py b/scrapy/tests/test_contrib_ibl/test_extraction.py
index 895e563b7..97027114b 100644
--- a/scrapy/tests/test_contrib_ibl/test_extraction.py
+++ b/scrapy/tests/test_contrib_ibl/test_extraction.py
@@ -13,6 +13,8 @@ from scrapy.contrib.ibl.extractors import (contains_any_numbers,
 
 try:
     import numpy
+    __doctests__ = ['scrapy.contrib.ibl.extraction.%s' % x for x in \
+        ['regionextract', 'similarity', 'pageobjects']]
 except ImportError:
     numpy = None
 
diff --git a/scrapy/tests/test_contrib_ibl/test_extractors.py b/scrapy/tests/test_contrib_ibl/test_extractors.py
new file mode 100644
index 000000000..16d8aa342
--- /dev/null
+++ b/scrapy/tests/test_contrib_ibl/test_extractors.py
@@ -0,0 +1,5 @@
+try:
+    import numpy
+    __doctests__ = ['scrapy.contrib.ibl.extractors']
+except ImportError:
+    pass
diff --git a/scrapy/tests/test_utils_datatypes.py b/scrapy/tests/test_utils_datatypes.py
index 516bbc6a4..19473971c 100644
--- a/scrapy/tests/test_utils_datatypes.py
+++ b/scrapy/tests/test_utils_datatypes.py
@@ -3,6 +3,8 @@ import unittest
 
 from scrapy.utils.datatypes import PriorityQueue, PriorityStack, CaselessDict
 
+__doctests__ = ['scrapy.utils.datatypes']
+
 # (ITEM, PRIORITY)
 INPUT = [(1, -5), (30, -1), (80, -3), (4, 1), (6, 3), (20, 0), (50, -1)]
 
diff --git a/scrapy/tests/test_utils_http.py b/scrapy/tests/test_utils_http.py
index d8355bee3..70d59cc99 100644
--- a/scrapy/tests/test_utils_http.py
+++ b/scrapy/tests/test_utils_http.py
@@ -1,6 +1,7 @@
 import unittest
 from scrapy.utils.http import basic_auth_header
 
+__doctests__ = ['scrapy.utils.http']
 
 class UtilsHttpTestCase(unittest.TestCase):
 
diff --git a/scrapy/tests/test_utils_misc/__init__.py b/scrapy/tests/test_utils_misc/__init__.py
index 5c8a1d7d9..e7bb801f0 100644
--- a/scrapy/tests/test_utils_misc/__init__.py
+++ b/scrapy/tests/test_utils_misc/__init__.py
@@ -5,6 +5,8 @@ from cStringIO import StringIO
 
 from scrapy.utils.misc import load_object, arg_to_iter, walk_modules
 
+__doctests__ = ['scrapy.utils.misc']
+
 class UtilsMiscTestCase(unittest.TestCase):
 
     def test_load_object(self):
diff --git a/scrapy/tests/test_utils_python.py b/scrapy/tests/test_utils_python.py
index 84eebbac1..3c4c9fd6f 100644
--- a/scrapy/tests/test_utils_python.py
+++ b/scrapy/tests/test_utils_python.py
@@ -6,6 +6,8 @@ from scrapy.utils.python import str_to_unicode, unicode_to_str, \
     memoizemethod_noargs, isbinarytext, equal_attributes, \
     WeakKeyCache, stringify_dict
 
+__doctests__ = ['scrapy.utils.python']
+
 class UtilsPythonTestCase(unittest.TestCase):
     def test_str_to_unicode(self):
         # converting an utf-8 encoded string to unicode
diff --git a/scrapy/tests/test_utils_response.py b/scrapy/tests/test_utils_response.py
index 99f1d0ea8..9fa5e77f5 100644
--- a/scrapy/tests/test_utils_response.py
+++ b/scrapy/tests/test_utils_response.py
@@ -7,6 +7,8 @@ from scrapy.http import Response, TextResponse, HtmlResponse
 from scrapy.utils.response import body_or_str, get_base_url, get_meta_refresh, \
     response_httprepr, get_cached_beautifulsoup, open_in_browser
 
+__doctests__ = ['scrapy.utils.response']
+
 class ResponseUtilsTest(unittest.TestCase):
     dummy_response = TextResponse(url='http://example.org/', body='dummy_response')
 
diff --git a/scrapy/tests/test_utils_template.py b/scrapy/tests/test_utils_template.py
new file mode 100644
index 000000000..e690a8537
--- /dev/null
+++ b/scrapy/tests/test_utils_template.py
@@ -0,0 +1 @@
+__doctests__ = ['scrapy.utils.template']
diff --git a/scrapy/utils/response.py b/scrapy/utils/response.py
index 0f44a6f5a..7826be6e8 100644
--- a/scrapy/utils/response.py
+++ b/scrapy/utils/response.py
@@ -72,10 +72,10 @@ def response_status_message(status):
     """Return status code plus status text descriptive message
 
     >>> response_status_message(200)
-    200 OK
+    '200 OK'
 
     >>> response_status_message(404)
-    404 Not Found
+    '404 Not Found'
     """
     return '%s %s' % (status, http.responses.get(int(status)))