function desc in docstrings

README.md

@@ -4,6 +4,9 @@ A Python client for autograding Python, Scheme, and SQL files. Based on the [OK]
 
 ## Changelog
 
+### v0.1.8 - 1/23/21
+* Allow for ordinary function descriptions alongside `ok-disc` test cases within Python docstrings.
+
 ### v0.1.7 - 1/13/21
 * Persistent sessions workaround
   * Multi-line doctests now supported

ok-disc.py

@@ -19,7 +19,7 @@
 from languages import *
 
 src = ""
-version = "0.1.7"
+version = "0.1.8"
 
 parser = argparse.ArgumentParser(prog="ok", description="A lightweight autograder to test your work!")
 parser.add_argument("func", metavar="function_to_test", nargs="?", default=None, help="function to be tested (optional)")

utils.py

@@ -24,8 +24,10 @@ def _search(src, language):
                     pass
                 elif re.match(language.formatting.expect, line) and line != "\n":
                     tests[question][len(tests[question]) - 1].output += line.strip()[9 + offset:] + "\n"
-                elif line == "\n" or re.match(language.formatting.no_tests, line):
-                    found = False
+                elif (line == "\n" and language != Language.PYTHON) or re.match(language.formatting.no_tests, line):
+                    match = re.match(language.formatting.no_tests, line)
+                    if match and match.span()[1] - match.span()[0] > 0:
+                        found = False
                 elif re.match(language.formatting.test, line):
                     tests[question] = tests.get(question, []) + [Doctest(language, number, line.strip()[2 + offset:])]
                     Doctest.max_q = max(Doctest.max_q, len(number.replace(".", "")))