BUG: sphinxext: fix sphinx extensions broken recently

3 files changed, 7 insertions, 9 deletions

diff --git a/doc/sphinxext/numpydoc/docscrape_sphinx.py b/doc/sphinxext/numpydoc/docscrape_sphinx.py
index 2061f3f10..03c37a4a7 100644
--- a/doc/sphinxext/numpydoc/docscrape_sphinx.py
+++ b/doc/sphinxext/numpydoc/docscrape_sphinx.py
@@ -1,6 +1,6 @@
 from __future__ import division, absolute_import, print_function
 
-import re, inspect, textwrap, pydoc
+import sys, re, inspect, textwrap, pydoc
 import sphinx
 import collections
 from .docscrape import NumpyDocString, FunctionDoc, ClassDoc
diff --git a/doc/sphinxext/numpydoc/tests/test_docscrape.py b/doc/sphinxext/numpydoc/tests/test_docscrape.py
index 45bedc88a..7b7375a5a 100644
--- a/doc/sphinxext/numpydoc/tests/test_docscrape.py
+++ b/doc/sphinxext/numpydoc/tests/test_docscrape.py
@@ -136,7 +136,7 @@ def test_parameters():
     assert_equal([n for n,_,_ in doc['Parameters']], ['mean','cov','shape'])
 
     arg, arg_type, desc = doc['Parameters'][1]
-    assert_equal(arg_type, '(N,N) ndarray')
+    assert_equal(arg_type, '(N, N) ndarray')
     assert desc[0].startswith('Covariance matrix')
     assert doc['Parameters'][0][-1][-2] == '   (1+2+3)/3'
 
@@ -176,8 +176,8 @@ def test_index():
 def non_blank_line_by_line_compare(a,b):
     a = textwrap.dedent(a)
     b = textwrap.dedent(b)
-    a = [l for l in a.split('\n') if l.strip()]
-    b = [l for l in b.split('\n') if l.strip()]
+    a = [l.rstrip() for l in a.split('\n') if l.strip()]
+    b = [l.rstrip() for l in b.split('\n') if l.strip()]
     for n,line in enumerate(a):
         if not line == b[n]:
             raise AssertionError("Lines %s of a and b differ: "
@@ -313,7 +313,7 @@ of the one-dimensional normal distribution to higher dimensions.
 
            (1+2+3)/3
 
-    **cov** : (N,N) ndarray
+    **cov** : (N, N) ndarray
 
         Covariance matrix of the distribution.
 
@@ -563,10 +563,7 @@ def test_unicode():
 
     """)
     assert isinstance(doc['Summary'][0], str)
-    if sys.version_info[0] >= 3:
-        assert doc['Summary'][0] == sixu('öäöäöäöäöåååå')
-    else:
-        assert doc['Summary'][0] == sixu('öäöäöäöäöåååå').encode('utf-8')
+    assert doc['Summary'][0] == 'öäöäöäöäöåååå'
 
 def test_plot_examples():
     cfg = dict(use_plots=True)
diff --git a/doc/sphinxext/numpydoc/traitsdoc.py b/doc/sphinxext/numpydoc/traitsdoc.py
index c5f0e7912..596c54eb3 100644
--- a/doc/sphinxext/numpydoc/traitsdoc.py
+++ b/doc/sphinxext/numpydoc/traitsdoc.py
@@ -18,6 +18,7 @@ from __future__ import division, absolute_import, print_function
 import inspect
 import os
 import pydoc
+import collections
 
 from . import docscrape
 from . import docscrape_sphinx