more flexible block regexps to be compatible with black re-formatting

Author: JohnMount

coverage.txt

@@ -41,4 +41,4 @@ wvpy/util.py                321      7    98%
 ---------------------------------------------
 TOTAL                       591    160    73%
 
-======================= 20 passed, 2 warnings in 19.29s ========================
+======================= 20 passed, 2 warnings in 16.97s ========================

pkg/build/lib/wvpy/jtools.py

@@ -31,9 +31,9 @@ def convert_py_code_to_notebook(text: str) -> nbformat.notebooknode.NotebookNode
     # https://nbviewer.org/gist/fperez/9716279
     assert isinstance(text, str)
     lines = text.splitlines()
-    begin_text_regexp = re.compile(r"^r?'''\s*begin\s+text\s*$")
-    end_text_regexp = re.compile(r"^'''\s*#\s*end\s+text\s*$")
-    end_code_regexp = re.compile(r"^r?'''\s*end\s+code\s*'''\s*$")
+    begin_text_regexp = re.compile(r"^\s*r?((''')|(\"\"\"))\s*begin\s+text\s*$")
+    end_text_regexp = re.compile(r"^\s*r?((''')|(\"\"\"))\s*#\s*end\s+text\s*$")
+    end_code_regexp = re.compile(r"(^\s*r?'''\s*end\s+code\s*'''\s*$)|(^\s*r?\"\"\"\s*end\s+code\s*\"\"\"\s*$)")
     nbf_v = nbformat.v4
     nb = nbf_v.new_notebook()
     # run a little code collecting state machine

pkg/dist/wvpy-0.3.4-py3-none-any.whl

@@ -100,9 +100,9 @@ <h1 class="modulename">
 </span><span id="L-29"><a href="#L-29"><span class="linenos"> 29</span></a>    <span class="c1"># https://nbviewer.org/gist/fperez/9716279</span>
 </span><span id="L-30"><a href="#L-30"><span class="linenos"> 30</span></a>    <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">text</span><span class="p">,</span> <span class="nb">str</span><span class="p">)</span>
 </span><span id="L-31"><a href="#L-31"><span class="linenos"> 31</span></a>    <span class="n">lines</span> <span class="o">=</span> <span class="n">text</span><span class="o">.</span><span class="n">splitlines</span><span class="p">()</span>
