Pywikibot-commits February 2022

pywikibot-commits@lists.wikimedia.org

1 participants
99 discussions

[Gerrit] ...core[master]: [cleanup] Remove showHelp function and BaseBot.stop method
by jenkins-bot (Code Review) 04 Feb '22

04 Feb '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/759717 ) Change subject: [cleanup] Remove showHelp function and BaseBot.stop method ...................................................................... [cleanup] Remove showHelp function and BaseBot.stop method Both were deprecated since Pywikibot 4.0.0 Change-Id: I4a72f6d7231a2accfd0f38d2d50ea338ebf5201c --- M pywikibot/bot.py 1 file changed, 1 insertion(+), 17 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index df367b0..00fe1fb 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -75,7 +75,7 @@ 'QuitKeyboardInterrupt', 'InteractiveReplace', 'calledModuleName', 'handle_args', - 'show_help', 'showHelp', 'suggest_help', + 'show_help', 'suggest_help', 'writeToCommandLogFile', 'open_webbrowser', 'OptionHandler', 'BaseBot', 'Bot', 'ConfigParserBot', 'SingleSiteBot', 'MultipleSitesBot', @@ -1022,12 +1022,6 @@ pywikibot.stdout(_GLOBAL_HELP_NOTE) -@deprecated('show_help', since='20200705') -def showHelp(module_name: Optional[str] = None) -> None: # pragma: no cover - """DEPRECATED. Show help for the Bot.""" - return show_help(module_name) - - def suggest_help(missing_parameters: Optional[Sequence[str]] = None, missing_generator: bool = False, unknown_parameters: Optional[Sequence[str]] = None, @@ -1448,16 +1442,6 @@ return True return False - @deprecated('generator.close()', since='20200804') - def stop(self) -> None: # pragma: no cover - """Stop iterating. - - .. deprecated:: - Use generator.close() instead. - """ - pywikibot.output('Generator has been stopped.') - self.generator.close() - def quit(self) -> None: """Cleanup and quit processing.""" raise QuitKeyboardInterrupt -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/759717 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: I4a72f6d7231a2accfd0f38d2d50ea338ebf5201c Gerrit-Change-Number: 759717 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 03 Feb '22

03 Feb '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/759488 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Idd535202f4be58b3ed7d7a89afe96bba3f33d15d --- M category/he.json M category/sk.json M category/uk.json M category_redirect/ckb.json M checkimages/ckb.json A followlive/ckb.json A image/ckb.json A interwikidata/ckb.json M noreferences/ar.json M noreferences/ckb.json M pywikibot/ckb.json A unlink/ckb.json 12 files changed, 45 insertions(+), 2 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/he.json b/category/he.json index 34cfc80..8666bb5 100644 --- a/category/he.json +++ b/category/he.json @@ -8,6 +8,7 @@ }, "category-adding": "בוט: מוסיף את הקטגוריה [[:Category:%(newcat)s|%(newcat)s]]", "category-also-in": "(גם בקטגוריות %(alsocat)s)", + "category-clean": "בוט: מסיר את הקטגוריה %(category)s, שכבר קיימת בתוך %(child)s", "category-listifying": "בוט: יוצר רשימה מהקטגוריה %(fromcat)s (%(num)d דפים)", "category-removing": "בוט: מסיר את הדף מהקטגוריה %(oldcat)s", "category-renamed": "בוט: הועבר מהשם %(oldcat)s. כותבים: %(authors)s", diff --git a/category/sk.json b/category/sk.json index 669b1e0..d4951bb 100644 --- a/category/sk.json +++ b/category/sk.json @@ -9,6 +9,7 @@ }, "category-adding": "Bot: Pridanie kategórie [[:Category:%(newcat)s|%(newcat)s]]", "category-also-in": "(aj v %(alsocat)s)", + "category-clean": "Bot: Odstraňovanie kategórie %(category)s, ktorá už je v %(child)s", "category-listifying": "Bot: vytváranie zoznamu %(fromcat)s (počet záznamov: %(num)d)", "category-removing": "Bot: Odstraňovanie z %(oldcat)s", "category-renamed": "Bot: Presunuté z %(oldcat)s. Autori: %(authors)s", diff --git a/category/uk.json b/category/uk.json index 067e705..a034fc2 100644 --- a/category/uk.json +++ b/category/uk.json @@ -4,6 +4,7 @@ "A1", "Avatar6", "Base", + "DDPAT", "Movses", "Piramidion", "Ата", @@ -12,6 +13,7 @@ }, "category-adding": "Бот: додав категорію [[:Category:%(newcat)s|%(newcat)s]]", "category-also-in": "(також у %(alsocat)s)", + "category-clean": "Бот: Видалення категорії %(category)s, яка вже є в %(child)s", "category-listifying": "Бот: складання списку %(fromcat)s із ({{PLURAL:%(num)d|1 запису|%(num)d записів}})", "category-removing": "Бот: видалення з %(oldcat)s", "category-renamed": "Бот: перейменовано з %(oldcat)s. Автори: %(authors)s", diff --git a/category_redirect/ckb.json b/category_redirect/ckb.json index 25f16e2..d9ad24c 100644 --- a/category_redirect/ckb.json +++ b/category_redirect/ckb.json @@ -7,5 +7,6 @@ ] }, "category_redirect-fix-double": "بۆت: چاکسازیی دووجار-ڕەوانەکەر", + "category_redirect-log-failed": "** شکستی ھێنا: %(error)s", "category_redirect-log-ignoring": "* فەرامۆشکردنی %(oldcat)s" } diff --git a/checkimages/ckb.json b/checkimages/ckb.json index 860c34d..e75a33c 100644 --- a/checkimages/ckb.json +++ b/checkimages/ckb.json @@ -7,6 +7,7 @@ "checkimages-deletion-comment": "بۆت: زیادکردنی %(adding)s", "checkimages-doubles-head": "پەڕگەی دووپات", "checkimages-log-comment": "بۆت: نوێکردنەوە لۆگ", + "checkimages-no-license-head": "وێنەی بێمۆڵەت", "checkimages-source-notice-comment": "بۆت: داواکردنی زانیاریی سەرچاوە.", "checkimages-unknown-extension-head": "زیادکراوەی نەناسراو!" } diff --git a/followlive/ckb.json b/followlive/ckb.json new file mode 100644 index 0000000..53dd726 --- /dev/null +++ b/followlive/ckb.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "ئارام بکر" + ] + }, + "followlive-blanking": "واڵا کرایەوە، ناوەڕۆک ئەمە بوو: '%(content)s'." +} diff --git a/image/ckb.json b/image/ckb.json new file mode 100644 index 0000000..fc03c88 --- /dev/null +++ b/image/ckb.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "ئارام بکر" + ] + }, + "image-remove": "بۆت: سڕینەوەی وێنەی %(file)s", + "image-replace": "بۆت: گۆڕینی وێنەی %(old)s بە %(new)s" +} diff --git a/interwikidata/ckb.json b/interwikidata/ckb.json new file mode 100644 index 0000000..0c0b325 --- /dev/null +++ b/interwikidata/ckb.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "ئارام بکر" + ] + }, + "interwikidata-clean-summary": "بۆت: خاوێنکردنەوەی بەستەرە کۆنەکانی نێوانویکی" +} diff --git a/noreferences/ar.json b/noreferences/ar.json index 76da132..1faba05 100644 --- a/noreferences/ar.json +++ b/noreferences/ar.json @@ -4,9 +4,10 @@ "Framawiki", "Meno25", "Zaher kadour", + "ئارام بکر", "ديفيد" ] }, - "noreferences-add-tag": "بوت: إضافة {{قا|مراجع}} مفقود لمقالة [[ويكيبيديا:مراجع|بمراجع]]", + "noreferences-add-tag": "بوت: إضافة {{[[قالب:مراجع|مراجع]]}} مفقود لمقالة [[ويكيبيديا:مراجع|بمراجع]]", "noreferences-fix-tag": "بوت: تصحيح صيغة غير صحيحة لوسم <references />" } diff --git a/noreferences/ckb.json b/noreferences/ckb.json index 1f53d40..b0f5ef0 100644 --- a/noreferences/ckb.json +++ b/noreferences/ckb.json @@ -5,6 +5,6 @@ "ئارام بکر" ] }, - "noreferences-add-tag": "بۆت: زیادکردنی تاگی بەجێماوی <references />", + "noreferences-add-tag": "بۆت: زیادکردنی داڕێژەی بەجێماوی {{[[داڕێژە:سەرچاوەکان|سەرچاوەکان]]}}", "noreferences-fix-tag": "بۆت: چاککردنەوەی سینتاکسی نادروستی تاگی <references />" } diff --git a/pywikibot/ckb.json b/pywikibot/ckb.json index 515ee70..13e2593 100644 --- a/pywikibot/ckb.json +++ b/pywikibot/ckb.json @@ -6,6 +6,9 @@ ] }, "pywikibot-cosmetic-changes": "؛ دەستکاریی جوانکاری", + "pywikibot-enter-category-name": "تکایە ناوی پۆلەکە بنووسە:", + "pywikibot-enter-finished-browser": "کاتێک لە وێبگەڕەکە تەواو بوو، ئینتەر داگرە.", + "pywikibot-enter-new-text": "تکایە دەقە نوێیەکە داخل بکە:", "pywikibot-fixes-html": "بۆت: گۆڕینی/چاککردنی ئەیچ تی ئێم ئێڵ", "pywikibot-fixes-syntax": "بۆت: چاککردنی شێوازی نووسینی ویکی" } diff --git a/unlink/ckb.json b/unlink/ckb.json new file mode 100644 index 0000000..a7f2e1d --- /dev/null +++ b/unlink/ckb.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "ئارام بکر" + ] + }, + "unlink-unlinking": "بۆت: شکاندنی بەستەری \"%(title)s\"" +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/759488 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: Idd535202f4be58b3ed7d7a89afe96bba3f33d15d Gerrit-Change-Number: 759488 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

