Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

add-noqa for unconvertible % format

Browse Source
This commit is contained in:
un-pogaz 2025-02-02 10:18:08 +01:00
parent 75aff43417
commit 1bb7a160f8
12 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/db/cli/cmd_list.py
View File

@ -231,7 +231,7 @@ def do_list(
widths = list(base_widths)
titles = map(
lambda x, y: '%-*s%s' % (x - len(separator), y, separator), widths,
lambda x, y: '%-*s%s' % (x - len(separator), y, separator), widths, # noqa: UP031
[template_title if v == 'template' else v for v in fields]
)
with ColoredStream(sys.stdout, fg='green'):

2
src/calibre/db/cli/cmd_list_categories.py
View File

@ -99,7 +99,7 @@ def do_list(fields, data, opts):
widths = list(base_widths)
titles = map(
lambda x, y: '%-*s%s' % (x - len(separator), y, separator), widths, fields
lambda x, y: '%-*s%s' % (x - len(separator), y, separator), widths, fields # noqa: UP031
)
with ColoredStream(sys.stdout, fg='green'):
prints(''.join(titles))

10
src/calibre/ebooks/conversion/preprocess.py
View File

@ -265,16 +265,16 @@ class Dehyphenator:
self.format = format
if format == 'html':
intextmatch = re.compile((
r'(?<=.{%i})(?P<firstpart>[^\W\-]+)(-|‐)\s*(?=<)(?P<wraptags>(</span>)?'
r'(?<=.{%i})(?P<firstpart>[^\W\-]+)(-|‐)\s*(?=<)(?P<wraptags>(</span>)?' # noqa: UP031
r'\s*(</[iubp]>\s*){1,2}(?P<up2threeblanks><(p|div)[^>]*>\s*(<p[^>]*>\s*</p>\s*)'
r'?</(p|div)>\s+){0,3}\s*(<[iubp][^>]*>\s*){1,2}(<span[^>]*>)?)\s*(?P<secondpart>[\w\d]+)') % length)
elif format == 'pdf':
intextmatch = re.compile((
r'(?<=.{%i})(?P<firstpart>[^\W\-]+)(-|‐)\s*(?P<wraptags><p>|'
r'(?<=.{%i})(?P<firstpart>[^\W\-]+)(-|‐)\s*(?P<wraptags><p>|' # noqa: UP031
r'</[iub]>\s*<p>\s*<[iub]>)\s*(?P<secondpart>[\w\d]+)')% length)
elif format == 'txt':
intextmatch = re.compile(
r'(?<=.{%i})(?P<firstpart>[^\W\-]+)(-|‐)( |\t)*(?P<wraptags>(\n( |\t)*)+)(?P<secondpart>[\w\d]+)'% length)
r'(?<=.{%i})(?P<firstpart>[^\W\-]+)(-|‐)( |\t)*(?P<wraptags>(\n( |\t)*)+)(?P<secondpart>[\w\d]+)'% length) # noqa: UP031
elif format == 'individual_words':
intextmatch = re.compile(
r'(?!<)(?P<firstpart>[^\W\-]+)(-|‐)\s*(?P<secondpart>\w+)(?![^<]*?>)', re.UNICODE)
@ -529,11 +529,11 @@ class HTMLPreProcessor:
# print('The pdf line length returned is ' + str(length))
# unwrap em/en dashes
end_rules.append((re.compile(
r'(?<=.{%i}[–—])\s*<p>\s*(?=[\[a-z\d])' % length), lambda match: ''))
r'(?<=.{%i}[–—])\s*<p>\s*(?=[\[a-z\d])' % length), lambda match: '')) # noqa: UP031
end_rules.append(
# Un wrap using punctuation
(re.compile((
r'(?<=.{%i}([a-zäëïöüàèìòùáćéíĺóŕńśúýâêîôûçąężıãõñæøþðßěľščťžňďřů,:)\\IAß]'
r'(?<=.{%i}([a-zäëïöüàèìòùáćéíĺóŕńśúýâêîôûçąężıãõñæøþðßěľščťžňďřů,:)\\IAß]' # noqa: UP031
r'|(?<!\&\w{4});))\s*(?P<ital></(i|b|u)>)?\s*(</p>\s*<p>\s*)+\s*(?=(<(i|b|u)>)?'
r'\s*[\w\d$(])') % length, re.UNICODE), wrap_lines),
)

2
src/calibre/ebooks/metadata/mobi.py
View File

@ -286,7 +286,7 @@ class MetadataUpdater:
s, src = src[:length],src[length:]
hexa = ' '.join([f'{ord(x):02X}' for x in s])
s = s.translate(FILTER)
result += '%04X %-*s %s\n' % (N, length*3, hexa, s)
result += '%04X %-*s %s\n' % (N, length*3, hexa, s) # noqa: UP031
N+=length
print(result)

2
src/calibre/ebooks/metadata/topaz.py
View File

@ -161,7 +161,7 @@ class MetadataUpdater:
s, src = src[:length],src[length:]
hexa = ' '.join([f'{ord(x):02X}' for x in s])
s = s.translate(FILTER)
result += '%04X %-*s %s\n' % (N, length*3, hexa, s)
result += '%04X %-*s %s\n' % (N, length*3, hexa, s) # noqa: UP031
N+=length
print(result)