-</span><span id="L-32"><a href="#L-32"><span class="linenos"> 32</span></a>    <span class="n">begin_text_regexp</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="sa">r</span><span class="s2">&quot;^r?&#39;&#39;&#39;\s*begin\s+text\s*$&quot;</span><span class="p">)</span>
-</span><span id="L-33"><a href="#L-33"><span class="linenos"> 33</span></a>    <span class="n">end_text_regexp</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="sa">r</span><span class="s2">&quot;^&#39;&#39;&#39;\s*#\s*end\s+text\s*$&quot;</span><span class="p">)</span>
-</span><span id="L-34"><a href="#L-34"><span class="linenos"> 34</span></a>    <span class="n">end_code_regexp</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="sa">r</span><span class="s2">&quot;^r?&#39;&#39;&#39;\s*end\s+code\s*&#39;&#39;&#39;\s*$&quot;</span><span class="p">)</span>
+</span><span id="L-32"><a href="#L-32"><span class="linenos"> 32</span></a>    <span class="n">begin_text_regexp</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="sa">r</span><span class="s2">&quot;^\s*r?((&#39;&#39;&#39;)|(</span><span class="se">\&quot;\&quot;\&quot;</span><span class="s2">))\s*begin\s+text\s*$&quot;</span><span class="p">)</span>
+</span><span id="L-33"><a href="#L-33"><span class="linenos"> 33</span></a>    <span class="n">end_text_regexp</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="sa">r</span><span class="s2">&quot;^\s*r?((&#39;&#39;&#39;)|(</span><span class="se">\&quot;\&quot;\&quot;</span><span class="s2">))\s*#\s*end\s+text\s*$&quot;</span><span class="p">)</span>
+</span><span id="L-34"><a href="#L-34"><span class="linenos"> 34</span></a>    <span class="n">end_code_regexp</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="sa">r</span><span class="s2">&quot;(^\s*r?&#39;&#39;&#39;\s*end\s+code\s*&#39;&#39;&#39;\s*$)|(^\s*r?</span><span class="se">\&quot;\&quot;\&quot;</span><span class="s2">\s*end\s+code\s*</span><span class="se">\&quot;\&quot;\&quot;</span><span class="s2">\s*$)&quot;</span><span class="p">)</span>
 </span><span id="L-35"><a href="#L-35"><span class="linenos"> 35</span></a>    <span class="n">nbf_v</span> <span class="o">=</span> <span class="n">nbformat</span><span class="o">.</span><span class="n">v4</span>
 </span><span id="L-36"><a href="#L-36"><span class="linenos"> 36</span></a>    <span class="n">nb</span> <span class="o">=</span> <span class="n">nbf_v</span><span class="o">.</span><span class="n">new_notebook</span><span class="p">()</span>
 </span><span id="L-37"><a href="#L-37"><span class="linenos"> 37</span></a>    <span class="c1"># run a little code collecting state machine</span>
@@ -360,9 +360,9 @@ <h1 class="modulename">
 </span><span id="convert_py_code_to_notebook-32"><a href="#convert_py_code_to_notebook-32"><span class="linenos">32</span></a>    <span class="c1"># https://nbviewer.org/gist/fperez/9716279</span>
 </span><span id="convert_py_code_to_notebook-33"><a href="#convert_py_code_to_notebook-33"><span class="linenos">33</span></a>    <span class="k">assert</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">text</span><span class="p">,</span> <span class="nb">str</span><span class="p">)</span>
 </span><span id="convert_py_code_to_notebook-34"><a href="#convert_py_code_to_notebook-34"><span class="linenos">34</span></a>    <span class="n">lines</span> <span class="o">=</span> <span class="n">text</span><span class="o">.</span><span class="n">splitlines</span><span class="p">()</span>
-</span><span id="convert_py_code_to_notebook-35"><a href="#convert_py_code_to_notebook-35"><span class="linenos">35</span></a>    <span class="n">begin_text_regexp</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="sa">r</span><span class="s2">&quot;^r?&#39;&#39;&#39;\s*begin\s+text\s*$&quot;</span><span class="p">)</span>
-</span><span id="convert_py_code_to_notebook-36"><a href="#convert_py_code_to_notebook-36"><span class="linenos">36</span></a>    <span class="n">end_text_regexp</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="sa">r</span><span class="s2">&quot;^&#39;&#39;&#39;\s*#\s*end\s+text\s*$&quot;</span><span class="p">)</span>
-</span><span id="convert_py_code_to_notebook-37"><a href="#convert_py_code_to_notebook-37"><span class="linenos">37</span></a>    <span class="n">end_code_regexp</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="sa">r</span><span class="s2">&quot;^r?&#39;&#39;&#39;\s*end\s+code\s*&#39;&#39;&#39;\s*$&quot;</span><span class="p">)</span>
+</span><span id="convert_py_code_to_notebook-35"><a href="#convert_py_code_to_notebook-35"><span class="linenos">35</span></a>    <span class="n">begin_text_regexp</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="sa">r</span><span class="s2">&quot;^\s*r?((&#39;&#39;&#39;)|(</span><span class="se">\&quot;\&quot;\&quot;</span><span class="s2">))\s*begin\s+text\s*$&quot;</span><span class="p">)</span>
+</span><span id="convert_py_code_to_notebook-36"><a href="#convert_py_code_to_notebook-36"><span class="linenos">36</span></a>    <span class="n">end_text_regexp</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="sa">r</span><span class="s2">&quot;^\s*r?((&#39;&#39;&#39;)|(</span><span class="se">\&quot;\&quot;\&quot;</span><span class="s2">))\s*#\s*end\s+text\s*$&quot;</span><span class="p">)</span>
+</span><span id="convert_py_code_to_notebook-37"><a href="#convert_py_code_to_notebook-37"><span class="linenos">37</span></a>    <span class="n">end_code_regexp</span> <span class="o">=</span> <span class="n">re</span><span class="o">.</span><span class="n">compile</span><span class="p">(</span><span class="sa">r</span><span class="s2">&quot;(^\s*r?&#39;&#39;&#39;\s*end\s+code\s*&#39;&#39;&#39;\s*$)|(^\s*r?</span><span class="se">\&quot;\&quot;\&quot;</span><span class="s2">\s*end\s+code\s*</span><span class="se">\&quot;\&quot;\&quot;</span><span class="s2">\s*$)&quot;</span><span class="p">)</span>
 </span><span id="convert_py_code_to_notebook-38"><a href="#convert_py_code_to_notebook-38"><span class="linenos">38</span></a>    <span class="n">nbf_v</span> <span class="o">=</span> <span class="n">nbformat</span><span class="o">.</span><span class="n">v4</span>
 </span><span id="convert_py_code_to_notebook-39"><a href="#convert_py_code_to_notebook-39"><span class="linenos">39</span></a>    <span class="n">nb</span> <span class="o">=</span> <span class="n">nbf_v</span><span class="o">.</span><span class="n">new_notebook</span><span class="p">()</span>
 </span><span id="convert_py_code_to_notebook-40"><a href="#convert_py_code_to_notebook-40"><span class="linenos">40</span></a>    <span class="c1"># run a little code collecting state machine</span>

pkg/dist/wvpy-0.3.4.tar.gz

@@ -4,13 +4,6 @@ MANIFEST.in
 README.txt
 setup.py
 Doc/documentation.txt
-docs/index.html
-docs/search.js
-docs/wvpy.html
-docs/wvpy/jtools.html
-docs/wvpy/pysheet.html
-docs/wvpy/render_workbook.html
-docs/wvpy/util.html
 tests/__init__.py
 tests/example_bad_notebook.ipynb
 tests/example_good_notebook.ipynb

pkg/docs/wvpy/jtools.html

@@ -31,9 +31,9 @@ def convert_py_code_to_notebook(text: str) -> nbformat.notebooknode.NotebookNode
     # https://nbviewer.org/gist/fperez/9716279
     assert isinstance(text, str)
     lines = text.splitlines()
-    begin_text_regexp = re.compile(r"^r?'''\s*begin\s+text\s*$")
-    end_text_regexp = re.compile(r"^'''\s*#\s*end\s+text\s*$")
-    end_code_regexp = re.compile(r"^r?'''\s*end\s+code\s*'''\s*$")
+    begin_text_regexp = re.compile(r"^\s*r?((''')|(\"\"\"))\s*begin\s+text\s*$")
+    end_text_regexp = re.compile(r"^\s*r?((''')|(\"\"\"))\s*#\s*end\s+text\s*$")
+    end_code_regexp = re.compile(r"(^\s*r?'''\s*end\s+code\s*'''\s*$)|(^\s*r?\"\"\"\s*end\s+code\s*\"\"\"\s*$)")
     nbf_v = nbformat.v4
     nb = nbf_v.new_notebook()
     # run a little code collecting state machine