1 0

[Gerrit] ...core[master]: [cleanup] Remove deprecation warning for ignore_warnings/report_success
by jenkins-bot (Code Review) 02 Feb '22

02 Feb '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/758046 ) Change subject: [cleanup] Remove deprecation warning for ignore_warnings/report_success ...................................................................... [cleanup] Remove deprecation warning for ignore_warnings/report_success This warning is not clear and the parameters should be rethinked at all. Bug: T271899 Change-Id: Ifd5f895e26465c6b270d4b2dfa8ce9f70a94ca66 --- M pywikibot/site/_apisite.py 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 1101c30..cc8518a 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -74,7 +74,6 @@ MediaWikiVersion, compute_file_hash, deprecated, - issue_deprecation_warning, merge_unique_dicts, normalize_username, ) @@ -2640,11 +2639,6 @@ if not isinstance(ignore_warnings, bool): raise ValueError('report_success may only be set to True when ' 'ignore_warnings is a boolean') - issue_deprecation_warning('"ignore_warnings" as a boolean and ' - '"report_success" is True or None', - '"report_success=False" or define ' - '"ignore_warnings" as callable/iterable', - 3, since='20150823') if isinstance(ignore_warnings, Iterable): ignored_warnings = ignore_warnings -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/758046 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: Ifd5f895e26465c6b270d4b2dfa8ce9f70a94ca66 Gerrit-Change-Number: 758046 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Remove deprecation warning for RepeatingGenerator
by jenkins-bot (Code Review) 02 Feb '22

02 Feb '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/758044 ) Change subject: [IMPR] Remove deprecation warning for RepeatingGenerator ...................................................................... [IMPR] Remove deprecation warning for RepeatingGenerator RepeatingGenerator can still be used by some scripts Change-Id: I1359202f53c81955b2b95fd9b064e196848a026b --- M pywikibot/pagegenerators.py M tests/pagegenerators_tests.py 2 files changed, 7 insertions(+), 9 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index beff3b7..53e6c6d 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -2132,7 +2132,6 @@ yield page.toggleTalkPage() -@deprecated('LiveRCPageGenerator or EventStreams', since='20180415') def RepeatingGenerator(generator: Callable, # type: ignore[type-arg] key_func: Callable[[Any], Any] = lambda x: x, sleep_duration: int = 60, diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index df6af2d..31d0f0f 100644 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -408,14 +408,13 @@ def test_RepeatingGenerator(self): """Test RepeatingGenerator.""" - with suppress_warnings(category=FutureWarning): - gen = pagegenerators.RepeatingGenerator( - self.site.recentchanges, - key_func=lambda x: x['revid'], - sleep_duration=10, - reverse=True, - namespaces=[0], - total=self.length) + gen = pagegenerators.RepeatingGenerator( + self.site.recentchanges, + key_func=lambda x: x['revid'], + sleep_duration=10, + reverse=True, + namespaces=[0], + total=self.length) items = list(gen) self.assertLength(items, self.length) timestamps = [pywikibot.Timestamp.fromISOformat(item['timestamp']) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/758044 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: I1359202f53c81955b2b95fd9b064e196848a026b Gerrit-Change-Number: 758044 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [scripts] recover data_ingestion.py
by jenkins-bot (Code Review) 02 Feb '22

