From 2501adeda056dc40fe7ef41a73f430a15d773862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Tue, 27 Feb 2024 02:01:55 +0100 Subject: [PATCH] move 'pprint()' into its own module to reuse its code in create_test_data.py later rename to 'pyprint' since 'pprint' is already used by stdlib module --- scripts/export_tests.py | 100 ++------------------------------------- scripts/pyprint.py | 101 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 95 deletions(-) create mode 100644 scripts/pyprint.py diff --git a/scripts/export_tests.py b/scripts/export_tests.py index e95b0c2f..285f2206 100755 --- a/scripts/export_tests.py +++ b/scripts/export_tests.py @@ -14,6 +14,7 @@ import itertools import collections import util +from pyprint import pyprint from gallery_dl import extractor @@ -33,97 +34,6 @@ __tests__ = ( ''' -def pprint(obj, indent=0, lmin=9, lmax=16): - - if isinstance(obj, str): - if obj.startswith("lit:"): - return f'''{obj[4:]}''' - - if "\\" in obj or obj.startswith("re:"): - prefix = "r" - else: - prefix = "" - - if "\n" in obj: - quote = '"""' - elif '"' in obj: - obj = re.sub(r'(?= 2 or not indent: - ws = " " * indent - - lkey = max(map(len, obj)) - if not indent: - if lkey < lmin: - lkey = lmin - elif lkey > lmax: - lkey = lmax - - lines = [] - lines.append("{") - for key, value in obj.items(): - if key.startswith("#blank-"): - lines.append("") - else: - lines.append( - f'''{ws} "{key}"''' - f'''{' '*(lkey - len(key))}: ''' - f'''{pprint(value, indent+4)},''' - ) - lines.append(f'''{ws}}}''') - return "\n".join(lines) - else: - key, value = obj.popitem() - return f'''{{"{key}": {pprint(value)}}}''' - - if isinstance(obj, list): - if not obj: - return "[]" - - if len(obj) >= 2: - ws = " " * indent - - lines = [] - lines.append("[") - lines.extend( - f'''{ws} {pprint(value, indent+4)},''' - for value in obj - ) - lines.append(f'''{ws}]''') - return "\n".join(lines) - else: - return f'''[{pprint(obj[0])}]''' - - if isinstance(obj, tuple): - if len(obj) == 1: - return f'''({pprint(obj[0], indent+4)},)''' - return f'''({", ".join(pprint(v, indent+4) for v in obj)})''' - - else: - return f'''{obj}''' - - def extract_tests_from_source(lines): tests = {} @@ -201,7 +111,7 @@ def build_test(extr, data): if (pattern := data.pop("pattern", None)): if pattern in PATTERNS: cls = PATTERNS[pattern] - pattern = f"lit:{pprint(cls)}.pattern" + pattern = f"lit:{pyprint(cls)}.pattern" instr["#pattern"] = pattern if (exception := data.pop("exception", None)): instr["#exception"] = exception @@ -280,15 +190,15 @@ _{name} = getattr({module}, "{name}")''' stmt = f"import {name}" imports[v.__module__] = stmt - test = pprint(head) + test = pyprint(head) if instr: - test = f"{test[:-2]}{pprint(instr)[1:]}" + test = f"{test[:-2]}{pyprint(instr)[1:]}" if metadata: for k, v in metadata.items(): if v == "type:datetime": imports["datetime"] = "import datetime" metadata[k] = "lit:datetime.datetime" - test = f"{test[:-1]}{pprint(metadata, lmin=0)[1:]}" + test = f"{test[:-1]}{pyprint(metadata, lmin=0)[1:]}" tests.append(f"{test},\n\n") diff --git a/scripts/pyprint.py b/scripts/pyprint.py new file mode 100644 index 00000000..99d31e41 --- /dev/null +++ b/scripts/pyprint.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# Copyright 2024 Mike Fährmann +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. + +import re + + +def pyprint(obj, indent=0, lmin=9, lmax=16): + + if isinstance(obj, str): + if obj.startswith("lit:"): + return f'''{obj[4:]}''' + + if "\\" in obj or obj.startswith("re:"): + prefix = "r" + else: + prefix = "" + + if "\n" in obj: + quote = '"""' + elif '"' in obj: + obj = re.sub(r'(?= 2 or not indent: + ws = " " * indent + + lkey = max(map(len, obj)) + if not indent: + if lkey < lmin: + lkey = lmin + elif lkey > lmax: + lkey = lmax + + lines = [] + lines.append("{") + for key, value in obj.items(): + if key.startswith("#blank-"): + lines.append("") + else: + lines.append( + f'''{ws} "{key}"''' + f'''{' '*(lkey - len(key))}: ''' + f'''{pyprint(value, indent+4)},''' + ) + lines.append(f'''{ws}}}''') + return "\n".join(lines) + else: + key, value = obj.popitem() + return f'''{{"{key}": {pyprint(value)}}}''' + + if isinstance(obj, list): + if not obj: + return "[]" + + if len(obj) >= 2: + ws = " " * indent + + lines = [] + lines.append("[") + lines.extend( + f'''{ws} {pyprint(value, indent+4)},''' + for value in obj + ) + lines.append(f'''{ws}]''') + return "\n".join(lines) + else: + return f'''[{pyprint(obj[0])}]''' + + if isinstance(obj, tuple): + if len(obj) == 1: + return f'''({pyprint(obj[0], indent+4)},)''' + return f'''({", ".join(pyprint(v, indent+4) for v in obj)})''' + + else: + return f'''{obj}'''