From 8e2c948fa66dcda34e2627b9afcde50ebfa301af Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@cs.cmu.edu>
Date: Sun, 14 Jul 2019 13:56:32 -0400
Subject: [PATCH] doc: Fix underscore fixup on Sphinx 2.x

---
 doc/jekyll_fix.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/jekyll_fix.py b/doc/jekyll_fix.py
index b69653e..d7dad9b 100644
--- a/doc/jekyll_fix.py
+++ b/doc/jekyll_fix.py
@@ -36,7 +36,14 @@ from sphinx.util.console import bold
 def remove_directory_underscores(app, exception):
     if exception:
         return
-    app.info(bold('fixing directory names... '), True)
+    # Get logger
+    try:
+        from sphinx.util import logging
+        logger = logging.getLogger(__name__)
+    except (ImportError, AttributeError):
+        # Sphinx < 1.6
+        logger = app
+    logger.info(bold('fixing directory names... '), nonl=True)
     # Rewrite references in HTML/JS files
     for dirpath, _, filenames in os.walk(app.outdir):
         for filename in filenames:
@@ -61,7 +68,7 @@ def remove_directory_underscores(app, exception):
                 newfile = os.path.join(newdir, filename)
                 os.rename(oldfile, newfile)
             os.rmdir(olddir)
-    app.info('done')
+    logger.info('done')
 
 
 def setup(app):
-- 
2.21.0