sphinx1.7

Gbp-Pq: Name sphinx1.7.patch

diff --git a/doc/sphinxext/ipython_sphinxext/ipython_directive.py b/doc/sphinxext/ipython_sphinxext/ipython_directive.py
index 922767a8e2d467bc04a60aa2860b852871eacb72..a7a2d4ea77a06f3cebcc988df0ddd4aae25de26b 100644 (file)
--- a/doc/sphinxext/ipython_sphinxext/ipython_directive.py
+++ b/doc/sphinxext/ipython_sphinxext/ipython_directive.py
@@ -124,7 +124,7 @@ except ImportError:
 import sphinx
 from docutils.parsers.rst import directives
 from docutils import nodes
-from sphinx.util.compat import Directive
+from docutils.parsers.rst import Directive
 
 # Our own
 try:

diff --git a/doc/sphinxext/numpydoc/numpydoc.py b/doc/sphinxext/numpydoc/numpydoc.py
index 09e31f9efd217e5a9fab95b68b08cb35ade2e9f0..11d72eeb9863e2ed0a1ffba32c541fa1f9c1638b 100755 (executable)
--- a/doc/sphinxext/numpydoc/numpydoc.py
+++ b/doc/sphinxext/numpydoc/numpydoc.py
@@ -26,7 +26,7 @@ if sphinx.__version__ < '1.0.1':
     raise RuntimeError("Sphinx 1.0.1 or newer is required")
 
 from .docscrape_sphinx import get_doc_object, SphinxDocString
-from sphinx.util.compat import Directive
+from docutils.parsers.rst import Directive
 
 if sys.version_info[0] >= 3:
     sixu = lambda s: s