From e5992f9d87ebcc2c5445f74fe826ea4c17201ffb Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 10 Jan 2023 19:08:06 +0530 Subject: [PATCH] Remove global __() --- .../ebooks/conversion/plugins/html_input.py | 4 +-- src/calibre/ebooks/docx/writer/links.py | 4 ++- src/calibre/ebooks/mobi/writer8/toc.py | 6 ++-- src/calibre/ebooks/oeb/base.py | 1 + src/calibre/ebooks/oeb/reader.py | 35 ++++++++++--------- src/calibre/ebooks/oeb/transforms/htmltoc.py | 7 ++-- src/calibre/utils/localization.py | 4 +++ 7 files changed, 36 insertions(+), 25 deletions(-) diff --git a/src/calibre/ebooks/conversion/plugins/html_input.py b/src/calibre/ebooks/conversion/plugins/html_input.py index 6f9c2084ea..ca5b729996 100644 --- a/src/calibre/ebooks/conversion/plugins/html_input.py +++ b/src/calibre/ebooks/conversion/plugins/html_input.py @@ -15,7 +15,7 @@ from calibre.constants import isbsd, islinux from calibre.customize.conversion import InputFormatPlugin, OptionRecommendation from calibre.utils.filenames import ascii_filename from calibre.utils.imghdr import what -from calibre.utils.localization import get_lang +from calibre.utils.localization import __, get_lang from polyglot.builtins import as_unicode @@ -113,7 +113,7 @@ class HTMLInput(InputFormatPlugin): from calibre.ebooks.metadata import string_to_authors from calibre.ebooks.oeb.base import ( BINARY_MIME, OEB_STYLES, DirContainer, rewrite_links, urldefrag, - urlnormalize, urlquote, xpath + urlnormalize, urlquote, xpath, ) from calibre.ebooks.oeb.transforms.metadata import meta_info_to_oeb_metadata from calibre.utils.localization import canonicalize_lang diff --git a/src/calibre/ebooks/docx/writer/links.py b/src/calibre/ebooks/docx/writer/links.py index 46e9368e02..647b06298e 100644 --- a/src/calibre/ebooks/docx/writer/links.py +++ b/src/calibre/ebooks/docx/writer/links.py @@ -4,11 +4,13 @@ __license__ = 'GPL v3' __copyright__ = '2015, Kovid Goyal ' -import posixpath, re +import posixpath +import re from uuid import uuid4 from calibre.ebooks.oeb.base import urlquote from calibre.utils.filenames import ascii_text +from calibre.utils.localization import __ from polyglot.urllib import urlparse diff --git a/src/calibre/ebooks/mobi/writer8/toc.py b/src/calibre/ebooks/mobi/writer8/toc.py index 33a3d884ca..3ec2e57cf0 100644 --- a/src/calibre/ebooks/mobi/writer8/toc.py +++ b/src/calibre/ebooks/mobi/writer8/toc.py @@ -5,9 +5,11 @@ __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' __docformat__ = 'restructuredtext en' +from calibre.ebooks.oeb.base import ( + XHTML, XHTML_MIME, XHTML_NS, XPath, css_text, urlnormalize, +) +from calibre.utils.localization import __ from calibre.utils.xml_parse import safe_xml_fromstring -from calibre.ebooks.oeb.base import (urlnormalize, XPath, XHTML_NS, XHTML, - XHTML_MIME, css_text) DEFAULT_TITLE = __('Table of Contents') diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py index a0ef201374..be1e855cca 100644 --- a/src/calibre/ebooks/oeb/base.py +++ b/src/calibre/ebooks/oeb/base.py @@ -26,6 +26,7 @@ from calibre.ebooks.oeb.parse_utils import ( from calibre.translations.dynamic import translate from calibre.utils.cleantext import clean_xml_chars from calibre.utils.icu import numeric_sort_key, title_case as icu_title +from calibre.utils.localization import __ from calibre.utils.short_uuid import uuid4 from calibre.utils.xml_parse import safe_xml_fromstring from polyglot.builtins import codepoint_to_chr, iteritems, itervalues, string_or_bytes diff --git a/src/calibre/ebooks/oeb/reader.py b/src/calibre/ebooks/oeb/reader.py index 2aea5ae48c..740d12187b 100644 --- a/src/calibre/ebooks/oeb/reader.py +++ b/src/calibre/ebooks/oeb/reader.py @@ -6,27 +6,28 @@ Container-/OPF-based input OEBBook reader. __license__ = 'GPL v3' __copyright__ = '2008, Marshall T. Vandegrift ' -import sys, os, uuid, copy, re, io +import copy +import io +import os +import re +import sys +import uuid from collections import defaultdict - from lxml import etree -from calibre.ebooks.oeb.base import OPF1_NS, OPF2_NS, OPF2_NSMAP, DC11_NS, \ - DC_NSES, OPF, xml2text, XHTML_MIME -from calibre.ebooks.oeb.base import OEB_DOCS, OEB_STYLES, OEB_IMAGES, \ - PAGE_MAP_MIME, JPEG_MIME, NCX_MIME, SVG_MIME -from calibre.ebooks.oeb.base import XMLDECL_RE, COLLAPSE_RE, \ - MS_COVER_TYPE, iterlinks -from calibre.ebooks.oeb.base import namespace, barename, XPath, xpath, \ - urlnormalize, BINARY_MIME, \ - OEBError, OEBBook, DirContainer -from calibre.ebooks.oeb.writer import OEBWriter -from calibre.utils.xml_parse import safe_xml_fromstring -from calibre.utils.cleantext import clean_xml_chars -from calibre.utils.localization import get_lang -from calibre.ptempfile import TemporaryDirectory -from calibre.constants import __appname__, __version__ from calibre import guess_type, xml_replace_entities +from calibre.constants import __appname__, __version__ +from calibre.ebooks.oeb.base import ( + BINARY_MIME, COLLAPSE_RE, DC11_NS, DC_NSES, JPEG_MIME, MS_COVER_TYPE, NCX_MIME, + OEB_DOCS, OEB_IMAGES, OEB_STYLES, OPF, OPF1_NS, OPF2_NS, OPF2_NSMAP, PAGE_MAP_MIME, + SVG_MIME, XHTML_MIME, XMLDECL_RE, DirContainer, OEBBook, OEBError, XPath, barename, + iterlinks, namespace, urlnormalize, xml2text, xpath, +) +from calibre.ebooks.oeb.writer import OEBWriter +from calibre.ptempfile import TemporaryDirectory +from calibre.utils.cleantext import clean_xml_chars +from calibre.utils.localization import __, get_lang +from calibre.utils.xml_parse import safe_xml_fromstring from polyglot.urllib import unquote, urldefrag, urlparse __all__ = ['OEBReader'] diff --git a/src/calibre/ebooks/oeb/transforms/htmltoc.py b/src/calibre/ebooks/oeb/transforms/htmltoc.py index 3fef82a001..135e224b7f 100644 --- a/src/calibre/ebooks/oeb/transforms/htmltoc.py +++ b/src/calibre/ebooks/oeb/transforms/htmltoc.py @@ -5,9 +5,10 @@ HTML-TOC-adding transform. __license__ = 'GPL v3' __copyright__ = '2008, Marshall T. Vandegrift ' -from calibre.ebooks.oeb.base import XML, XHTML, XHTML_NS -from calibre.ebooks.oeb.base import XHTML_MIME, CSS_MIME -from calibre.ebooks.oeb.base import element, XPath +from calibre.ebooks.oeb.base import ( + CSS_MIME, XHTML, XHTML_MIME, XHTML_NS, XML, XPath, element, +) +from calibre.utils.localization import __ __all__ = ['HTMLTOCAdder'] diff --git a/src/calibre/utils/localization.py b/src/calibre/utils/localization.py index 428dc89540..efb30ea1ed 100644 --- a/src/calibre/utils/localization.py +++ b/src/calibre/utils/localization.py @@ -268,6 +268,10 @@ def _(x: str) -> str: return default_translator.gettext(x) +def __(x: str) -> str: + return x + + def ngettext(singular: str, plural: str, n: int) -> str: return default_translator.ngettext(singular, plural, n)