diff --git a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-C/main.adb b/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-C/main.adb deleted file mode 100644 index b8626c4cf..000000000 --- a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-C/main.adb +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-K_-m_question/main.adb b/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-K_-m_question/main.adb deleted file mode 100644 index 28ebf55b5..000000000 --- a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-K_-m_question/main.adb +++ /dev/null @@ -1 +0,0 @@ - type My_Array is array (Integer range <>) of Boolean; diff --git a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_1/main.adb b/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_1/main.adb deleted file mode 100644 index bd8b65f2b..000000000 --- a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_1/main.adb +++ /dev/null @@ -1 +0,0 @@ - O : My_Array (2); diff --git a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_1_2/main.adb b/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_1_2/main.adb deleted file mode 100644 index 0fd97c944..000000000 --- a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_1_2/main.adb +++ /dev/null @@ -1,3 +0,0 @@ - O : My_Array (2); - -- Multiline cut - O : My_Array (1 .. 2); diff --git a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_1_3/main.adb b/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_1_3/main.adb deleted file mode 100644 index 1afc9a85c..000000000 --- a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_1_3/main.adb +++ /dev/null @@ -1,3 +0,0 @@ - O : My_Array (2); - ... - O : My_Array (1 .. 3); diff --git a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_2/main.adb b/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_2/main.adb deleted file mode 100644 index 078802cea..000000000 --- a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-c_2/main.adb +++ /dev/null @@ -1,2 +0,0 @@ - -- Multiline cut - O : My_Array (1 .. 2); diff --git a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-dc_1/main.adb b/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-dc_1/main.adb deleted file mode 100644 index ed4d14303..000000000 --- a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-dc_1/main.adb +++ /dev/null @@ -1 +0,0 @@ -O : My_Array (2); diff --git a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-kc_1/main.adb b/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-kc_1/main.adb deleted file mode 100644 index de1bf8153..000000000 --- a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-kc_1/main.adb +++ /dev/null @@ -1,6 +0,0 @@ -procedure Main is - type My_Array is array (Integer range <>) of Boolean; - O : My_Array (2); -begin - pragma Assert (O'Length = 2); -end Main; diff --git a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-kc_4/main.adb b/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-kc_4/main.adb deleted file mode 100644 index be6082731..000000000 --- a/contrib/testsuite/adacut/unconstrained_arrays_declaration/src_-kc_4/main.adb +++ /dev/null @@ -1,6 +0,0 @@ -procedure Main is - type My_Array is array (Integer range <>) of Boolean; - O : My_Array (1, 3); -begin - pragma Assert (O'Length = 2); -end Main; diff --git a/contrib/testsuite/adacut/unconstrained_arrays_declaration/template/main.adb b/contrib/testsuite/adacut/unconstrained_arrays_declaration/template/main.adb deleted file mode 100644 index 6428ae12c..000000000 --- a/contrib/testsuite/adacut/unconstrained_arrays_declaration/template/main.adb +++ /dev/null @@ -1,19 +0,0 @@ -procedure Main is - --$ line question - type My_Array is array (Integer range <>) of Boolean; - --$ line cut - O : My_Array (2); - --$ begin cut - -- Multiline cut - O : My_Array (1 .. 2); - --$ end cut - --$ line cut - O : My_Array (1 .. 3); - --$ line cut - O : My_Array (1, 3); - --$ begin answer - -- You must declare the :ada:`range` using the :ada:`".."` operator - --$ end answer -begin - pragma Assert (O'Length = 2); -end Main; diff --git a/contrib/testsuite/conftest.py b/contrib/testsuite/conftest.py deleted file mode 100644 index 85c68e958..000000000 --- a/contrib/testsuite/conftest.py +++ /dev/null @@ -1,2 +0,0 @@ -def pytest_addoption(parser): - parser.addoption("--update-baseline", action="store_true") diff --git a/contrib/testsuite/test_adacut.py b/contrib/testsuite/test_adacut.py deleted file mode 100644 index c0c3cdd5e..000000000 --- a/contrib/testsuite/test_adacut.py +++ /dev/null @@ -1,68 +0,0 @@ -from pathlib import Path -import epycs.subprocess -from epycs.subprocess import cmd, ShellProgramFilters - -epycs.subprocess.exit_on_error = False - - -TEST_DIR = Path(__file__).parent -TEST_DATA_DIR = TEST_DIR / "adacut" -CONTRIB = TEST_DIR.parent -ADACUT_PY = CONTRIB / "adacut.py" - - -adacut = cmd.python.arg(ADACUT_PY) - - -class TestAdaCut: - @classmethod - def init_tests(cls): - for d in ( - d_tpl.parent - for d_tpl in TEST_DATA_DIR.glob("**/template") - if d_tpl.is_dir() - ): - tests = {} - - for dd in (d_src for d_src in d.glob("src_*") if d_src.is_dir()): - cls.add_src_tests(tests, d, dd) - - for name, test in tests.items(): - setattr(cls, f"test_{name}", test) - - def maybe_update_baseline(self, pytestconfig, expected_file, actual): - if pytestconfig.getoption("--update-baseline"): - with open(expected_file, "wt") as f: - f.write(actual) - - def assert_file_content_equal(self, pytestconfig, expected_file, actual): - with open(expected_file) as f: - expected = f.read() - - try: - assert actual == expected - except AssertionError: - self.maybe_update_baseline(pytestconfig, expected_file, actual) - raise - - @classmethod - def parse_options(cls, name): - return name.split("_") - - @classmethod - def add_src_tests(cls, tests, d, d_src): - options = cls.parse_options(d_src.name[len("src_") :]) - for f in (d / "template").glob("*.ad?"): - - def test_file_content_is_expected(self, pytestconfig): - actual = adacut( - *options, "--", f, check=True, out_filter=ShellProgramFilters.text - ) - self.assert_file_content_equal(pytestconfig, d_src / f.name, actual) - - tests[f"{d_src.parent.name}_{d_src.name}_{f.name}"] = ( - test_file_content_is_expected - ) - - -TestAdaCut.init_tests() diff --git a/pandoc/beamer_filter.py b/pandoc/beamer_filter.py index 0b737d314..470c8d895 100755 --- a/pandoc/beamer_filter.py +++ b/pandoc/beamer_filter.py @@ -590,8 +590,6 @@ def format_note(classes, contents): def remove_title(c): # pandoc adds a title element for some admonitions. Remove it. if isinstance(c, list) and len(c) > 0: - with open("toto.py", "at") as f: - print(repr(c), file=f) if c[0]["t"] == "Div": if c[0]["c"][0][1][0] == "title": del c[0] diff --git a/pandoc/pandoc_fe.py b/pandoc/pandoc_fe.py index 974f37c0a..f64ac70e4 100644 --- a/pandoc/pandoc_fe.py +++ b/pandoc/pandoc_fe.py @@ -216,11 +216,11 @@ def pandoc_prepare_run_single(n, source_or_source_list, args): extension = args.extension if extension is None: - spl = args.output.rsplit(".", 1) - if spl: - extension = spl[-1] - else: - extension = "pdf" + extension = "pdf" # Default + if args.output is not None: + spl = args.output.rsplit(".", 1) + if spl: + extension = spl[-1] # Output default value is input file name output_file = output_file_name( diff --git a/support_files/language_version.py b/support_files/language_version.py index 7e390cf43..2e9ef1bcf 100644 --- a/support_files/language_version.py +++ b/support_files/language_version.py @@ -11,7 +11,6 @@ def tempname(): def process_one_file(in_filename): - lines = [] with open(in_filename) as f: lines = f.read().splitlines() @@ -27,7 +26,6 @@ def process_one_file(in_filename): if __name__ == "__main__": - parser = argparse.ArgumentParser() parser.add_argument("--filename", required=True)