02 Feb '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/757889 ) Change subject: [scripts] recover data_ingestion.py ...................................................................... [scripts] recover data_ingestion.py NOTE: There might be an unsolved issue as this script was ported from compat: neither bot._contents nor bot_retrieved is used and probably Photo.download_photo isn't used for the upload and the UploadRobot uses it's own read_file_content() method instead of this. Change-Id: I46cd52d389757053007257a01f6e726e1479b3c1 --- M docs/scripts/scripts.rst M scripts/README.rst R scripts/data_ingestion.py M tests/__init__.py R tests/data_ingestion_tests.py 5 files changed, 82 insertions(+), 76 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/scripts/scripts.rst b/docs/scripts/scripts.rst index 1787469..ecde314 100644 --- a/docs/scripts/scripts.rst +++ b/docs/scripts/scripts.rst @@ -83,6 +83,11 @@ .. automodule:: scripts.cosmetic_changes +data\_ingestion script +---------------------- + +.. automodule:: scripts.data_ingestion + delete script ------------- diff --git a/scripts/README.rst b/scripts/README.rst index 8c417a8..2e6e489 100644 --- a/scripts/README.rst +++ b/scripts/README.rst @@ -54,6 +54,8 @@ | cosmetic_changes.py | Can do slight modifications to a wiki page source code | | | such that the code looks cleaner. | +------------------------+---------------------------------------------------------+ + | data_ingestion.py | A generic bot to do batch uploading to Commons. | + +------------------------+---------------------------------------------------------+ | delete.py | This script can be used to delete pages en masse. | +------------------------+---------------------------------------------------------+ | djvutext.py | Extracts OCR text from djvu files and uploads onto | @@ -168,8 +170,6 @@ +------------------------+---------------------------------------------------------+ | create_categories.py | Program to batch create categories. | +------------------------+---------------------------------------------------------+ - | data_ingestion.py | A generic bot to do batch uploading to Commons. | - +------------------------+---------------------------------------------------------+ | disambredir.py | Changing redirect names in disambiguation pages. | +------------------------+---------------------------------------------------------+ | editarticle.py | Edit a Wikipedia article with your favourite editor. | diff --git a/scripts/archive/data_ingestion.py b/scripts/data_ingestion.py similarity index 75% rename from scripts/archive/data_ingestion.py rename to scripts/data_ingestion.py index 2516881..40109a0 100755 --- a/scripts/archive/data_ingestion.py +++ b/scripts/data_ingestion.py @@ -93,7 +93,7 @@ """ # -# (C) Pywikibot team, 2012-2021 +# (C) Pywikibot team, 2012-2022 # # Distributed under the terms of the MIT license. # @@ -104,10 +104,13 @@ import io import os import posixpath + +from typing import Any, BinaryIO, Optional from urllib.parse import urlparse import pywikibot from pywikibot import pagegenerators +from pywikibot.backports import Dict, List from pywikibot.comms.http import fetch from pywikibot.exceptions import NoPageError from pywikibot.specialbots import UploadRobot @@ -117,45 +120,43 @@ """Represents a Photo (or other file), with metadata, to be uploaded.""" - def __init__(self, URL: str, metadata: dict, site=None): + def __init__(self, url: str, metadata: Dict[str, Any], + site: Optional[pywikibot.site.APISite] = None): """ Initializer. - :param URL: URL of photo + :param url: URL of photo :param metadata: metadata about the photo that can be referred to from the title & template :param site: target site - :type site: pywikibot.site.APISite - """ - self.URL = URL + self.URL = url self.metadata = metadata - self.metadata['_url'] = URL + self.metadata['_url'] = url self.metadata['_filename'] = filename = posixpath.split( - urlparse(URL)[2])[1] - self.metadata['_ext'] = ext = filename.split('.')[-1] - if ext == filename: - self.metadata['_ext'] = None + urlparse(url)[2])[1] + ext = filename.split('.')[-1] + self.metadata['_ext'] = None if ext == filename else ext self.contents = None if not site: - site = pywikibot.Site('commons', 'commons') + site = pywikibot.Site('commons:commons') # default title - super().__init__(site, self.getTitle('%(_filename)s.%(_ext)s')) + super().__init__(site, self.get_title('%(_filename)s.%(_ext)s')) - def downloadPhoto(self): + def download_photo(self) -> BinaryIO: """ Download the photo and store it in an io.BytesIO object. TODO: Add exception handling """ if not self.contents: - imageFile = fetch(self.URL).content - self.contents = io.BytesIO(imageFile) + image_file = fetch(self.URL).content + self.contents = io.BytesIO(image_file) return self.contents - def findDuplicateImages(self): + def find_duplicate_images(self) -> List[str]: """ Find duplicates of the photo. @@ -164,13 +165,13 @@ TODO: Add exception handling, fix site thing """ - hashObject = hashlib.sha1() - hashObject.update(self.downloadPhoto().getvalue()) - return [page.title(with_ns=False) for page in - self.site.allimages( - sha1=base64.b16encode(hashObject.digest()))] + hash_object = hashlib.sha1() + hash_object.update(self.download_photo().getvalue()) + return [page.title(with_ns=False) + for page in self.site.allimages( + sha1=base64.b16encode(hash_object.digest()))] - def getTitle(self, fmt: str) -> str: + def get_title(self, fmt: str) -> str: """ Populate format string with %(name)s entries using metadata. @@ -183,7 +184,8 @@ # FIXME: normalise the title so it is usable as a MediaWiki title. return fmt % self.metadata - def getDescription(self, template, extraparams=None): + def get_description(self, template, + extraparams: Optional[Dict[str, str]] = None) -> str: """Generate a description for a file.""" params = {} params.update(self.metadata) @@ -192,18 +194,18 @@ for key in sorted(params.keys()): value = params[key] if not key.startswith('_'): - description += ('|{}={}\n'.format( - key, self._safeTemplateValue(value))) + description += '|{}={}\n'.format( + key, self._safe_template_value(value)) description += '}}' return description - def _safeTemplateValue(self, value): + def _safe_template_value(self, value: str) -> str: """Replace pipe (|) with {{!}}.""" return value.replace('|', '{{!}}') -def CSVReader(fileobj, urlcolumn, site=None, *args, **kwargs): +def CSVReader(fileobj, urlcolumn, site=None, *args, **kwargs): # noqa: N802 """Yield Photo objects for each row of a CSV file.""" reader = csv.DictReader(fileobj, *args, **kwargs) for line in reader: @@ -218,52 +220,45 @@ """ Initializer. - :param reader: Generator of Photos to process. - :type reader: Photo page generator :param titlefmt: Title format :param pagefmt: Page format """ super().__init__(**kwargs) - self.titlefmt = titlefmt self.pagefmt = pagefmt - def treat(self, photo): - """ - Process each page. + def treat(self, page): + """Process each page. 1. Check for existing duplicates on the wiki specified in self.site. 2. If duplicates are found, then skip uploading. 3. Download the file from photo.URL and upload the file to self.site. """ - duplicates = photo.findDuplicateImages() + duplicates = page.find_duplicate_images() if duplicates: - pywikibot.output('Skipping duplicate of {!r}' - .format(duplicates)) - return duplicates[0] + pywikibot.output('Skipping duplicate of {!r}'.format(duplicates)) + return - title = photo.getTitle(self.titlefmt) - description = photo.getDescription(self.pagefmt) + title = page.get_title(self.titlefmt) + description = page.get_description(self.pagefmt) - bot = UploadRobot(url=photo.URL, + bot = UploadRobot(url=page.URL, description=description, use_filename=title, keep_filename=True, verify_description=False, target_site=self.site) - bot._contents = photo.downloadPhoto().getvalue() + bot._contents = page.download_photo().getvalue() bot._retrieved = True bot.run() - return title - @classmethod - def parseConfigurationPage(cls, configurationPage): + def parse_configuration_page(cls, configuration_page) -> Dict[str, str]: """ Parse a Page which contains the configuration. - :param configurationPage: page with configuration - :type configurationPage: :py:obj:`pywikibot.Page` + :param configuration_page: page with configuration + :type configuration_page: :py:obj:`pywikibot.Page` """ configuration = {} # Set a bunch of defaults @@ -271,7 +266,7 @@ configuration['csvDelimiter'] = ';' configuration['csvEncoding'] = 'Windows-1252' # FIXME: Encoding hell - templates = configurationPage.templatesWithParams() + templates = configuration_page.templatesWithParams() for (template, params) in templates: if template.title(with_ns=False) == 'Data ingestion': for param in params: @@ -295,26 +290,30 @@ :param args: command line arguments """ - # Process global args and prepare generator args parser - local_args = pywikibot.handle_args(args) + csv_dir = None + unknown = [] # This factory is responsible for processing command line arguments # that are also used by other scripts and that determine on which pages # to work on. - genFactory = pagegenerators.GeneratorFactory() - csv_dir = None + gen_factory = pagegenerators.GeneratorFactory() + # Process global args and prepare generator args parser + local_args = pywikibot.handle_args(args) + local_args = gen_factory.handle_args(local_args) for arg in local_args: - if arg.startswith('-csvdir:'): - csv_dir = arg[8:] + opt, _, value = arg.partition(':') + if opt == '-csvdir:': + csv_dir = value else: - genFactory.handle_arg(arg) + unknown.append(arg) - config_generator = genFactory.getCombinedGenerator() + config_generator = gen_factory.getCombinedGenerator() if pywikibot.bot.suggest_help( - missing_parameters=[] if csv_dir else ['-csvdir'], - missing_generator=not config_generator): + missing_parameters=None if csv_dir else ['-csvdir'], + missing_generator=not config_generator, + unknown_parameters=unknown): return for config_page in config_generator: @@ -324,7 +323,7 @@ pywikibot.error('{} does not exist'.format(config_page)) continue - configuration = DataIngestionBot.parseConfigurationPage(config_page) + configuration = DataIngestionBot.parse_configuration_page(config_page) filename = os.path.join(csv_dir, configuration['csvFile']) try: diff --git a/tests/__init__.py b/tests/__init__.py index a29fdff..b54e2c2 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -149,6 +149,7 @@ 'cache', 'category_bot', 'checkimages', + 'data_ingestion', 'deletionbot', 'fixing_redirects', 'generate_family_file', diff --git a/tests/archive/data_ingestion_tests.py b/tests/data_ingestion_tests.py similarity index 82% rename from tests/archive/data_ingestion_tests.py rename to tests/data_ingestion_tests.py index 7693619..ee19246 100644 --- a/tests/archive/data_ingestion_tests.py +++ b/tests/data_ingestion_tests.py @@ -1,13 +1,14 @@ #!/usr/bin/python3 """Unit tests for data_ingestion.py script.""" # -# (C) Pywikibot team, 2012-2021 +# (C) Pywikibot team, 2012-2022 # # Distributed under the terms of the MIT license. # import unittest from scripts import data_ingestion + from tests import join_data_path, join_images_path from tests.aspects import ScriptMainTestCase, TestCase from tests.utils import empty_sites @@ -35,7 +36,7 @@ meta_url = 'http://commons.wikimedia.org/wiki/File:Sound-icon.svg' self.obj = data_ingestion.Photo( - URL=url, + url=url, metadata={'description.en': '"Sounds" icon', 'source': meta_url, 'author': 'KDE artists | Silstor', @@ -44,25 +45,25 @@ 'name': 'Sound icon'}, site=self.get_site('commons')) - def test_downloadPhoto(self): + def test_download_photo(self): """Test download from http://upload.wikimedia.org/.""" with open(join_images_path('MP_sounds.png'), 'rb') as f: - self.assertEqual(f.read(), self.obj.downloadPhoto().read()) + self.assertEqual(f.read(), self.obj.download_photo().read()) - def test_findDuplicateImages(self): + def test_find_duplicate_images(self): """Test finding duplicates on Wikimedia Commons.""" - duplicates = self.obj.findDuplicateImages() + duplicates = self.obj.find_duplicate_images() self.assertIn('MP sounds.png', [dup.replace('_', ' ') for dup in duplicates]) - def test_getTitle(self): + def test_get_title(self): """Test getTitle().""" - self.assertEqual(self.obj.getTitle('%(name)s - %(set)s.%(_ext)s'), + self.assertEqual(self.obj.get_title('%(name)s - %(set)s.%(_ext)s'), 'Sound icon - Crystal SVG icon set.png') - def test_getDescription(self): + def test_get_description(self): """Test getDescription().""" - self.assertEqual(self.obj.getDescription('CrystalTemplate'), + self.assertEqual(self.obj.get_description('CrystalTemplate'), str("""{{CrystalTemplate |author=KDE artists {{!}} Silstor |description.en="Sounds" icon @@ -88,20 +89,20 @@ site=self.get_site()) self.obj = next(self.iterator) - def test_PhotoURL(self): + def test_photo_url(self): """Test PhotoURL().""" self.assertEqual( self.obj.URL, 'http://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png') - def test_getTitle(self): + def test_get_title(self): """Test getTitle().""" - self.assertEqual(self.obj.getTitle('%(name)s - %(set)s.%(_ext)s'), + self.assertEqual(self.obj.get_title('%(name)s - %(set)s.%(_ext)s'), 'Sound icon - Crystal SVG icon set.png') - def test_getDescription(self): + def test_get_description(self): """Test getDescription().""" - self.assertEqual(self.obj.getDescription('CrystalTemplate'), + self.assertEqual(self.obj.get_description('CrystalTemplate'), str("""{{CrystalTemplate |author=KDE artists {{!}} Silstor |description.en="Sounds" icon -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/757889 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: I46cd52d389757053007257a01f6e726e1479b3c1 Gerrit-Change-Number: 757889 Gerrit-PatchSet: 4 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

1 0

[Gerrit] ...core[master]: [ui] solve to many return statements
by jenkins-bot (Code Review) 01 Feb '22

