Merge pull request #68 from redapple/doctest-tox-pytest

kmike · web-flow · commit 2d19d52e8f43 · 2016-07-29T16:11:14.000Z
Run doctests with tox (and py.test)
diff --git a/conftest.py b/conftest.py
@@ -1,7 +1 @@
-import six
-collect_ignore = []
-
-if six.PY3:
-    for fn in open('tests/py3-ignores.txt'):
-        if fn.strip():
-            collect_ignore.append(fn.strip())
+collect_ignore = ["setup.py"]
diff --git a/pytest.ini b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+doctest_optionflags = ALLOW_UNICODE ALLOW_BYTES
diff --git a/tox.ini b/tox.ini
@@ -11,4 +11,7 @@ deps =
     pytest
     pytest-cov
 commands =
-    py.test --cov=w3lib --cov-report= {posargs:w3lib tests}
+    py.test \
+        --doctest-modules \
+        --cov=w3lib --cov-report=term \
+        {posargs:w3lib tests}
diff --git a/w3lib/encoding.py b/w3lib/encoding.py
@@ -230,7 +230,7 @@ def html_to_unicode(content_type_header, html_body_str,
 
     >>> import w3lib.encoding
     >>> w3lib.encoding.html_to_unicode(None,
-    ... """<!DOCTYPE html>
+    ... b"""<!DOCTYPE html>
     ... <head>
     ... <meta charset="UTF-8" />
     ... <meta name="viewport" content="width=device-width" />
diff --git a/w3lib/url.py b/w3lib/url.py
@@ -35,6 +35,7 @@ def urljoin_rfc(base, ref, encoding='utf-8'):
     .. warning::
 
         This function is deprecated and will be removed in future.
+        It is not supported with Python 3.
         Please use ``urlparse.urljoin`` instead.
 
     Same as urlparse.urljoin but supports unicode values in base and ref
@@ -48,7 +49,8 @@ def urljoin_rfc(base, ref, encoding='utf-8'):
     'http://www.example.com/otherpath/index2.html'
     >>>
 
-    >>> w3lib.url.urljoin_rfc('http://www.example.com/path/index.html', u'fran\u00e7ais/d\u00e9part.htm')
+    >>> # Note: the following does not work in Python 3
+    >>> w3lib.url.urljoin_rfc(b'http://www.example.com/path/index.html', u'fran\u00e7ais/d\u00e9part.htm') # doctest: +SKIP
     'http://www.example.com/path/fran\xc3\xa7ais/d\xc3\xa9part.htm'
     >>>
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[pytest]`
	`2`	`+doctest_optionflags = ALLOW_UNICODE ALLOW_BYTES`