From 68393b1004e5116e7e7fb83d06c7b4d5e4870255 Mon Sep 17 00:00:00 2001 From: yzqzss Date: Fri, 21 Jun 2024 11:18:03 +0800 Subject: [PATCH] chore: remove legacy uprint --- .../dump/page/xmlexport/page_xml_export.py | 5 ++--- wikiteam3/utils/__init__.py | 1 - wikiteam3/utils/uprint.py | 11 ----------- 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 wikiteam3/utils/uprint.py diff --git a/wikiteam3/dumpgenerator/dump/page/xmlexport/page_xml_export.py b/wikiteam3/dumpgenerator/dump/page/xmlexport/page_xml_export.py index cbff47e8..54c88211 100644 --- a/wikiteam3/dumpgenerator/dump/page/xmlexport/page_xml_export.py +++ b/wikiteam3/dumpgenerator/dump/page/xmlexport/page_xml_export.py @@ -8,7 +8,6 @@ from wikiteam3.dumpgenerator.exceptions import ExportAbortedError, PageMissingError from wikiteam3.dumpgenerator.api import handle_StatusCode from wikiteam3.dumpgenerator.log import log_error -from wikiteam3.utils import uprint from wikiteam3.dumpgenerator.config import Config from wikiteam3.utils.util import underscore @@ -207,6 +206,6 @@ def getXMLPageWithExport(config: Config, title: str, if verbose: if edit_count == 1: - uprint(" %s, 1 edit" % (title.strip())) + print(" %s, 1 edit" % (title.strip())) else: - uprint(" %s, %d edits" % (title.strip(), edit_count)) + print(" %s, %d edits" % (title.strip(), edit_count)) diff --git a/wikiteam3/utils/__init__.py b/wikiteam3/utils/__init__.py index 52ba9dfe..49837ce5 100644 --- a/wikiteam3/utils/__init__.py +++ b/wikiteam3/utils/__init__.py @@ -1,4 +1,3 @@ -from .uprint import uprint from .util import remove_IP, clean_XML, clean_HTML, undo_HTML_entities, sha1sum from .user_agent import get_random_UserAgent diff --git a/wikiteam3/utils/uprint.py b/wikiteam3/utils/uprint.py deleted file mode 100644 index d3411ba7..00000000 --- a/wikiteam3/utils/uprint.py +++ /dev/null @@ -1,11 +0,0 @@ -import sys - - -def uprint(*objects, sep=" ", end="\n", file=sys.stdout): - enc = file.encoding - if enc == "UTF-8": - print(*objects, sep=sep, end=end, file=file) - else: - def f(obj): - return str(obj).encode(enc, errors="backslashreplace").decode(enc) - print(*map(f, objects), sep=sep, end=end, file=file)