01 Feb '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/758944 ) Change subject: [ui] solve to many return statements ...................................................................... [ui] solve to many return statements also fill line length in _trans dict Change-Id: I35c076832cfa46d8cb0688524190f8e94f2e6721 --- M pywikibot/userinterfaces/transliteration.py 1 file changed, 81 insertions(+), 85 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/userinterfaces/transliteration.py b/pywikibot/userinterfaces/transliteration.py index 77e94e5..387acc8 100644 --- a/pywikibot/userinterfaces/transliteration.py +++ b/pywikibot/userinterfaces/transliteration.py @@ -1,6 +1,6 @@ """Module to transliterate text.""" # -# (C) Pywikibot team, 2006-2020 +# (C) Pywikibot team, 2006-2022 # # Distributed under the terms of the MIT license. # @@ -31,81 +31,78 @@ 'Ƒ': 'F', 'ḟ': 'f', 'ƒ': 'f', 'Ǵ': 'G', 'Ḡ': 'G', 'Ğ': 'G', 'Ġ': 'G', 'Ģ': 'G', 'Ǧ': 'G', 'Ǥ': 'G', 'Ɠ': 'G', 'ǵ': 'g', 'ḡ': 'g', 'ğ': 'g', 'ġ': 'g', 'ģ': 'g', 'ǧ': 'g', 'ǥ': 'g', 'ɠ': 'g', 'Ĝ': 'Gx', 'ĝ': 'gx', - 'Ḣ': 'H', 'Ḥ': 'H', 'Ḧ': 'H', 'Ȟ': 'H', 'Ḩ': 'H', 'Ḫ': 'H', - '̱': 'h', 'Ħ': 'H', 'ḣ': 'h', 'ḥ': 'h', 'ḧ': 'h', 'ȟ': 'h', - 'ḩ': 'h', 'ḫ': 'h', 'ẖ': 'h', 'ħ': 'h', 'I': 'I', 'Ì': 'I', - 'Ȉ': 'I', 'Í': 'I', 'Î': 'I', 'Ĩ': 'I', 'Ḭ': 'I', 'Ï': 'I', 'Ḯ': 'I', - 'Ī': 'I', 'Ĭ': 'I', 'Ȋ': 'I', 'Į': 'I', 'Ǐ': 'I', 'İ': 'I', 'Ị': 'I', - 'Ỉ': 'I', 'Ɨ': 'I', 'ı': 'i', 'ì': 'i', 'ȉ': 'i', 'í': 'i', 'î': 'i', - 'ĩ': 'i', 'ḭ': 'i', 'ï': 'i', 'ḯ': 'i', 'ī': 'i', 'ĭ': 'i', 'ȋ': 'i', - 'į': 'i', 'ǐ': 'i', 'i': 'i', 'ị': 'i', 'ỉ': 'i', 'ɨ': 'i', 'Ĵ': 'J', - 'J': 'J', 'ɟ': 'j', 'ĵ': 'j', '̌': 'j', 'ǰ': 'j', 'Ḱ': 'K', 'Ǩ': 'K', - 'Ķ': 'K', 'Ḳ': 'K', 'Ḵ': 'K', 'Ƙ': 'K', 'ḱ': 'k', 'ǩ': 'k', 'ķ': 'k', - 'ḳ': 'k', 'ḵ': 'k', 'ƙ': 'k', 'Ĺ': 'L', 'Ļ': 'L', 'Ľ': 'L', 'Ḷ': 'L', - 'Ḹ': 'L', 'Ḻ': 'L', 'Ḽ': 'L', 'Ƚ': 'L', 'Ł': 'L', 'ĺ': 'l', 'ļ': 'l', - 'ľ': 'l', 'ḷ': 'l', 'ḹ': 'l', 'ḻ': 'l', 'ḽ': 'l', 'ƚ': 'l', 'ł': 'l', - 'ɫ': 'l', 'Ḿ': 'M', 'Ṁ': 'M', 'Ṃ': 'M', 'ḿ': 'm', 'ṁ': 'm', 'ṃ': 'm', - 'ɱ': 'm', 'Ǹ': 'N', 'Ń': 'N', 'Ñ': 'N', 'Ņ': 'N', 'Ň': 'N', 'Ṅ': 'N', - 'Ṇ': 'N', 'Ṉ': 'N', 'Ṋ': 'N', 'Ɲ': 'N', 'ɲ': 'n', 'Ƞ': 'N', - 'ǹ': 'n', 'ń': 'n', 'ñ': 'n', 'ņ': 'n', 'ň': 'n', 'ṅ': 'n', 'ṇ': 'n', - 'ṉ': 'n', 'ṋ': 'n', 'ƞ': 'n', 'Ò': 'O', 'Ó': 'O', 'Ô': 'O', - 'Õ': 'O', 'Ṍ': 'O', 'Ṏ': 'O', 'Ȭ': 'O', 'Ö': 'O', 'Ō': 'O', 'Ṑ': 'O', - 'Ṓ': 'O', 'Ŏ': 'O', 'Ǒ': 'O', 'Ȯ': 'O', 'Ȱ': 'O', 'Ọ': 'O', 'Ǫ': 'O', - 'Ǭ': 'O', 'Ơ': 'O', 'Ờ': 'O', 'Ớ': 'O', 'Ỡ': 'O', 'Ợ': 'O', 'Ở': 'O', - 'Ỏ': 'O', 'Ɵ': 'O', 'Ø': 'O', 'Ǿ': 'O', 'ò': 'o', 'ó': 'o', 'ô': 'o', - 'õ': 'o', 'ṍ': 'o', 'ṏ': 'o', 'ȭ': 'o', 'ö': 'o', 'ō': 'o', 'ṑ': 'o', - 'ṓ': 'o', 'ŏ': 'o', 'ǒ': 'o', 'ȯ': 'o', 'ȱ': 'o', 'ọ': 'o', 'ǫ': 'o', - 'ǭ': 'o', 'ơ': 'o', 'ờ': 'o', 'ớ': 'o', 'ỡ': 'o', 'ợ': 'o', 'ở': 'o', - 'ỏ': 'o', 'ɵ': 'o', 'ø': 'o', 'ǿ': 'o', 'Ȍ': 'Ö', 'Ő': 'Ö', 'Ȫ': 'Ö', - 'ȍ': 'ö', 'ő': 'ö', 'ȫ': 'ö', 'Ồ': 'Ô', 'Ố': 'Ô', 'Ỗ': 'Ô', 'Ộ': 'Ô', - 'Ổ': 'Ô', 'Ȏ': 'Ô', 'ồ': 'ô', 'ố': 'ô', 'ỗ': 'ô', 'ộ': 'ô', 'ổ': 'ô', - 'ȏ': 'ô', 'Ṕ': 'P', 'Ṗ': 'P', 'Ƥ': 'P', 'ṕ': 'p', 'ṗ': 'p', 'ƥ': 'p', - 'ᵽ': 'q', 'Ȑ': 'R', 'Ŕ': 'R', 'Ŗ': 'R', 'Ř': 'R', 'Ȓ': 'R', 'Ṙ': 'R', - 'Ṛ': 'R', 'Ṝ': 'R', 'Ṟ': 'R', 'ȑ': 'r', 'ŕ': 'r', 'ŗ': 'r', 'ř': 'r', - 'ȓ': 'r', 'ṙ': 'r', 'ṛ': 'r', 'ṝ': 'r', 'ṟ': 'r', 'ɽ': 'r', 'Ś': 'S', - 'Ṥ': 'S', 'Ş': 'S', 'Ș': 'S', 'Š': 'S', 'Ṧ': 'S', 'Ṡ': 'S', 'Ṣ': 'S', - 'Ṩ': 'S', 'ś': 's', 'ṥ': 's', 'ş': 's', 'ș': 's', 'š': 's', 'ṧ': 's', - 'ṡ': 's', 'ṣ': 's', 'ṩ': 's', 'ȿ': 's', 'Ŝ': 'Sx', 'ŝ': 'sx', 'Ţ': 'T', - 'Ț': 'T', 'Ť': 'T', 'Ṫ': 'T', 'Ṭ': 'T', 'Ṯ': 'T', 'Ṱ': 'T', 'Ŧ': 'T', - 'Ƭ': 'T', 'Ʈ': 'T', 'ţ': 't', 'ț': 't', 'ť': 't', 'ṫ': 't', 'ṭ': 't', - 'ṯ': 't', 'ṱ': 't', 'ŧ': 't', 'Ⱦ': 't', 'ƭ': 't', 'ʈ': 't', 'Ù': 'U', - 'Ú': 'U', 'Ũ': 'U', 'Ṹ': 'U', 'Ṵ': 'U', 'Ü': 'U', 'Ṳ': 'U', 'Ū': 'U', - 'Ṻ': 'U', 'Ŭ': 'U', 'Ụ': 'U', 'Ů': 'U', 'Ų': 'U', 'Ǔ': 'U', 'Ṷ': 'U', - 'Ủ': 'U', 'Ư': 'U', 'Ữ': 'U', 'Ự': 'U', 'Ử': 'U', 'ù': 'u', 'ú': 'u', - 'ũ': 'u', 'ṹ': 'u', 'ṵ': 'u', 'ü': 'u', 'ṳ': 'u', 'ū': 'u', 'ṻ': 'u', - 'ŭ': 'u', 'ụ': 'u', 'ů': 'u', 'ų': 'u', 'ǔ': 'u', 'ṷ': 'u', 'ủ': 'u', - 'ư': 'u', 'ữ': 'u', 'ự': 'u', 'ử': 'u', 'Ȕ': 'Ü', 'Ű': 'Ü', - 'Ǜ': 'Ü', 'Ǘ': 'Ü', 'Ǖ': 'Ü', 'Ǚ': 'Ü', 'ȕ': 'ü', 'ű': 'ü', 'ǜ': 'ü', - 'ǘ': 'ü', 'ǖ': 'ü', 'ǚ': 'ü', 'Û': 'Ux', 'û': 'ux', 'Ȗ': 'Û', 'ȗ': 'û', - 'Ừ': 'Ù', 'ừ': 'ù', 'Ứ': 'Ú', 'ứ': 'ú', 'Ṽ': 'V', 'Ṿ': 'V', 'ṽ': 'v', - 'ṿ': 'v', 'Ẁ': 'W', 'Ẃ': 'W', 'Ŵ': 'W', 'Ẅ': 'W', 'Ẇ': 'W', 'Ẉ': 'W', - 'ẁ': 'w', 'ẃ': 'w', 'ŵ': 'w', 'ẅ': 'w', 'ẇ': 'w', 'ẉ': 'w', 'Ẋ': 'X', - 'Ẍ': 'X', 'ẋ': 'x', 'ẍ': 'x', 'Ỳ': 'Y', 'Ý': 'Y', 'Ŷ': 'Y', 'Ÿ': 'Y', - 'Ỹ': 'Y', 'Ȳ': 'Y', 'Ẏ': 'Y', 'Ỵ': 'Y', 'Ỷ': 'Y', 'Ƴ': 'Y', 'ỳ': 'y', - 'ý': 'y', 'ŷ': 'y', 'ÿ': 'y', 'ỹ': 'y', 'ȳ': 'y', 'ẏ': 'y', 'ỵ': 'y', - 'ỷ': 'y', 'ƴ': 'y', 'Ź': 'Z', 'Ẑ': 'Z', 'Ż': 'Z', 'Ẓ': 'Z', 'Ž': 'Z', - 'Ẕ': 'Z', 'Ƶ': 'Z', 'Ȥ': 'Z', 'ź': 'z', 'ẑ': 'z', 'ż': 'z', 'ẓ': 'z', - 'ž': 'z', 'ẕ': 'z', 'ƶ': 'z', 'ȥ': 'z', 'ɀ': 'zv', + 'Ḣ': 'H', 'Ḥ': 'H', 'Ḧ': 'H', 'Ȟ': 'H', 'Ḩ': 'H', 'Ḫ': 'H', '̱': 'h', + 'Ħ': 'H', 'ḣ': 'h', 'ḥ': 'h', 'ḧ': 'h', 'ȟ': 'h', 'ḩ': 'h', 'ḫ': 'h', + 'ẖ': 'h', 'ħ': 'h', 'I': 'I', 'Ì': 'I', 'Ȉ': 'I', 'Í': 'I', 'Î': 'I', + 'Ĩ': 'I', 'Ḭ': 'I', 'Ï': 'I', 'Ḯ': 'I', 'Ī': 'I', 'Ĭ': 'I', 'Ȋ': 'I', + 'Į': 'I', 'Ǐ': 'I', 'İ': 'I', 'Ị': 'I', 'Ỉ': 'I', 'Ɨ': 'I', 'ı': 'i', + 'ì': 'i', 'ȉ': 'i', 'í': 'i', 'î': 'i', 'ĩ': 'i', 'ḭ': 'i', 'ï': 'i', + 'ḯ': 'i', 'ī': 'i', 'ĭ': 'i', 'ȋ': 'i', 'į': 'i', 'ǐ': 'i', 'i': 'i', + 'ị': 'i', 'ỉ': 'i', 'ɨ': 'i', 'Ĵ': 'J', 'J': 'J', 'ɟ': 'j', 'ĵ': 'j', + '̌': 'j', 'ǰ': 'j', 'Ḱ': 'K', 'Ǩ': 'K', 'Ķ': 'K', 'Ḳ': 'K', 'Ḵ': 'K', + 'Ƙ': 'K', 'ḱ': 'k', 'ǩ': 'k', 'ķ': 'k', 'ḳ': 'k', 'ḵ': 'k', 'ƙ': 'k', + 'Ĺ': 'L', 'Ļ': 'L', 'Ľ': 'L', 'Ḷ': 'L', 'Ḹ': 'L', 'Ḻ': 'L', 'Ḽ': 'L', + 'Ƚ': 'L', 'Ł': 'L', 'ĺ': 'l', 'ļ': 'l', 'ľ': 'l', 'ḷ': 'l', 'ḹ': 'l', + 'ḻ': 'l', 'ḽ': 'l', 'ƚ': 'l', 'ł': 'l', 'ɫ': 'l', 'Ḿ': 'M', 'Ṁ': 'M', + 'Ṃ': 'M', 'ḿ': 'm', 'ṁ': 'm', 'ṃ': 'm', 'ɱ': 'm', 'Ǹ': 'N', 'Ń': 'N', + 'Ñ': 'N', 'Ņ': 'N', 'Ň': 'N', 'Ṅ': 'N', 'Ṇ': 'N', 'Ṉ': 'N', 'Ṋ': 'N', + 'Ɲ': 'N', 'ɲ': 'n', 'Ƞ': 'N', 'ǹ': 'n', 'ń': 'n', 'ñ': 'n', 'ņ': 'n', + 'ň': 'n', 'ṅ': 'n', 'ṇ': 'n', 'ṉ': 'n', 'ṋ': 'n', 'ƞ': 'n', 'Ò': 'O', + 'Ó': 'O', 'Ô': 'O', 'Õ': 'O', 'Ṍ': 'O', 'Ṏ': 'O', 'Ȭ': 'O', 'Ö': 'O', + 'Ō': 'O', 'Ṑ': 'O', 'Ṓ': 'O', 'Ŏ': 'O', 'Ǒ': 'O', 'Ȯ': 'O', 'Ȱ': 'O', + 'Ọ': 'O', 'Ǫ': 'O', 'Ǭ': 'O', 'Ơ': 'O', 'Ờ': 'O', 'Ớ': 'O', 'Ỡ': 'O', + 'Ợ': 'O', 'Ở': 'O', 'Ỏ': 'O', 'Ɵ': 'O', 'Ø': 'O', 'Ǿ': 'O', 'ò': 'o', + 'ó': 'o', 'ô': 'o', 'õ': 'o', 'ṍ': 'o', 'ṏ': 'o', 'ȭ': 'o', 'ö': 'o', + 'ō': 'o', 'ṑ': 'o', 'ṓ': 'o', 'ŏ': 'o', 'ǒ': 'o', 'ȯ': 'o', 'ȱ': 'o', + 'ọ': 'o', 'ǫ': 'o', 'ǭ': 'o', 'ơ': 'o', 'ờ': 'o', 'ớ': 'o', 'ỡ': 'o', + 'ợ': 'o', 'ở': 'o', 'ỏ': 'o', 'ɵ': 'o', 'ø': 'o', 'ǿ': 'o', 'Ȍ': 'Ö', + 'Ő': 'Ö', 'Ȫ': 'Ö', 'ȍ': 'ö', 'ő': 'ö', 'ȫ': 'ö', 'Ồ': 'Ô', 'Ố': 'Ô', + 'Ỗ': 'Ô', 'Ộ': 'Ô', 'Ổ': 'Ô', 'Ȏ': 'Ô', 'ồ': 'ô', 'ố': 'ô', 'ỗ': 'ô', + 'ộ': 'ô', 'ổ': 'ô', 'ȏ': 'ô', 'Ṕ': 'P', 'Ṗ': 'P', 'Ƥ': 'P', 'ṕ': 'p', + 'ṗ': 'p', 'ƥ': 'p', 'ᵽ': 'q', 'Ȑ': 'R', 'Ŕ': 'R', 'Ŗ': 'R', 'Ř': 'R', + 'Ȓ': 'R', 'Ṙ': 'R', 'Ṛ': 'R', 'Ṝ': 'R', 'Ṟ': 'R', 'ȑ': 'r', 'ŕ': 'r', + 'ŗ': 'r', 'ř': 'r', 'ȓ': 'r', 'ṙ': 'r', 'ṛ': 'r', 'ṝ': 'r', 'ṟ': 'r', + 'ɽ': 'r', 'Ś': 'S', 'Ṥ': 'S', 'Ş': 'S', 'Ș': 'S', 'Š': 'S', 'Ṧ': 'S', + 'Ṡ': 'S', 'Ṣ': 'S', 'Ṩ': 'S', 'ś': 's', 'ṥ': 's', 'ş': 's', 'ș': 's', + 'š': 's', 'ṧ': 's', 'ṡ': 's', 'ṣ': 's', 'ṩ': 's', 'ȿ': 's', 'Ŝ': 'Sx', + 'ŝ': 'sx', 'Ţ': 'T', 'Ț': 'T', 'Ť': 'T', 'Ṫ': 'T', 'Ṭ': 'T', 'Ṯ': 'T', + 'Ṱ': 'T', 'Ŧ': 'T', 'Ƭ': 'T', 'Ʈ': 'T', 'ţ': 't', 'ț': 't', 'ť': 't', + 'ṫ': 't', 'ṭ': 't', 'ṯ': 't', 'ṱ': 't', 'ŧ': 't', 'Ⱦ': 't', 'ƭ': 't', + 'ʈ': 't', 'Ù': 'U', 'Ú': 'U', 'Ũ': 'U', 'Ṹ': 'U', 'Ṵ': 'U', 'Ü': 'U', + 'Ṳ': 'U', 'Ū': 'U', 'Ṻ': 'U', 'Ŭ': 'U', 'Ụ': 'U', 'Ů': 'U', 'Ų': 'U', + 'Ǔ': 'U', 'Ṷ': 'U', 'Ủ': 'U', 'Ư': 'U', 'Ữ': 'U', 'Ự': 'U', 'Ử': 'U', + 'ù': 'u', 'ú': 'u', 'ũ': 'u', 'ṹ': 'u', 'ṵ': 'u', 'ü': 'u', 'ṳ': 'u', + 'ū': 'u', 'ṻ': 'u', 'ŭ': 'u', 'ụ': 'u', 'ů': 'u', 'ų': 'u', 'ǔ': 'u', + 'ṷ': 'u', 'ủ': 'u', 'ư': 'u', 'ữ': 'u', 'ự': 'u', 'ử': 'u', 'Ȕ': 'Ü', + 'Ű': 'Ü', 'Ǜ': 'Ü', 'Ǘ': 'Ü', 'Ǖ': 'Ü', 'Ǚ': 'Ü', 'ȕ': 'ü', 'ű': 'ü', + 'ǜ': 'ü', 'ǘ': 'ü', 'ǖ': 'ü', 'ǚ': 'ü', 'Û': 'Ux', 'û': 'ux', 'Ȗ': 'Û', + 'ȗ': 'û', 'Ừ': 'Ù', 'ừ': 'ù', 'Ứ': 'Ú', 'ứ': 'ú', 'Ṽ': 'V', 'Ṿ': 'V', + 'ṽ': 'v', 'ṿ': 'v', 'Ẁ': 'W', 'Ẃ': 'W', 'Ŵ': 'W', 'Ẅ': 'W', 'Ẇ': 'W', + 'Ẉ': 'W', 'ẁ': 'w', 'ẃ': 'w', 'ŵ': 'w', 'ẅ': 'w', 'ẇ': 'w', 'ẉ': 'w', + 'Ẋ': 'X', 'Ẍ': 'X', 'ẋ': 'x', 'ẍ': 'x', 'Ỳ': 'Y', 'Ý': 'Y', 'Ŷ': 'Y', + 'Ÿ': 'Y', 'Ỹ': 'Y', 'Ȳ': 'Y', 'Ẏ': 'Y', 'Ỵ': 'Y', 'Ỷ': 'Y', 'Ƴ': 'Y', + 'ỳ': 'y', 'ý': 'y', 'ŷ': 'y', 'ÿ': 'y', 'ỹ': 'y', 'ȳ': 'y', 'ẏ': 'y', + 'ỵ': 'y', 'ỷ': 'y', 'ƴ': 'y', 'Ź': 'Z', 'Ẑ': 'Z', 'Ż': 'Z', 'Ẓ': 'Z', + 'Ž': 'Z', 'Ẕ': 'Z', 'Ƶ': 'Z', 'Ȥ': 'Z', 'ź': 'z', 'ẑ': 'z', 'ż': 'z', + 'ẓ': 'z', 'ž': 'z', 'ẕ': 'z', 'ƶ': 'z', 'ȥ': 'z', 'ɀ': 'zv', # Latin: extended Latin alphabet - 'ɑ': 'a', 'Æ': 'AE', 'Ǽ': 'AE', 'Ǣ': 'AE', 'æ': 'ae', 'ǽ': 'ae', - 'ǣ': 'ae', 'Ǝ': 'E', 'Ə': 'E', 'Ɛ': 'E', 'ǝ': 'e', - 'ə': 'e', 'ɛ': 'e', 'Ɣ': 'G', 'Ƣ': 'G', 'ᵷ': 'g', 'ɣ': 'g', 'ƣ': 'g', - 'ᵹ': 'g', 'Ƅ': 'H', 'ƅ': 'h', 'Ƕ': 'Wh', 'ƕ': 'wh', 'Ɩ': 'I', 'ɩ': 'i', - 'Ŋ': 'Ng', 'ŋ': 'ng', 'Œ': 'OE', 'œ': 'oe', 'Ɔ': 'O', 'ɔ': 'o', - 'Ȣ': 'Ou', 'ȣ': 'ou', 'Ƽ': 'Q', 'ĸ': 'q', 'ƽ': 'q', 'ȹ': 'qp', - '\uf20e': 'r', 'ſ': 's', 'ß': 'ss', 'Ʃ': 'Sh', 'ʃ': 'sh', 'ᶋ': 'sh', - 'Ʉ': 'U', 'ʉ': 'u', 'Ʌ': 'V', 'ʌ': 'v', 'Ɯ': 'W', 'Ƿ': 'W', 'ɯ': 'w', - 'ƿ': 'w', 'Ȝ': 'Y', 'ȝ': 'y', 'Ĳ': 'IJ', 'ĳ': 'ij', 'Ƨ': 'Z', 'ʮ': 'z', - 'ƨ': 'z', 'Ʒ': 'Zh', 'ʒ': 'zh', 'Ǯ': 'Dzh', 'ǯ': 'dzh', 'Ƹ': "'", 'ƹ': "'", - 'ʔ': "'", 'ˀ': "'", 'Ɂ': "'", 'ɂ': "'", 'Þ': 'Th', 'þ': 'th', 'C': '!', - 'ʗ': '!', 'ǃ': '!', + 'ɑ': 'a', 'Æ': 'AE', 'Ǽ': 'AE', 'Ǣ': 'AE', 'æ': 'ae', 'ǽ': 'ae', 'ǣ': 'ae', + 'Ǝ': 'E', 'Ə': 'E', 'Ɛ': 'E', 'ǝ': 'e', 'ə': 'e', 'ɛ': 'e', 'Ɣ': 'G', + 'Ƣ': 'G', 'ᵷ': 'g', 'ɣ': 'g', 'ƣ': 'g', 'ᵹ': 'g', 'Ƅ': 'H', 'ƅ': 'h', + 'Ƕ': 'Wh', 'ƕ': 'wh', 'Ɩ': 'I', 'ɩ': 'i', 'Ŋ': 'Ng', 'ŋ': 'ng', 'Œ': 'OE', + 'œ': 'oe', 'Ɔ': 'O', 'ɔ': 'o', 'Ȣ': 'Ou', 'ȣ': 'ou', 'Ƽ': 'Q', 'ĸ': 'q', + 'ƽ': 'q', 'ȹ': 'qp', '\uf20e': 'r', 'ſ': 's', 'ß': 'ss', 'Ʃ': 'Sh', + 'ʃ': 'sh', 'ᶋ': 'sh', 'Ʉ': 'U', 'ʉ': 'u', 'Ʌ': 'V', 'ʌ': 'v', 'Ɯ': 'W', + 'Ƿ': 'W', 'ɯ': 'w', 'ƿ': 'w', 'Ȝ': 'Y', 'ȝ': 'y', 'Ĳ': 'IJ', 'ĳ': 'ij', + 'Ƨ': 'Z', 'ʮ': 'z', 'ƨ': 'z', 'Ʒ': 'Zh', 'ʒ': 'zh', 'Ǯ': 'Dzh', 'ǯ': 'dzh', + 'Ƹ': "'", 'ƹ': "'", 'ʔ': "'", 'ˀ': "'", 'Ɂ': "'", 'ɂ': "'", 'Þ': 'Th', + 'þ': 'th', 'C': '!', 'ʗ': '!', 'ǃ': '!', # Punctuation and typography '«': '"', '»': '"', '“': '"', '”': '"', '„': '"', '¨': '"', '‘': "'", - '’': "'", '′': "'", '@': '(at)', '¤': '$', '¢': 'c', '€': 'E', - '£': 'L', '¥': 'yen', '†': '+', '‡': '++', '°': ':', '¡': '!', '¿': '?', - '‰': 'o/oo', '‱': 'o/ooo', '¶': '>', '§': '>', '‒': '-', - '–': '-', '—': '-', '―': '-', '¦': '|', '⁂': '***', '◊': '<>', - '‽': '?!', '¹': '1', '²': '2', '³': '3', + '’': "'", '′': "'", '@': '(at)', '¤': '$', '¢': 'c', '€': 'E', '£': 'L', + '¥': 'yen', '†': '+', '‡': '++', '°': ':', '¡': '!', '¿': '?', '‰': 'o/oo', + '‱': 'o/ooo', '¶': '>', '§': '>', '‒': '-', '–': '-', '—': '-', '―': '-', + '¦': '|', '⁂': '***', '◊': '<>', '‽': '?!', '¹': '1', '²': '2', '³': '3', # Cyrillic 'А': 'A', 'а': 'a', 'Б': 'B', 'б': 'b', 'В': 'V', 'в': 'v', 'Г': 'G', 'г': 'g', 'Д': 'D', 'д': 'd', 'Е': 'E', 'е': 'e', 'Ж': 'Zh', 'ж': 'zh', @@ -1120,19 +1117,18 @@ :param next: The next character :return: The transliterated character which may be an empty string """ + result = default if char in self.trans: - return self.trans[char] + result = self.trans[char] # Arabic - if char == '◌': - return prev + elif char == '◌': + result = prev # Japanese - if char == 'ッ': - return self.transliterate(next)[0] - if char in '々仝ヽヾゝゞ〱〲〳〵〴〵': - return prev + elif char == 'ッ': + result = self.transliterate(next)[0] + elif char in '々仝ヽヾゝゞ〱〲〳〵〴〵': + result = prev # Lao - if char == 'ຫ': - if next in 'ງຍນຣລຼຼວ': - return '' - return 'h' - return default + elif char == 'ຫ': + result = '' if next in 'ງຍນຣລຼຼວ' else 'h' + return result -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/758944 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: I35c076832cfa46d8cb0688524190f8e94f2e6721 Gerrit-Change-Number: 758944 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [test] decrease LOC in page_tests.py
by jenkins-bot (Code Review) 01 Feb '22

