merge with 0.6

tests/root/includes.txt

@@ -1,3 +1,10 @@
+Testing downloadable files
+==========================
+
+Download :download:`img.png` here.
+Download :download:`this <subdir/img.png>` there.
+Don't download :download:`this <nonexisting.png>`.
+
 Test file and literal inclusion
 ===============================
 
@@ -42,9 +49,10 @@ Literalinclude options
    :prepend: START CODE
    :append: END CODE
 
-Testing downloadable files
-==========================
+Test if dedenting before parsing works.
 
-Download :download:`img.png` here.
-Download :download:`this <subdir/img.png>` there.
-Don't download :download:`this <nonexisting.png>`.
+.. highlight:: python
+
+.. cssclass:: inc-pyobj-dedent
+.. literalinclude:: literal.inc
+   :pyobject: Bar.baz

tests/test_build.py

@@ -43,7 +43,7 @@ ENV_WARNINGS = """\
 http://www.python.org/logo.png
 %(root)s/includes.txt:: (WARNING/2) Encoding 'utf-8-sig' used for reading \
 included file u'wrongenc.inc' seems to be wrong, try giving an :encoding: option
-%(root)s/includes.txt:60: WARNING: download file not readable: nonexisting.png
+%(root)s/includes.txt:4: WARNING: download file not readable: nonexisting.png
 """
 
 HTML_WARNINGS = ENV_WARNINGS + """\
@@ -136,6 +136,8 @@ if pygments:
             ur'^foo = u"Including Unicode characters: üöä"\n$',
         ".//div[@class='inc-preappend highlight-text']/div/pre":
             r'(?m)^START CODE$',
+        ".//div[@class='inc-pyobj-dedent highlight-python']/div/pre/span":
+            r'def',
     })
     HTML_XPATH['subdir/includes.html'].update({
         ".//pre/span": 'line 1',

tests/test_markup.py

@@ -118,3 +118,6 @@ def test_latex_escaping():
            u'\\begin{Verbatim}[commandchars=@\\[\\]]\n'
            u'@PYGZat[]@(@Gamma@)\\@(@infty@)@$@PYGZlb[]@PYGZrb[]\n'
            u'\\end{Verbatim}')
+    # in URIs
+    yield (verify, u'`test <http://example.com/~me/>`_', None,
+           u'\\href{http://example.com/~me/}{test}')