Pywikibot-commits January 2022

pywikibot-commits@lists.wikimedia.org

1 participants
115 discussions

[Gerrit] ...core[master]: [tests] change url for ecoreality.org tests

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/756154 ) Change subject: [tests] change url for ecoreality.org tests ...................................................................... [tests] change url for ecoreality.org tests Bug: T299852 Change-Id: I741f101975b4ef41c65c4264f776f49aabe4837f --- M tests/site_detect_tests.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index b675b51..8015f66 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -120,7 +120,7 @@ api.php is not available. Anyway the wiki is outdated. """ - self.assertNoSite('http://www.ecoreality.org/wiki/$1') # v1.16.2 + self.assertNoSite('http://ecoreality.org/wiki/$1') # v1.16.2 class PreAPISiteTestCase(SiteDetectionTestCase): @@ -162,7 +162,7 @@ api.php is not available. HTML looks like it has an API, but redirect rules prevent access. """ - self.assertNoSite('http://www.EcoReality.org/wiki/$1') + self.assertNoSite('http://EcoReality.org/wiki/$1') class FailingSiteTestCase(SiteDetectionTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/756154 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I741f101975b4ef41c65c4264f776f49aabe4837f Gerrit-Change-Number: 756154 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [bugfix] AttributeError: 'str' object has no attribute 'formar'

by Meno25 (Code Review)

Meno25 has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/756070 ) Change subject: [bugfix] AttributeError: 'str' object has no attribute 'formar' ...................................................................... [bugfix] AttributeError: 'str' object has no attribute 'formar' Bug: T299844 Change-Id: I5474e24afe8a33f403234b70e3939319e919cf78 --- M pywikibot/textlib.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: JJMC89: Looks good to me, approved Meno25: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 7875f4e..da69210 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -1187,7 +1187,7 @@ lastpart = parts[-1] if re.match(r'\s*{}'.format(marker), lastpart): # Put the langlinks back into the noinclude's - regexp = re.compile(r'{}\s*{}'.formar(includeOff, marker)) + regexp = re.compile(r'{}\s*{}'.format(includeOff, marker)) newtext = regexp.sub(s + includeOff, s2) else: # Put the langlinks at the end, inside noinclude's -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/756070 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I5474e24afe8a33f403234b70e3939319e919cf78 Gerrit-Change-Number: 756070 Gerrit-PatchSet: 2 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [bugfix] Allow categories when saving IndexPage

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/756061 ) Change subject: [bugfix] Allow categories when saving IndexPage ...................................................................... [bugfix] Allow categories when saving IndexPage It is possible to have categories in IndexPage. Take them into consideration when validating page content, otherwise it will not be possible to save the page. Bug: T299806 Change-Id: I58c0370a938958d7f2800b7b099992526db0d0df --- M pywikibot/proofreadpage.py 1 file changed, 12 insertions(+), 4 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index 7096f32..8fca578 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -860,13 +860,21 @@ def has_valid_content(self) -> bool: """Test page only contains a single call to the index template.""" - if (not self.text.startswith('{{' + self.INDEX_TEMPLATE) - or not self.text.endswith('}}')): + text = self.text + + if not text.startswith('{{' + self.INDEX_TEMPLATE): + return False + + # Discard possible categories after INDEX_TEMPLATE + categories = textlib.getCategoryLinks(text, self.site) + for cat in categories: + text = text.replace('\n' + cat.title(as_link=True), '') + + if not text.endswith('}}'): return False # Discard all inner templates as only top-level ones matter - templates = textlib.extract_templates_and_params_regex_simple( - self.text) + templates = textlib.extract_templates_and_params_regex_simple(text) if len(templates) != 1 or templates[0][0] != self.INDEX_TEMPLATE: # Only a single call to the INDEX_TEMPLATE is allowed return False -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/756061 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I58c0370a938958d7f2800b7b099992526db0d0df Gerrit-Change-Number: 756061 Gerrit-PatchSet: 2 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [IMPR] Simplify int assignment

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/756024 ) Change subject: [IMPR] Simplify int assignment ...................................................................... [IMPR] Simplify int assignment Change-Id: I6e8d2486d40266b5f5f2998c8815f19ecf409e77 --- M scripts/archive/wikisourcetext.py M scripts/djvutext.py 2 files changed, 6 insertions(+), 12 deletions(-) Approvals: Mpaa: Looks good to me, approved Xqt: Verified; Looks good to me, approved diff --git a/scripts/archive/wikisourcetext.py b/scripts/archive/wikisourcetext.py index 6604c31..835b460 100755 --- a/scripts/archive/wikisourcetext.py +++ b/scripts/archive/wikisourcetext.py @@ -53,7 +53,7 @@ -always don't bother asking to confirm any of the changes. """ # -# (C) Pywikibot team, 2016-2021 +# (C) Pywikibot team, 2016-2022 # # Distributed under the terms of the MIT license. # @@ -252,11 +252,8 @@ pages = pages.split(',') for interval in range(len(pages)): start, sep, end = pages[interval].partition('-') - start = 1 if not start else int(start) - if not sep: - end = start - else: - end = int(end) if end else index.num_pages + start = int(start or 1) + end = int(end or index.num_pages) if sep else start pages[interval] = (start, end) # gen yields ProofreadPage objects. diff --git a/scripts/djvutext.py b/scripts/djvutext.py index 5c65787..638ea06 100755 --- a/scripts/djvutext.py +++ b/scripts/djvutext.py @@ -32,7 +32,7 @@ """ # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # @@ -182,11 +182,8 @@ pages = pages.split(',') for i, page_interval in enumerate(pages): start, sep, end = page_interval.partition('-') - start = 1 if not start else int(start) - if not sep: - end = start - else: - end = int(end) if end else djvu.number_of_images() + start = int(start or 1) + end = int(end or djvu.number_of_images()) if sep else start pages[i] = (start, end) site = pywikibot.Site() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/756024 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I6e8d2486d40266b5f5f2998c8815f19ecf409e77 Gerrit-Change-Number: 756024 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [bugfix] Enable default -mysqlquery with replace.py

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/754076 ) Change subject: [bugfix] Enable default -mysqlquery with replace.py ...................................................................... [bugfix] Enable default -mysqlquery with replace.py Default behaviour of -mysqlquery never worked with Pywikibot 3.0+ - use EXC_KEYS to handle exceptions - move exceptions parsing to handle_exceptions() - move pairsfile handling to handle_pairs() - move manual handling to handle_manual() - move sql handling to handle_sql() - remove replacement_file_arg_misplaced check which is not necessary if file_replacement is added after argument parsing - shorten -xmlstart, -xml and -pairsfile using parsed value - add local variable xmlStart to prevent NamingError - only use sql_query and remove useSql variable - disable parsing -mysqlquery with pagegenerators and enable local option handling to enable the default dehaviour - improvement for arg parsing - decrease cyclomatic complexity by 22% - update replacebot_tests.py Bug: T299306 Change-Id: Iee845a1e0ab1bf1ab9c2f41349f59decb351f58b --- M scripts/replace.py M tests/replacebot_tests.py 2 files changed, 152 insertions(+), 125 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/scripts/replace.py b/scripts/replace.py index 12cf5fe..5552141 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -146,9 +146,11 @@ import re from collections.abc import Sequence from contextlib import suppress +from typing import Optional import pywikibot from pywikibot import editor, fixes, i18n, pagegenerators, textlib +from pywikibot.backports import Dict, Generator, List, Pattern, Tuple from pywikibot.bot import ExistingPageBot, SingleSiteBot from pywikibot.exceptions import InvalidPageError, NoPageError from pywikibot.tools import chars @@ -768,6 +770,113 @@ return pattern +EXC_KEYS = { + '-excepttitle': 'title', + '-requiretitle:': 'require-title', + '-excepttext': 'text-contains', + '-exceptinside': 'inside', + '-exceptinsidetag': 'inside-tags' +} +"""Dictionary to convert exceptions command line options to exceptions keys. + + .. versionadded:: 7.0 +""" + + +def handle_exceptions(*args: str) -> Tuple[List[str], Dict[str, str]]: + """Handle exceptions args to ignore pages which contain certain texts. + + .. versionadded:: 7.0 + """ + exceptions = {key: [] for key in EXC_KEYS.values()} + local_args = [] + for argument in args: + arg, _, value = argument.partition(':') + if arg in EXC_KEYS: + exceptions[EXC_KEYS[arg]].append(value) + else: + local_args.append(argument) + return local_args, exceptions + + +def handle_pairsfile(filename: str) -> List[str]: + """Handle -pairsfile argument. + + .. versionadded:: 7.0 + """ + if not filename: + filename = pywikibot.input( + 'Please enter the filename to read replacements from:') + + try: + with codecs.open(filename, 'r', 'utf-8') as f: + # strip newlines, but not other characters + replacements = f.read().splitlines() + if not replacements: + raise OSError('{} is empty.'.format(filename)) + except OSError as e: + pywikibot.error('Error loading {}: {}'.format(filename, e)) + return None + + if len(replacements) % 2: + pywikibot.error( + '{} contains an incomplete pattern replacement pair.'.format( + filename)) + return None + + # Strip BOM from first line + replacements[0].lstrip('\uFEFF') + return replacements + + +def handle_manual() -> List[str]: + """Handle manual input. + + .. versionadded:: 7.0 + """ + pairs = [] + old = pywikibot.input('Please enter the text that should be replaced:') + while old: + new = pywikibot.input('Please enter the new text:') + pairs += [old, new] + old = pywikibot.input( + 'Please enter another text that should be replaced,\n' + 'or press Enter to start:') + return pairs + + +def handle_sql(sql: str, + replacements: List[Pattern], + exceptions: List[Pattern]) -> Generator: + """Handle default sql query. + + .. versionadded:: 7.0 + """ + if not sql: + where_clause = 'WHERE ({})'.format(' OR '.join( + "old_text RLIKE '{}'" + .format(prepareRegexForMySQL(repl.old_regex.pattern)) + for repl in replacements)) + + if exceptions: + except_clause = 'AND NOT ({})'.format(' OR '.join( + "old_text RLIKE '{}'" + .format(prepareRegexForMySQL(exc.pattern)) + for exc in exceptions)) + else: + except_clause = '' + + sql = """ +SELECT page_namespace, page_title +FROM page +JOIN text ON (page_id = old_id) +{} +{} +LIMIT 200""".format(where_clause, except_clause) + + return pagegenerators.MySQLPageGenerator(sql) + + def main(*args: str) -> None: """ Process command line arguments and invoke bot. @@ -783,16 +892,9 @@ # Array which will collect commandline parameters. # First element is original text, second element is replacement text. commandline_replacements = [] + file_replacements = [] # A list of 2-tuples of original text and replacement text. replacements = [] - # Don't edit pages which contain certain texts. - exceptions = { - 'title': [], - 'text-contains': [], - 'inside': [], - 'inside-tags': [], - 'require-title': [], # using a separate requirements dict needs some - } # major refactoring of code. # Should the elements of 'replacements' and 'exceptions' be interpreted # as regular expressions? @@ -802,53 +904,36 @@ # the dump's path, either absolute or relative, which will be used # if -xml flag is present xmlFilename = None - useSql = False - sql_query = None + xmlStart = None + sql_query = None # type: Optional[str] # Set the default regular expression flags flags = 0 # Request manual replacements even if replacements are already defined manual_input = False - # Replacements loaded from a file - replacement_file = None - replacement_file_arg_misplaced = False # Read commandline parameters. + genFactory = pagegenerators.GeneratorFactory( + disabled_options=['mysqlquery']) local_args = pywikibot.handle_args(args) - genFactory = pagegenerators.GeneratorFactory() local_args = genFactory.handle_args(local_args) + local_args, exceptions = handle_exceptions(*local_args) - for arg in local_args: + for argument in local_args: + arg, _, value = argument.partition(':') if arg == '-regex': regex = True - elif arg.startswith('-xmlstart'): - if len(arg) == 9: - xmlStart = pywikibot.input( - 'Please enter the dumped article to start with:') - else: - xmlStart = arg[10:] - elif arg.startswith('-xml'): - if len(arg) == 4: - xmlFilename = i18n.input('pywikibot-enter-xml-filename') - else: - xmlFilename = arg[5:] - elif arg.startswith('-mysqlquery'): - useSql = True - sql_query = arg.partition(':')[2] - elif arg.startswith('-excepttitle:'): - exceptions['title'].append(arg[13:]) - elif arg.startswith('-requiretitle:'): - exceptions['require-title'].append(arg[14:]) - elif arg.startswith('-excepttext:'): - exceptions['text-contains'].append(arg[12:]) - elif arg.startswith('-exceptinside:'): - exceptions['inside'].append(arg[14:]) - elif arg.startswith('-exceptinsidetag:'): - exceptions['inside-tags'].append(arg[17:]) - elif arg.startswith('-fix:'): - fixes_set += [arg[5:]] - elif arg.startswith('-sleep:'): - options['sleep'] = float(arg[7:]) - elif arg in ('-always', '-recursive', '-allowoverlap'): + elif arg == '-xmlstart': + xmlStart = value or pywikibot.input( + 'Please enter the dumped article to start with:') + elif arg == '-xml': + xmlFilename = value or i18n.input('pywikibot-enter-xml-filename') + elif arg == '-mysqlquery': + sql_query = value + elif arg == '-fix': + fixes_set.append(value) + elif arg == '-sleep': + options['sleep'] = float(value) + elif arg in ('-allowoverlap', '-always', '-recursive'): options[arg[1:]] = True elif arg == '-nocase': flags |= re.IGNORECASE @@ -856,67 +941,32 @@ flags |= re.DOTALL elif arg == '-multiline': flags |= re.MULTILINE - elif arg.startswith('-addcat:'): - options['addcat'] = arg[8:] - elif arg.startswith('-summary:'): - edit_summary = arg[9:] - elif arg.startswith('-automaticsummary'): + elif arg == '-addcat': + options['addcat'] = value + elif arg == '-summary': + edit_summary = value + elif arg == '-automaticsummary': edit_summary = True - elif arg.startswith('-manualinput'): + elif arg == '-manualinput': manual_input = True - elif arg.startswith('-pairsfile'): - if len(commandline_replacements) % 2: - replacement_file_arg_misplaced = True - - if arg == '-pairsfile': - replacement_file = pywikibot.input( - 'Please enter the filename to read replacements from:') - else: - replacement_file = arg[len('-pairsfile:'):] + elif arg == '-pairsfile': + file_replacements = handle_pairsfile(value) else: commandline_replacements.append(arg) - site = pywikibot.Site() + if file_replacements is None: + return if len(commandline_replacements) % 2: pywikibot.error('Incomplete command line pattern replacement pair.') return - if replacement_file_arg_misplaced: - pywikibot.error( - '-pairsfile used between a pattern replacement pair.') - return - - if replacement_file: - try: - with codecs.open(replacement_file, 'r', 'utf-8') as f: - # strip newlines, but not other characters - file_replacements = f.read().splitlines() - except OSError as e: - pywikibot.error('Error loading {}: {}'.format( - replacement_file, e)) - return - - if len(file_replacements) % 2: - pywikibot.error( - '{} contains an incomplete pattern replacement pair.'.format( - replacement_file)) - return - - # Strip BOM from first line - file_replacements[0].lstrip('\uFEFF') - commandline_replacements.extend(file_replacements) - + commandline_replacements += file_replacements if not(commandline_replacements or fixes_set) or manual_input: - old = pywikibot.input('Please enter the text that should be replaced:') - while old: - new = pywikibot.input('Please enter the new text:') - commandline_replacements += [old, new] - old = pywikibot.input( - 'Please enter another text that should be replaced,' - '\nor press Enter to start:') + commandline_replacements += handle_manual() # The summary stored here won't be actually used but is only an example + site = pywikibot.Site() single_summary = None for i in range(0, len(commandline_replacements), 2): replacement = Replacement(commandline_replacements[i], @@ -1029,33 +1079,12 @@ precompile_exceptions(exceptions, regex, flags) if xmlFilename: - try: - xmlStart - except NameError: - xmlStart = None gen = XmlDumpReplacePageGenerator(xmlFilename, xmlStart, replacements, exceptions, site) - elif useSql: - if not sql_query: - whereClause = 'WHERE ({})'.format(' OR '.join( - "old_text RLIKE '{}'" - .format(prepareRegexForMySQL(old_regexp.pattern)) - for (old_regexp, new_text) in replacements)) - if exceptions: - exceptClause = 'AND NOT ({})'.format(' OR '.join( - "old_text RLIKE '{}'" - .format(prepareRegexForMySQL(exc.pattern)) - for exc in exceptions)) - else: - exceptClause = '' - query = sql_query or """ -SELECT page_namespace, page_title -FROM page -JOIN text ON (page_id = old_id) -{} -{} -LIMIT 200""".format(whereClause, exceptClause) - gen = pagegenerators.MySQLPageGenerator(query) + elif sql_query is not None: + # Only -excepttext option is considered by the query. Other + # exceptions are taken into account by the ReplaceRobot + gen = handle_sql(sql_query, replacements, exceptions['text-contains']) gen = genFactory.getCombinedGenerator(gen, preload=True) if pywikibot.bot.suggest_help(missing_generator=not gen): diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py index 9ee153b..a4ac228 100644 --- a/tests/replacebot_tests.py +++ b/tests/replacebot_tests.py @@ -100,16 +100,14 @@ def test_invalid_replacements(self): """Test invalid command line replacement configurations.""" - # old and new need to be together - self.assertFalse(self._run('foo', '-pairsfile:/dev/null', 'bar')) - - self.assertEqual([ - '-pairsfile used between a pattern replacement pair.', - ], pywikibot.bot.ui.pop_output()) + # old and new no longer need to be together but pairsfile must exist + self._run('foo', '-pairsfile:/dev/null', 'bar') + self.assertIn('Error loading /dev/null:', + pywikibot.bot.ui.pop_output()[0]) # only old provided with empty_sites(): - self.assertFalse(self._run('foo')) + self._run('foo') self.assertEqual([ 'Incomplete command line pattern replacement pair.', ], pywikibot.bot.ui.pop_output()) @@ -146,7 +144,7 @@ def _get_bot(self, only_confirmation, *args): """Run with arguments, assert and return one bot.""" - self.assertIsNone(self._run(*args)) + self._run(*args) self.assertLength(self.bots, 1) bot = self.bots[0] if only_confirmation is not None: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/754076 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: Iee845a1e0ab1bf1ab9c2f41349f59decb351f58b Gerrit-Change-Number: 754076 Gerrit-PatchSet: 14 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [IMPR] add a new function case_escape to textlib

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/755931 ) Change subject: [IMPR] add a new function case_escape to textlib ...................................................................... [IMPR] add a new function case_escape to textlib case_escape return an escaped regex pattern which takes namespace.case into account. Use the new function in - MultiTemplateMatchBuilder - replaceCategoryInPlace - archivebot.py - image.py Also improve image.py script Change-Id: I73735616310187290dd3ceac34e80689ce51ee30 --- M pywikibot/textlib.py M scripts/archivebot.py M scripts/image.py 3 files changed, 46 insertions(+), 50 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index bd26f10..7875f4e 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -148,6 +148,24 @@ return phrase +def case_escape(case: str, string: str) -> str: + """Return an escaped regex pattern which depends on 'first-letter' case. + + .. versionadded:: 7.0 + + :param case: if `case` is 'first-letter' the regex contains an + upper/lower case set for the first letter + """ + first = string[0] + if first.isalpha() and case == 'first-letter': + pattern = '[{}{}]{}'.format(first.upper(), + first.lower(), + re.escape(string[1:])) + else: + pattern = re.escape(string) + return pattern + + class MultiTemplateMatchBuilder: """Build template matcher.""" @@ -174,12 +192,7 @@ raise ValueError( '{!r} is not a valid template'.format(template)) - if namespace.case == 'first-letter': - pattern = '[{}{}]{}'.format(re.escape(old[0].upper()), - re.escape(old[0].lower()), - re.escape(old[1:])) - else: - pattern = re.escape(old) + pattern = case_escape(namespace.case, old) # namespaces may be any mixed case namespaces = [_ignore_case(ns) for ns in namespace] namespaces.append(_ignore_case('msg')) @@ -1395,11 +1408,9 @@ title = oldcat.title(with_ns=False) if not title: return oldtext + # title might contain regex special characters - title = re.escape(title) - # title might not be capitalized correctly on the wiki - if title[0].isalpha() and site.namespaces[14].case == 'first-letter': - title = '[{}{}]'.format(title[0].upper(), title[0].lower()) + title[1:] + title = case_escape(site.namespaces[14].case, title) # spaces and underscores in page titles are interchangeable and collapsible title = title.replace(r'\ ', '[ _]+').replace(r'\_', '[ _]+') categoryR = re.compile(r'\[\[\s*({})\s*:\s*{}[\s\u200e\u200f]*' diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 5c12659..adf23c1 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -88,7 +88,7 @@ -salt:SALT specify salt """ # -# (C) Pywikibot team, 2006-2021 +# (C) Pywikibot team, 2006-2022 # # Distributed under the terms of the MIT license. # @@ -111,9 +111,10 @@ from pywikibot.date import apply_month_delta from pywikibot.exceptions import Error, NoPageError from pywikibot.textlib import ( - TimeStripper, + case_escape, extract_sections, findmarker, + TimeStripper, to_local_digits, ) @@ -297,12 +298,7 @@ ns = tpl_page.site.namespaces[tpl_page.namespace()] marker = '?' if ns.id == 10 else '' title = tpl_page.title(with_ns=False) - if ns.case != 'case-sensitive': - title = '[{}{}]{}'.format(re.escape(title[0].upper()), - re.escape(title[0].lower()), - re.escape(title[1:])) - else: - title = re.escape(title) + title = case_escape(ns.case, title) return re.compile(r'(?:(?:%s):)%s%s' % ('|'.join(ns), marker, title)) diff --git a/scripts/image.py b/scripts/image.py index 73f417a..4eff8f7 100755 --- a/scripts/image.py +++ b/scripts/image.py @@ -37,16 +37,17 @@ """ # -# (C) Pywikibot team, 2013-2021 +# (C) Pywikibot team, 2013-2022 # # Distributed under the terms of the MIT license. # import re -from typing import Optional import pywikibot from pywikibot import i18n, pagegenerators from pywikibot.bot import SingleSiteBot +from pywikibot.textlib import case_escape + from scripts.replace import ReplaceRobot as ReplaceBot @@ -55,7 +56,7 @@ """This bot will replace or remove all occurrences of an old image.""" def __init__(self, generator, old_image: str, - new_image: Optional[str] = None, **kwargs): + new_image: str = '', **kwargs) -> None: """ Initializer. @@ -85,12 +86,7 @@ param) namespace = self.site.namespaces[6] - if namespace.case == 'first-letter': - case = re.escape(self.old_image[0].upper() - + self.old_image[0].lower()) - escaped = '[' + case + ']' + re.escape(self.old_image[1:]) - else: - escaped = re.escape(self.old_image) + escaped = case_escape(namespace.case, self.old_image) # Be careful, spaces and _ have been converted to '\ ' and '\_' escaped = re.sub('\\\\[_ ]', '[_ ]', escaped) @@ -102,17 +98,14 @@ image_regex = re.compile(r'' + escaped) replacements = [] - if self.new_image: - if not self.opt.loose: - replacements.append((image_regex, - '[[{}:{}\\g<parameters>]]' - .format( - self.site.namespaces.FILE.custom_name, - self.new_image))) - else: - replacements.append((image_regex, self.new_image)) + if not self.opt.loose and self.new_image: + replacements.append((image_regex, + '[[{}:{}\\g<parameters>]]' + .format( + self.site.namespaces.FILE.custom_name, + self.new_image))) else: - replacements.append((image_regex, '')) + replacements.append((image_regex, self.new_image)) super().__init__(generator, replacements, always=self.opt.always, @@ -128,21 +121,17 @@ :param args: command line arguments """ - old_image = None - new_image = None + old_image = '' + new_image = '' options = {} - for arg in pywikibot.handle_args(args): - if arg == '-always': - options['always'] = True - elif arg == '-loose': - options['loose'] = True - elif arg.startswith('-summary'): - if len(arg) == len('-summary'): - options['summary'] = pywikibot.input( - 'Choose an edit summary: ') - else: - options['summary'] = arg[len('-summary:'):] + for argument in pywikibot.handle_args(args): + arg, _, value = argument.partition(':') + if arg in ('-always', '-loose'): + options[arg[1:]] = True + elif arg == '-summary': + options[arg[1:]] = value or pywikibot.input( + 'Choose an edit summary: ') elif old_image: new_image = arg else: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/755931 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I73735616310187290dd3ceac34e80689ce51ee30 Gerrit-Change-Number: 755931 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [IMPR] support inheritance of the __STATICREDIRECT__

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/178780 ) Change subject: [IMPR] support inheritance of the __STATICREDIRECT__ ...................................................................... [IMPR] support inheritance of the __STATICREDIRECT__ Support inheritance of the __STATICREDIRECT__ magic word via transclusion. No longer load the whole page text to determine the result. Tests added. API:Pagepropes was introduced with mw 1.17 API:Pageswithprop was introduced with mw 1.21 We can assume that the 'staticredirect' page property is used. Change-Id: I9609ef6196c0caf0444ce8bd0583f33084213944 --- M pywikibot/page/__init__.py M tests/page_tests.py 2 files changed, 28 insertions(+), 13 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index cf96533..7c22bef 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -722,20 +722,18 @@ return self.site.page_isredirect(self) def isStaticRedirect(self, force: bool = False) -> bool: - """ - Determine whether the page is a static redirect. + """Determine whether the page is a static redirect. A static redirect must be a valid redirect, and contain the magic word __STATICREDIRECT__. + .. versionchanged:: 7.0.0 + __STATICREDIRECT__ can be transcluded + :param force: Bypass local caching """ - if self.isRedirectPage(): - static_keys = self.site.getmagicwords('staticredirect') - text = self.get(get_redirect=True, force=force) - if static_keys: - return any(key in text for key in static_keys) - return False + return self.isRedirectPage() \ + and 'staticredirect' in self.properties(force=force) def isCategoryRedirect(self) -> bool: """Return True if this is a category redirect page, False otherwise.""" diff --git a/tests/page_tests.py b/tests/page_tests.py index 9a37684..7723ba1 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -962,14 +962,22 @@ 'R2' is a normal page and 'R3' does not exist. """ - family = 'wikipedia' - code = 'en' + sites = { + 'en': { + 'family': 'wikipedia', + 'code': 'en', + }, + 'test': { + 'family': 'wikipedia', + 'code': 'test', + }, + } cached = True def testIsRedirect(self): """Test ``Page.isRedirectPage()`` and ``Page.getRedirectTarget``.""" - site = self.get_site() + site = self.get_site('en') p1 = pywikibot.Page(site, 'User:Legoktm/R1') p2 = pywikibot.Page(site, 'User:Legoktm/R2') self.assertTrue(p1.isRedirectPage()) @@ -977,9 +985,18 @@ self.assertEqual(p3, p2) self.assertIsInstance(p3, pywikibot.User) + def testIsStaticRedirect(self): + """Test ``Page.isStaticRedirect()``.""" + site = self.get_site('test') + page = pywikibot.Page(site, 'Static Redirect') + self.assertTrue(page.isRedirectPage()) + self.assertTrue(page.isStaticRedirect()) + self.assertIn('staticredirect', page.properties()) + self.assertIn('__STATICREDIRECT__', page.text) + def testPageGet(self): """Test ``Page.get()`` on different types of pages.""" - site = self.get_site() + site = self.get_site('en') p1 = pywikibot.Page(site, 'User:Legoktm/R2') p2 = pywikibot.Page(site, 'User:Legoktm/R1') p3 = pywikibot.Page(site, 'User:Legoktm/R3') @@ -1000,7 +1017,7 @@ def test_set_redirect_target(self): """Test set_redirect_target method.""" # R1 redirects to R2 and R3 doesn't exist. - site = self.get_site() + site = self.get_site('en') p1 = pywikibot.Page(site, 'User:Legoktm/R2') p2 = pywikibot.Page(site, 'User:Legoktm/R1') p3 = pywikibot.Page(site, 'User:Legoktm/R3') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/178780 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I9609ef6196c0caf0444ce8bd0583f33084213944 Gerrit-Change-Number: 178780 Gerrit-PatchSet: 5 Gerrit-Owner: Ricordisamoa <ricordisamoa(a)disroot.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)disroot.org> Gerrit-Reviewer: Rubin <rubin.happy(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Meno25 <meno25mail(a)gmail.com> Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/754482 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I92d98634b29d0d3d2d56eaa8b1c91cb54f27c8f9 --- M archivebot/scn.json 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/archivebot/scn.json b/archivebot/scn.json index 031878f..a914596 100644 --- a/archivebot/scn.json +++ b/archivebot/scn.json @@ -4,5 +4,6 @@ "Ajeje Brazorf" ] }, + "archivebot-archiveheader": "{{Archiviu di discussioni}}", "archivebot-older-than": "cchiù {{PLURAL:%(count)d|vecchiu|vecchî}} di %(duration)s" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/754482 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: I92d98634b29d0d3d2d56eaa8b1c91cb54f27c8f9 Gerrit-Change-Number: 754482 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [W0069] remove commented out code blocks

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/754062 ) Change subject: [W0069] remove commented out code blocks ...................................................................... [W0069] remove commented out code blocks Change-Id: I23782e36325476d831d8bfe7728ed5ea16649bd0 --- M pywikibot/interwiki_graph.py M pywikibot/page/__init__.py M scripts/replace.py 3 files changed, 1 insertion(+), 7 deletions(-) Approvals: Thiemo Kreuz (WMDE): Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py index e9ca5c6..15d416e 100644 --- a/pywikibot/interwiki_graph.py +++ b/pywikibot/interwiki_graph.py @@ -196,7 +196,6 @@ .format(self.subject.origin.title())) # create empty graph self.graph = pydot.Dot() - # self.graph.set('concentrate', 'true') self.octagon_sites = self._octagon_site_set() diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 1eb2512..37080e7 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -5164,7 +5164,6 @@ name = namespace.custom_name break else: - # not found raise Error( 'No corresponding namespace found for namespace {} on {}.' .format(self.namespace, onsite)) diff --git a/scripts/replace.py b/scripts/replace.py index 12cf5fe..9ad0f0f 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -755,16 +755,12 @@ return True -def prepareRegexForMySQL(pattern): +def prepareRegexForMySQL(pattern: str) -> str: """Convert regex to MySQL syntax.""" pattern = pattern.replace(r'\s', '[:space:]') pattern = pattern.replace(r'\d', '[:digit:]') pattern = pattern.replace(r'\w', '[:alnum:]') - pattern = pattern.replace("'", '\\' + "'") - # pattern = pattern.replace('\\', '\\\\') - # for char in ['[', ']', "'"]: - # pattern = pattern.replace(char, '\%s' % char) return pattern -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/754062 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I23782e36325476d831d8bfe7728ed5ea16649bd0 Gerrit-Change-Number: 754062 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Thiemo Kreuz (WMDE) <thiemo.kreuz(a)wikimedia.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