01 Feb '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/758936 ) Change subject: [test] decrease LOC in page_tests.py ...................................................................... [test] decrease LOC in page_tests.py - remove unused sections attribute in TestLinkObject which was never used - remove count counter in testReferences and use total parameter instead - combine small lines Change-Id: If63dfd76de1ad561e6e423088e50a732c4df97b5 --- M tests/page_tests.py 1 file changed, 38 insertions(+), 88 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/page_tests.py b/tests/page_tests.py index 330b211..006e603 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -97,12 +97,6 @@ 'Nowy_Sącz': 'Nowy Sącz', 'battle of Węgierska Górka': 'Battle of Węgierska Górka', } - # random bunch of possible section titles - sections = ['', - '#Phase_2', - '#History', - '#later life', - ] def testNamespaces(self): """Test that Link() normalizes namespace names.""" @@ -202,14 +196,11 @@ ns_name = 'Help' if site.namespaces[12][0] != ns_name: ns_name = site.namespaces[12][0] - self.assertEqual(p1.title(), - ns_name + ':Test page#Testing') + self.assertEqual(p1.title(), ns_name + ':Test page#Testing') self.assertEqual(p1.title(underscore=True), ns_name + ':Test_page#Testing') - self.assertEqual(p1.title(with_ns=False), - 'Test page#Testing') - self.assertEqual(p1.title(with_section=False), - ns_name + ':Test page') + self.assertEqual(p1.title(with_ns=False), 'Test page#Testing') + self.assertEqual(p1.title(with_section=False), ns_name + ':Test page') self.assertEqual(p1.title(with_ns=False, with_section=False), 'Test page') self.assertEqual(p1.title(as_url=True), @@ -239,12 +230,10 @@ ns_name = 'File' if site.namespaces[6][0] != ns_name: ns_name = site.namespaces[6][0] - self.assertEqual(p2.title(), - 'File:Jean-Léon Gérôme 003.jpg') + self.assertEqual(p2.title(), 'File:Jean-Léon Gérôme 003.jpg') self.assertEqual(p2.title(underscore=True), 'File:Jean-Léon_Gérôme_003.jpg') - self.assertEqual(p2.title(with_ns=False), - 'Jean-Léon Gérôme 003.jpg') + self.assertEqual(p2.title(with_ns=False), 'Jean-Léon Gérôme 003.jpg') self.assertEqual(p2.title(with_section=False), 'File:Jean-Léon Gérôme 003.jpg') self.assertEqual(p2.title(with_ns=False, with_section=False), @@ -324,15 +313,11 @@ # the site parameter. # Empty string or None as title raises error. page = pywikibot.page.BasePage(site) - with self.assertRaisesRegex( - InvalidTitleError, - INVALID_TITLE_RE): + with self.assertRaisesRegex(InvalidTitleError, INVALID_TITLE_RE): page.title() page = pywikibot.page.BasePage(site, title='') - with self.assertRaisesRegex( - InvalidTitleError, - INVALID_TITLE_RE): + with self.assertRaisesRegex(InvalidTitleError, INVALID_TITLE_RE): page.title() with self.assertRaisesRegex(ValueError, 'Title cannot be None.'): @@ -344,13 +329,10 @@ mainpage = self.get_mainpage() # Test that Page() needs a title when Site is used as source. - with self.assertRaisesRegex( - ValueError, - EMPTY_TITLE_RE): + with self.assertRaisesRegex(ValueError, EMPTY_TITLE_RE): pywikibot.Page(site) - with self.assertRaisesRegex( - ValueError, - EMPTY_TITLE_RE): + + with self.assertRaisesRegex(ValueError, EMPTY_TITLE_RE): pywikibot.Page(site, '') # Test Page as source. @@ -358,10 +340,9 @@ self.assertEqual(p1, mainpage) # Test not valid source. - with self.assertRaisesRegex( - Error, - r"Invalid argument type '<\w* '\w*'>' in " - 'Page initializer: dummy'): + with self.assertRaisesRegex(Error, + r"Invalid argument type '<\w* '\w*'>' in " + 'Page initializer: dummy'): pywikibot.Page('dummy') def testTitle(self): @@ -369,20 +350,13 @@ # at last test article namespace site = self.get_site() p2 = pywikibot.Page(site, 'Test page') - self.assertEqual(p2.title(), - 'Test page') - self.assertEqual(p2.title(underscore=True), - 'Test_page') - self.assertEqual(p2.title(), - p2.title(with_ns=False)) - self.assertEqual(p2.title(), - p2.title(with_section=False)) - self.assertEqual(p2.title(as_url=True), - p2.title(underscore=True)) - self.assertEqual(p2.title(as_link=True, insite=site), - '[[Test page]]') - self.assertEqual(p2.title(as_filename=True), - p2.title(underscore=True)) + self.assertEqual(p2.title(), 'Test page') + self.assertEqual(p2.title(underscore=True), 'Test_page') + self.assertEqual(p2.title(), p2.title(with_ns=False)) + self.assertEqual(p2.title(), p2.title(with_section=False)) + self.assertEqual(p2.title(as_url=True), p2.title(underscore=True)) + self.assertEqual(p2.title(as_link=True, insite=site), '[[Test page]]') + self.assertEqual(p2.title(as_filename=True), p2.title(underscore=True)) self.assertEqual(p2.title(underscore=True), p2.title(underscore=True, with_ns=False)) self.assertEqual(p2.title(underscore=True), @@ -489,9 +463,7 @@ def test_bad_page(self): """Test various methods that rely on API: bad page.""" badpage = self.get_missing_article() - with self.assertRaisesRegex( - NoPageError, - NO_PAGE_RE): + with self.assertRaisesRegex(NoPageError, NO_PAGE_RE): badpage.get() def testIsDisambig(self): @@ -508,25 +480,15 @@ def testReferences(self): """Test references to a page.""" mainpage = self.get_mainpage() - count = 0 # Ignore redirects for time considerations - for p in mainpage.getReferences(follow_redirects=False): - count += 1 + for p in mainpage.getReferences(follow_redirects=False, total=10): self.assertIsInstance(p, pywikibot.Page) - if count >= 10: - break - count = 0 - for p in mainpage.backlinks(follow_redirects=False): - count += 1 + + for p in mainpage.backlinks(follow_redirects=False, total=10): self.assertIsInstance(p, pywikibot.Page) - if count >= 10: - break - count = 0 - for p in mainpage.embeddedin(): - count += 1 + + for p in mainpage.embeddedin(total=10): self.assertIsInstance(p, pywikibot.Page) - if count >= 10: - break def testLinks(self): """Test the different types of links from a page.""" @@ -625,7 +587,6 @@ family = 'wikipedia' code = 'de' - cached = True def test_coordinates(self): @@ -679,7 +640,6 @@ family = 'commons' code = 'commons' - cached = True def test_globalusage(self, key): @@ -746,7 +706,6 @@ family = 'wikipedia' code = 'test' - cached = True login = True @@ -1005,14 +964,11 @@ text = ('This page is used in the [[mw:Manual:Pywikipediabot]] ' 'testing suite.') self.assertEqual(p1.get(), text) - with self.assertRaisesRegex( - IsRedirectPageError, - r'{} is a redirect page\.' - .format(re.escape(str(p2)))): + with self.assertRaisesRegex(IsRedirectPageError, + r'{} is a redirect page\.' + .format(re.escape(str(p2)))): p2.get() - with self.assertRaisesRegex( - NoPageError, - NO_PAGE_RE): + with self.assertRaisesRegex(NoPageError, NO_PAGE_RE): p3.get() def test_set_redirect_target(self): @@ -1024,14 +980,11 @@ p3 = pywikibot.Page(site, 'User:Legoktm/R3') text = p2.get(get_redirect=True) - with self.assertRaisesRegex( - IsNotRedirectPageError, - r'{} is not a redirect page\.' - .format(re.escape(str(p1)))): + with self.assertRaisesRegex(IsNotRedirectPageError, + r'{} is not a redirect page\.' + .format(re.escape(str(p1)))): p1.set_redirect_target(p2) - with self.assertRaisesRegex( - NoPageError, - NO_PAGE_RE): + with self.assertRaisesRegex(NoPageError, NO_PAGE_RE): p3.set_redirect_target(p2) p2.set_redirect_target(p1, save=False) self.assertEqual(text, p2.get(get_redirect=True)) @@ -1089,18 +1042,15 @@ p.delete(reason='pywikibot unit test', prompt=False, mark=False) self.assertEqual(p._pageid, 0) self.assertEqual(p.isRedirectPage(), False) - with self.assertRaisesRegex( - NoPageError, - NO_PAGE_RE): + with self.assertRaisesRegex(NoPageError, NO_PAGE_RE): p.get(force=True) + # Test undeleting last two revisions del_revs = list(p.loadDeletedRevisions()) revid = p.getDeletedRevision(del_revs[-1])['revid'] p.markDeletedRevision(del_revs[-1]) p.markDeletedRevision(del_revs[-2]) - with self.assertRaisesRegex( - ValueError, - 'is not a deleted revision'): + with self.assertRaisesRegex(ValueError, 'is not a deleted revision'): p.markDeletedRevision(123) p.undelete(reason='pywikibot unit test') revs = list(p.revisions()) @@ -1281,7 +1231,7 @@ def test_create_short_link(self): """Test create_short_link function.""" # Make sure test user is logged in on meta:meta (T244062) - meta = pywikibot.Site('meta', 'meta') + meta = pywikibot.Site('meta:meta') if not meta.logged_in(): meta.login() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/758936 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: If63dfd76de1ad561e6e423088e50a732c4df97b5 Gerrit-Change-Number: 758936 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Add LinkTestWikiEn class to prevent code duplication
by jenkins-bot (Code Review) 01 Feb '22