2
src/calibre/ebooks/pdf/html_writer.py
View File

@ -777,7 +777,7 @@ def add_pagenum_toc(root, toc, opts, page_number_display_map):
.calibre-pdf-toc .level-%d td:first-of-type { padding-left: %.1gem }
.calibre-pdf-toc .level-%d td:first-of-type { padding-left: %.1gem }
.calibre-pdf-toc .level-%d td:first-of-type { padding-left: %.1gem }
''' % tuple(indents) + (opts.extra_css or '')
''' % tuple(indents) + (opts.extra_css or '') # noqa: UP031
style = body.makeelement(XHTML('style'), type='text/css')
style.text = css
body.append(style)

2
src/calibre/ebooks/rtf/rtfml.py
View File

@ -177,7 +177,7 @@ class RTFMLizer:
self.log.exception(f'Image {item.href} is corrupted, ignoring')
repl = '\n\n'
else:
repl = '\n\n{\\*\\shppict{\\pict\\jpegblip\\picw%i\\pich%i \n%s\n}}\n\n' % (width, height, data)
repl = '\n\n{\\*\\shppict{\\pict\\jpegblip\\picw%i\\pich%i \n%s\n}}\n\n' % (width, height, data) # noqa: UP031
text = text.replace(f'SPECIAL_IMAGE-{src}-REPLACE_ME', repl)
return text

2
src/calibre/gui2/viewer/search.py
View File

@ -154,7 +154,7 @@ class Search:
flags = self.regex_flags
flags |= regex.DOTALL
match_any_word = r'(?:\b(?:' + '|'.join(words) + r')\b)'
joiner = '.{1,%d}' % interval
joiner = '.{1,%d}' % interval # noqa: UP031
full_pat = regex.compile(joiner.join(match_any_word for x in words), flags=flags)
word_pats = tuple(regex.compile(rf'\b{x}\b', flags) for x in words)
self._nsd = word_pats, full_pat

2
src/calibre/library/catalogs/bibtex.py
View File

@ -399,7 +399,7 @@ class BIBTEX(CatalogPlugin):
entry['ondevice'] = db.catalog_plugin_on_device_temp_mapping[entry['id']]['ondevice']
# outfile.write('%%%Calibre catalog\n%%%{0} entries in catalog\n\n'.format(nb_entries))
outfile.write('@preamble{"This catalog of %d entries was generated by calibre on %s"}\n\n'
outfile.write('@preamble{"This catalog of %d entries was generated by calibre on %s"}\n\n' # noqa: UP031
% (nb_entries, strftime('%A, %d. %B %Y %H:%M')))
for entry in data:

6
src/calibre/library/catalogs/epub_mobi_builder.py
View File

@ -264,7 +264,7 @@ class CatalogBuilder:
(str): sort key
'''
if not book['series']:
fs = '{:<%d}!{!s}' % longest_author_sort
fs = '{:<%d}!{!s}' % longest_author_sort # noqa: UP031
key = fs.format(capitalize(book['author_sort']),
capitalize(book['title_sort']))
else:
@ -272,7 +272,7 @@ class CatalogBuilder:
integer = int(index)
fraction = index - integer
series_index = f"{integer:04}{str(f'{fraction:0.4f}').lstrip('0')}"
fs = '{:<%d}~{!s}{!s}' % longest_author_sort
fs = '{:<%d}~{!s}{!s}' % longest_author_sort # noqa: UP031
key = fs.format(capitalize(book['author_sort']),
self.generate_sort_title(book['series']),
series_index)
@ -785,7 +785,7 @@ class CatalogBuilder:
if self.DEBUG and self.opts.verbose:
tl = [i['title'] for i in books_by_author]
lt = max(tl, key=len)
fs = '{:<6}{:<%d} {:<%d} {}' % (len(lt), len(las))
fs = '{:<6}{:<%d} {:<%d} {}' % (len(lt), len(las)) # noqa: UP031
print(fs.format('', 'Title', 'Author', 'Series'))
for i in books_by_author:
print(fs.format('', i['title'], i['author_sort'], i['series']))

2
src/calibre/srv/auth.py
View File

@ -248,7 +248,7 @@ class AuthController:
self.log = log
self.secret = as_hex_unicode(os.urandom(random.randint(20, 30)))
self.max_age_seconds = max_age_seconds
self.key_order = '{%d}:{%d}:{%d}' % random.choice(tuple(permutations((0,1,2))))
self.key_order = '{%d}:{%d}:{%d}' % random.choice(tuple(permutations((0,1,2)))) # noqa: UP031
self.realm = realm
if '"' in realm:
raise ValueError('Double-quotes are not allowed in the authentication realm')

2
src/calibre/utils/config.py
View File

@ -73,7 +73,7 @@ class CustomHelpFormatter(optparse.IndentedHelpFormatter):
opts = ' '*self.current_indent + '{}\n'.format(colored(opts, fg='green'))
indent_first = self.help_position
else: # start help on same line as opts
opts = ' '*self.current_indent + '%-*s ' % (opt_width+len(colored('', fg='green')), colored(opts, fg='green'))
opts = ' '*self.current_indent + '%-*s ' % (opt_width+len(colored('', fg='green')), colored(opts, fg='green')) # noqa: UP031
indent_first = 0
result.append(opts)
if option.help: