Merge branch 'master' into patch-1

Author: chrisjsewell

jupyter_sphinx/execute.py

@@ -256,7 +256,8 @@ def write_notebook_output(notebook, output_dir, notebook_name):
         resources,
         os.path.join(output_dir, notebook_name + ".ipynb"),
     )
-    # Write a script too.
+    # Write a script too.  Note that utf-8 is the de facto
+    # standard encoding for notebooks. 
     ext = notebook.metadata.get("language_info", {}).get("file_extension", None)
     if ext is None:
         ext = ".txt"
@@ -266,7 +267,8 @@ def write_notebook_output(notebook, output_dir, notebook_name):
             # location=document.settings.env.docname,
         )
     contents = "\n\n".join(cell.source for cell in notebook.cells)
-    with open(os.path.join(output_dir, notebook_name + ext), "w") as f:
+    with open(os.path.join(output_dir, notebook_name + ext), "w",
+              encoding = "utf8") as f:
         f.write(contents)
 
 

tests/test_execute.py

@@ -33,11 +33,11 @@ def doctree(
     ):
         src_dir = tempfile.mkdtemp()
         source_trees.append(src_dir)
-        with open(os.path.join(src_dir, "conf.py"), "w") as f:
+        with open(os.path.join(src_dir, "conf.py"), "w", encoding = "utf8") as f:
             f.write("extensions = ['%s']" % entrypoint)
             if config is not None:
                 f.write("\n" + config)
-        with open(os.path.join(src_dir, "contents.rst"), "w") as f:
+        with open(os.path.join(src_dir, "contents.rst"), "w", encoding = "utf8") as f:
             f.write(source)
         warnings = StringIO()
         app = SphinxTestApp(srcdir=path(src_dir), status=StringIO(), warning=warnings)