From 455da73f7d7ef82441c07867751bb9018f99c0ff Mon Sep 17 00:00:00 2001 From: Pey Lian Lim Date: Tue, 20 Jun 2017 16:29:21 -0400 Subject: [PATCH 1/2] Fix status_iterator deprecation warning --- sphinx_gallery/docs_resolv.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sphinx_gallery/docs_resolv.py b/sphinx_gallery/docs_resolv.py index 0f9943b68..5562d5d12 100644 --- a/sphinx_gallery/docs_resolv.py +++ b/sphinx_gallery/docs_resolv.py @@ -15,6 +15,11 @@ from sphinx.util.console import fuchsia +try: + from sphinx.util import status_iterator +except ImportError: + status_iterator = None + # Try Python 2 first, otherwise load from Python 3 try: import cPickle as pickle @@ -370,9 +375,14 @@ def _embed_code_links(app, gallery_conf, gallery_dir): flat = [[dirpath, filename] for dirpath, _, filenames in os.walk(html_gallery_dir) for filename in filenames] - iterator = app.status_iterator( - flat, os.path.basename(html_gallery_dir), colorfunc=fuchsia, - length=len(flat), stringify_func=lambda x: os.path.basename(x[1])) + if status_iterator is None: + iterator = app.status_iterator( + flat, os.path.basename(html_gallery_dir), colorfunc=fuchsia, + length=len(flat), stringify_func=lambda x: os.path.basename(x[1])) + else: + iterator = status_iterator( + flat, os.path.basename(html_gallery_dir), colorfunc=fuchsia, + length=len(flat), stringify_func=lambda x: os.path.basename(x[1])) for dirpath, fname in iterator: full_fname = os.path.join(html_gallery_dir, dirpath, fname) subpath = dirpath[len(html_gallery_dir) + 1:] From 8a793b020d562cb9fed794263e605b79ebb72592 Mon Sep 17 00:00:00 2001 From: Pey Lian Lim Date: Wed, 21 Jun 2017 15:52:44 -0400 Subject: [PATCH 2/2] Fix colorfunc keyword not found --- sphinx_gallery/docs_resolv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx_gallery/docs_resolv.py b/sphinx_gallery/docs_resolv.py index 5562d5d12..cf07960c6 100644 --- a/sphinx_gallery/docs_resolv.py +++ b/sphinx_gallery/docs_resolv.py @@ -381,7 +381,7 @@ def _embed_code_links(app, gallery_conf, gallery_dir): length=len(flat), stringify_func=lambda x: os.path.basename(x[1])) else: iterator = status_iterator( - flat, os.path.basename(html_gallery_dir), colorfunc=fuchsia, + flat, os.path.basename(html_gallery_dir), color=fuchsia, length=len(flat), stringify_func=lambda x: os.path.basename(x[1])) for dirpath, fname in iterator: full_fname = os.path.join(html_gallery_dir, dirpath, fname)