01 Feb '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/758903 ) Change subject: [tests] Add LinkTestWikiEn class to prevent code duplication ...................................................................... [tests] Add LinkTestWikiEn class to prevent code duplication Change-Id: I5cef1436998285aff02e29c21efdf8b0ea4b5cb7 --- M tests/link_tests.py 1 file changed, 12 insertions(+), 52 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/link_tests.py b/tests/link_tests.py index 601acd5..10a43cc 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -239,9 +239,9 @@ cache = True -class TestPartiallyQualifiedExplicitLinkSameSiteParser(LinkTestCase): +class LinkTestWikiEn(LinkTestCase): - """Link tests.""" + """Link tests on wikipedia:en.""" family = 'wikipedia' code = 'en' @@ -252,6 +252,11 @@ config.mylang = 'en' config.family = 'wikipedia' + +class TestPartiallyQualifiedExplicitLinkSameSiteParser(LinkTestWikiEn): + + """Link tests.""" + def test_partially_qualified_NS0_code(self): """Test ':wikipedia:Main Page' on enwp is namespace 4.""" link = Link(':wikipedia:Main Page') @@ -285,19 +290,10 @@ self.assertEqual(link.namespace, 1) -class TestPartiallyQualifiedExplicitLinkDifferentCodeParser(LinkTestCase): +class TestPartiallyQualifiedExplicitLinkDifferentCodeParser(LinkTestWikiEn): """Link tests.""" - family = 'wikipedia' - code = 'en' - - def setUp(self): - """Setup tests.""" - super().setUp() - config.mylang = 'en' - config.family = 'wikipedia' - def test_partially_qualified_NS0_family(self): """Test ':en:Main Page' on dewp is namespace 0.""" link = Link(':en:Main Page') @@ -368,19 +364,10 @@ self.assertEqual(link.namespace, 4) -class TestFullyQualifiedExplicitLinkSameFamilyParser(LinkTestCase): +class TestFullyQualifiedExplicitLinkSameFamilyParser(LinkTestWikiEn): """Link tests.""" - family = 'wikipedia' - code = 'en' - - def setUp(self): - """Setup tests.""" - super().setUp() - config.mylang = 'en' - config.family = 'wikipedia' - def test_fully_qualified_NS0_code(self): """Test ':en:wikipedia:Main Page' on enwp is namespace 4.""" link = Link(':en:wikipedia:Main Page') @@ -604,19 +591,10 @@ # ---- Tests of a Link without colons, which shouldn't be interwikis, follow. -class TestPartiallyQualifiedImplicitLinkSameSiteParser(LinkTestCase): +class TestPartiallyQualifiedImplicitLinkSameSiteParser(LinkTestWikiEn): """Test partially qualified links to same site.""" - family = 'wikipedia' - code = 'en' - - def setUp(self): - """Setup tests.""" - super().setUp() - config.mylang = 'en' - config.family = 'wikipedia' - def test_partially_qualified_NS0_code(self): """Test 'wikipedia:Main Page' on enwp is namespace 4.""" link = Link('wikipedia:Main Page') @@ -650,19 +628,10 @@ self.assertEqual(link.namespace, 1) -class TestPartiallyQualifiedImplicitLinkDifferentCodeParser(LinkTestCase): +class TestPartiallyQualifiedImplicitLinkDifferentCodeParser(LinkTestWikiEn): """Test partially qualified links to different code.""" - family = 'wikipedia' - code = 'en' - - def setUp(self): - """Setup tests.""" - super().setUp() - config.mylang = 'en' - config.family = 'wikipedia' - def test_partially_qualified_NS0_family(self): """Test 'en:Main Page' on dewp is namespace 0.""" link = Link('en:Main Page') @@ -710,19 +679,10 @@ self.assertEqual(link.namespace, 1) -class TestFullyQualifiedImplicitLinkSameFamilyParser(LinkTestCase): +class TestFullyQualifiedImplicitLinkSameFamilyParser(LinkTestWikiEn): """Link tests.""" - family = 'wikipedia' - code = 'en' - - def setUp(self): - """Setup tests.""" - super().setUp() - config.mylang = 'en' - config.family = 'wikipedia' - def test_fully_qualified_NS0_code(self): """Test 'en:wikipedia:Main Page' on enwp is namespace 4.""" link = Link('en:wikipedia:Main Page') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/758903 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: I5cef1436998285aff02e29c21efdf8b0ea4b5cb7 Gerrit-Change-Number: 758903 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] set cached attribute for LinkTestCase
by jenkins-bot (Code Review) 01 Feb '22