[Gerrit] ...core[master]: [bugfix] Solve TypeError debug() missing 1 required positional argume...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/754107 ) Change subject: [bugfix] Solve TypeError debug() missing 1 required positional argument: 'layer' ...................................................................... [bugfix] Solve TypeError debug() missing 1 required positional argument: 'layer' Bug: T299309 Change-Id: I566217e04749f287359721ee8a9da54b38363312 --- M pywikibot/site/_tokenwallet.py 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_tokenwallet.py b/pywikibot/site/_tokenwallet.py index 271e46e..dd9f292 100644 --- a/pywikibot/site/_tokenwallet.py +++ b/pywikibot/site/_tokenwallet.py @@ -1,12 +1,14 @@ """Objects representing api tokens.""" # -# (C) Pywikibot team, 2008-2020 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # from pywikibot import debug from pywikibot.exceptions import Error +_logger = 'site.tokenwallet' + class TokenWallet: @@ -60,7 +62,8 @@ if self.site.mw_version >= '1.24wmf19' \ and key in {'edit', 'delete', 'protect', 'move', 'block', 'unblock', 'email', 'import', 'options'}: - debug('Token {!r} was replaced by {!r}'.format(key, 'csrf')) + debug( + 'Token {!r} was replaced by {!r}'.format(key, 'csrf'), _logger) key = 'csrf' try: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/754107 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Change-Id: I566217e04749f287359721ee8a9da54b38363312 Gerrit-Change-Number: 754107 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 3 months

← Newer
1
2
3
4
5
6
7
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2022