diff options
| author | Andrew Trask <andrew.trask@digitalreasoning.com> | 2015-11-14 13:39:01 -0600 |
|---|---|---|
| committer | Andrew Trask <andrew.trask@digitalreasoning.com> | 2015-11-14 13:39:01 -0600 |
| commit | 1071b68d726d4b8e75bf342ba3a07815e2d4d735 (patch) | |
| tree | f09a9ff9c2fad60e8764da3f79b4d287e012d8e4 | |
| parent | 56ad80efa822e5e2d79e7fe3155cd5bb3931660c (diff) | |
| download | pycco-1071b68d726d4b8e75bf342ba3a07815e2d4d735.tar.gz | |
merge
| -rw-r--r-- | pycco/main.py | 14 | ||||
| -rw-r--r-- | tests/test_pycco.py | 4 |
2 files changed, 1 insertions, 17 deletions
diff --git a/pycco/main.py b/pycco/main.py index bfce2ea..8c70cc9 100644 --- a/pycco/main.py +++ b/pycco/main.py @@ -48,19 +48,6 @@ 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): - """ - 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) - -======= - def _generate_documentation(file_path, code, outdir, preserve_paths, language): """ Helper function to allow documentation generation without file handling. @@ -70,7 +57,6 @@ 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) ->>>>>>> bbeee06f1222fa47439717d2e4b642a41e9d7f4b def parse(code, language): """ diff --git a/tests/test_pycco.py b/tests/test_pycco.py index 2cc2b15..d0cf6a3 100644 --- a/tests/test_pycco.py +++ b/tests/test_pycco.py @@ -120,7 +120,6 @@ def test_generate_documentation(): def test_process(preserve_paths, choice): lang_name = choice([l["name"] for l in p.languages.values()]) p.process([PYCCO_SOURCE], preserve_paths=preserve_paths, outdir=tempfile.gettempdir(), language=lang_name) -<<<<<<< HEAD def test_ensure_multiline_string_support(): @@ -140,5 +139,4 @@ def x(): assert docs_code_tuple_list[0]['docs_text'] == '' assert "#" not in docs_code_tuple_list[1]['docs_text'] -======= ->>>>>>> bbeee06f1222fa47439717d2e4b642a41e9d7f4b + |