01 Feb '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/758888 ) Change subject: [tests] set cached attribute for LinkTestCase ...................................................................... [tests] set cached attribute for LinkTestCase Change-Id: I329c832db64b7acc44a5e8ceb6f563d69340c1e4 --- M tests/link_tests.py 1 file changed, 7 insertions(+), 17 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/link_tests.py b/tests/link_tests.py index f1c132f..601acd5 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -13,7 +13,7 @@ from pywikibot.exceptions import InvalidTitleError, SiteDefinitionError from pywikibot.page import Link, Page, SiteLink from pywikibot.site import Namespace -from tests.aspects import AlteredDefaultSiteTestCase as LinkTestCase +from tests.aspects import AlteredDefaultSiteTestCase from tests.aspects import ( DefaultDrySiteTestCase, TestCase, @@ -232,6 +232,12 @@ # ---- The first set of tests are explicit links, starting with a ':'. +class LinkTestCase(AlteredDefaultSiteTestCase): + + """Cached API test for link tests.""" + + cache = True + class TestPartiallyQualifiedExplicitLinkSameSiteParser(LinkTestCase): @@ -239,7 +245,6 @@ family = 'wikipedia' code = 'en' - cached = True def setUp(self): """Setup tests.""" @@ -286,7 +291,6 @@ family = 'wikipedia' code = 'en' - cached = True def setUp(self): """Setup tests.""" @@ -317,7 +321,6 @@ family = 'wikipedia' code = 'en' - cached = True def setUp(self): """Setup tests.""" @@ -348,7 +351,6 @@ family = 'wikipedia' code = 'en' - cached = True def test_namespace_vs_family(self): """Test namespace is selected before family.""" @@ -372,7 +374,6 @@ family = 'wikipedia' code = 'en' - cached = True def setUp(self): """Setup tests.""" @@ -411,7 +412,6 @@ 'code': 'en' } } - cached = True PATTERN = '{colon}{first}:{second}:{title}' @@ -472,7 +472,6 @@ 'code': 'en' } } - cached = True def setUp(self): """Setup tests.""" @@ -531,7 +530,6 @@ 'code': 'test' }, } - cached = True def setUp(self): """Setup tests.""" @@ -579,7 +577,6 @@ family = 'species' code = 'species' - cached = True def setUp(self): """Setup tests.""" @@ -613,7 +610,6 @@ family = 'wikipedia' code = 'en' - cached = True def setUp(self): """Setup tests.""" @@ -660,7 +656,6 @@ family = 'wikipedia' code = 'en' - cached = True def setUp(self): """Setup tests.""" @@ -691,7 +686,6 @@ family = 'wikipedia' code = 'en' - cached = True def setUp(self): """Setup tests.""" @@ -722,7 +716,6 @@ family = 'wikipedia' code = 'en' - cached = True def setUp(self): """Setup tests.""" @@ -761,7 +754,6 @@ 'code': 'en' } } - cached = True def setUp(self): """Setup tests.""" @@ -808,7 +800,6 @@ family = 'wikidata' code = 'test' - cached = True def setUp(self): """Setup tests.""" @@ -847,7 +838,6 @@ family = 'species' code = 'species' - cached = True def setUp(self): """Setup tests.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/758888 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: I329c832db64b7acc44a5e8ceb6f563d69340c1e4 Gerrit-Change-Number: 758888 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2022