diff options
| author | Andrew Trask <andrew.trask@digitalreasoning.com> | 2015-11-14 13:36:54 -0600 |
|---|---|---|
| committer | Andrew Trask <andrew.trask@digitalreasoning.com> | 2015-11-14 13:36:54 -0600 |
| commit | 56ad80efa822e5e2d79e7fe3155cd5bb3931660c (patch) | |
| tree | eb636622ca391918382596aa47904c45e20ccc22 /pycco/main.py | |
| parent | 2ac3d174fbd0733653276baec324d239c81409dd (diff) | |
| parent | bbeee06f1222fa47439717d2e4b642a41e9d7f4b (diff) | |
| download | pycco-56ad80efa822e5e2d79e7fe3155cd5bb3931660c.tar.gz | |
merge
Diffstat (limited to 'pycco/main.py')
| -rw-r--r-- | pycco/main.py | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pycco/main.py b/pycco/main.py index 676f6ff..bfce2ea 100644 --- a/pycco/main.py +++ b/pycco/main.py @@ -48,6 +48,7 @@ def generate_documentation(source, outdir=None, preserve_paths=True, code = open(source, "rb").read().decode(encoding) return _generate_documentation(source, code, outdir, preserve_paths, language) +<<<<<<< HEAD def _generate_documentation(file_path, code, outdir, preserve_paths, language): """ @@ -58,6 +59,18 @@ def _generate_documentation(file_path, code, outdir, preserve_paths, language): highlight(sections, language, preserve_paths=preserve_paths, outdir=outdir) return generate_html(file_path, sections, preserve_paths=preserve_paths, outdir=outdir) +======= + +def _generate_documentation(file_path, code, outdir, preserve_paths, language): + """ + Helper function to allow documentation generation without file handling. + """ + language = get_language(file_path, code, language=language) + sections = parse(code, language) + highlight(sections, language, preserve_paths=preserve_paths, outdir=outdir) + return generate_html(file_path, sections, preserve_paths=preserve_paths, outdir=outdir) + +>>>>>>> bbeee06f1222fa47439717d2e4b642a41e9d7f4b def parse(code, language): """ @@ -113,6 +126,7 @@ def parse(code, language): and len(line.strip()) > len(multiend)): multi_line = False + if((not line.strip().startswith(multistart) and not multi_line) or multi_string): process_as_code = True @@ -152,6 +166,7 @@ def parse(code, language): process_as_code = True if(process_as_code): + if code_text and any(line.lstrip().startswith(x) for x in ['class ', 'def ', '@']): if not code_text.lstrip().startswith("@"): @@ -159,7 +174,7 @@ def parse(code, language): code_text = has_code = docs_text = '' has_code = True - code_text += line + '\n' + code_text += line + '\n' save(docs_text, code_text) |