Pywikibot-commits December 2021

pywikibot-commits@lists.wikimedia.org

1 participants
46 discussions

[Gerrit] ...core[master]: [L10N] Update languages_by_size
by jenkins-bot (Code Review) 20 Dec '21

20 Dec '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748276 ) Change subject: [L10N] Update languages_by_size ...................................................................... [L10N] Update languages_by_size Change-Id: I09610103cbe27b837c503f6e26dcced49b41cd68 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wiktionary_family.py 5 files changed, 35 insertions(+), 35 deletions(-) Approvals: Meno25: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index cd9bf06..aefe446 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -32,10 +32,10 @@ 'en', 'hu', 'de', 'fr', 'it', 'pt', 'ja', 'vi', 'es', 'nl', 'pl', 'id', 'he', 'fi', 'zh', 'sq', 'az', 'fa', 'ru', 'ca', 'eu', 'da', 'ko', 'ba', 'sv', 'th', 'gl', 'cs', 'sr', 'hi', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', - 'ta', 'eo', 'sk', 'is', 'ro', 'bn', 'si', 'bg', 'ms', 'mk', 'ka', 'tt', + 'ta', 'eo', 'sk', 'is', 'bn', 'ro', 'si', 'bg', 'ms', 'mk', 'ka', 'tt', 'lt', 'el', 'li', 'sl', 'tl', 'ur', 'km', 'la', 'te', 'kk', 'et', 'be', - 'ia', 'mr', 'ml', 'oc', 'ne', 'hy', 'cv', 'pa', 'tg', 'ku', 'fy', 'bs', - 'cy', 'af', 'mg', 'ky', + 'ia', 'mr', 'ml', 'oc', 'ne', 'hy', 'cv', 'pa', 'tg', 'ku', 'fy', 'af', + 'bs', 'cy', 'mg', 'ky', ] category_redirect_templates = { diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index f281d1a..6e7a93f 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -30,34 +30,34 @@ languages_by_size = [ 'en', 'ceb', 'sv', 'de', 'fr', 'nl', 'ru', 'es', 'it', 'pl', 'arz', 'ja', 'vi', 'war', 'zh', 'ar', 'uk', 'pt', 'fa', 'ca', 'sr', 'id', - 'no', 'ko', 'fi', 'hu', 'cs', 'sh', 'tr', 'ce', 'zh-min-nan', 'ro', + 'no', 'ko', 'fi', 'hu', 'cs', 'tr', 'sh', 'ce', 'zh-min-nan', 'ro', 'eu', 'ms', 'tt', 'eo', 'he', 'hy', 'bg', 'da', 'azb', 'sk', 'kk', - 'min', 'et', 'be', 'hr', 'lt', 'el', 'simple', 'az', 'gl', 'sl', 'ur', - 'nn', 'ka', 'hi', 'th', 'ta', 'uz', 'la', 'cy', 'ast', 'vo', 'zh-yue', - 'mk', 'bn', 'lv', 'tg', 'my', 'af', 'mg', 'bs', 'oc', 'sq', 'nds', + 'min', 'et', 'be', 'hr', 'el', 'lt', 'simple', 'az', 'gl', 'sl', 'ur', + 'nn', 'ka', 'hi', 'th', 'ta', 'uz', 'la', 'cy', 'ast', 'vo', 'mk', + 'zh-yue', 'bn', 'lv', 'tg', 'my', 'af', 'mg', 'bs', 'oc', 'sq', 'nds', 'mr', 'ky', 'ml', 'be-tarask', 'te', 'new', 'br', 'vec', 'sw', 'pms', 'jv', 'pnb', 'ht', 'su', 'lb', 'ba', 'ga', 'szl', 'is', 'ku', 'lmo', - 'fy', 'cv', 'tl', 'wuu', 'an', 'sco', 'diq', 'pa', 'ckb', 'yo', 'ne', + 'cv', 'fy', 'tl', 'wuu', 'an', 'sco', 'diq', 'pa', 'ckb', 'yo', 'ne', 'bar', 'io', 'gu', 'als', 'kn', 'scn', 'bpy', 'ia', 'qu', 'mn', 'xmf', - 'nv', 'avk', 'si', 'bat-smg', 'or', 'gd', 'cdo', 'ilo', 'yi', 'am', - 'sd', 'bug', 'nap', 'frr', 'os', 'hsb', 'map-bms', 'mai', 'fo', 'crh', - 'li', 'ha', 'sah', 'mzn', 'eml', 'ps', 'ace', 'gor', 'sa', 'bcl', 'wa', - 'zh-classical', 'lij', 'ban', 'zu', 'mhr', 'mrj', 'hif', 'shn', 'mni', + 'avk', 'nv', 'si', 'bat-smg', 'or', 'gd', 'cdo', 'ilo', 'yi', 'am', + 'sd', 'bug', 'nap', 'frr', 'os', 'crh', 'hsb', 'map-bms', 'mai', 'fo', + 'ha', 'li', 'sah', 'mzn', 'eml', 'ps', 'gor', 'ace', 'sa', 'bcl', 'wa', + 'zh-classical', 'ban', 'lij', 'zu', 'mhr', 'mrj', 'hif', 'shn', 'mni', 'as', 'hak', 'roa-tara', 'hyw', 'pam', 'ie', 'nso', 'km', 'rue', 'se', - 'bh', 'vls', 'nds-nl', 'sn', 'so', 'mi', 'nah', 'sat', 'sc', 'myv', + 'bh', 'vls', 'nds-nl', 'sn', 'mi', 'so', 'nah', 'sat', 'sc', 'myv', 'vep', 'gan', 'glk', 'kab', 'tk', 'co', 'fiu-vro', 'bo', 'ab', 'kv', - 'csb', 'pcd', 'frp', 'ug', 'udm', 'kw', 'gv', 'ay', 'ary', 'zea', - 'nrm', 'gn', 'bjn', 'mt', 'lez', 'lfn', 'stq', 'lo', 'mwl', 'skr', - 'smn', 'rm', 'olo', 'lad', 'gom', 'ang', 'fur', 'koi', 'tyv', 'ext', - 'dsb', 'dty', 'ln', 'cbk-zam', 'dv', 'ksh', 'rw', 'gag', 'bxr', 'pfl', - 'ig', 'av', 'pi', 'pag', 'awa', 'haw', 'tay', 'pap', 'xal', 'krc', - 'szy', 'za', 'pdc', 'kaa', 'inh', 'atj', 'arc', 'to', 'kbp', 'tpi', + 'csb', 'pcd', 'frp', 'kw', 'ug', 'udm', 'gv', 'ay', 'ary', 'zea', + 'nrm', 'gn', 'bjn', 'mt', 'lez', 'lfn', 'stq', 'lo', 'mwl', 'smn', + 'skr', 'olo', 'rm', 'lad', 'fur', 'gom', 'ang', 'koi', 'dsb', 'tyv', + 'ext', 'dty', 'ln', 'cbk-zam', 'dv', 'ksh', 'rw', 'gag', 'bxr', 'pfl', + 'ig', 'av', 'pi', 'pag', 'awa', 'haw', 'tay', 'pap', 'krc', 'xal', + 'szy', 'za', 'pdc', 'kaa', 'inh', 'atj', 'to', 'arc', 'kbp', 'tpi', 'jam', 'na', 'wo', 'lld', 'kbd', 'tcy', 'mdf', 'nov', 'ki', 'tet', - 'lg', 'bi', 'jbo', 'roa-rup', 'fj', 'kg', 'lbe', 'xh', 'ty', 'tw', - 'mnw', 'nqo', 'srn', 'om', 'shi', 'trv', 'gcr', 'sm', 'chr', 'ltg', - 'alt', 'ks', 'nia', 'pih', 'ny', 'dag', 'got', 'cu', 'st', 'mad', - 'ami', 'kl', 'tn', 'bm', 'ts', 'rmy', 've', 'chy', 'rn', 'tum', 'iu', - 'ss', 'ch', 'ak', 'pnt', 'ady', 'ik', 'ee', 'ff', 'din', 'sg', 'dz', + 'lg', 'bi', 'jbo', 'roa-rup', 'fj', 'kg', 'tw', 'lbe', 'xh', 'ty', + 'mnw', 'nqo', 'srn', 'shi', 'om', 'trv', 'gcr', 'sm', 'ltg', 'chr', + 'alt', 'ks', 'nia', 'dag', 'pih', 'cu', 'ny', 'got', 'st', 'mad', + 'ami', 'kl', 'rmy', 'tn', 'bm', 'ts', 've', 'chy', 'rn', 'tum', 'iu', + 'ak', 'ss', 'ch', 'pnt', 'ady', 'ik', 'ee', 'ff', 'din', 'sg', 'dz', 'ti', 'pwn', 'cr', ] diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 4622868..8119019 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -31,8 +31,8 @@ 'he', 'sk', 'tr', 'bs', 'ca', 'eo', 'fi', 'az', 'sl', 'lt', 'zh', 'ar', 'bg', 'hy', 'hr', 'el', 'su', 'nn', 'id', 'sv', 'li', 'hu', 'ko', 'nl', 'ja', 'la', 'ta', 'sah', 'sr', 'gu', 'gl', 'ur', 'te', 'be', 'cy', - 'no', 'ml', 'sq', 'vi', 'kn', 'ro', 'eu', 'ku', 'uz', 'th', 'hi', 'ka', - 'da', 'sa', 'is', 'br', 'mr', 'af', 'wo', 'ky', + 'no', 'ml', 'sq', 'vi', 'kn', 'ro', 'eu', 'ku', 'uz', 'hi', 'ka', 'da', + 'sa', 'is', 'th', 'br', 'mr', 'af', 'wo', 'ky', ] category_redirect_templates = { diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index bbbb69d..a14245d 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -27,10 +27,10 @@ languages_by_size = [ 'pl', 'en', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'uk', 'ar', 'cs', 'mul', 'gu', 'pt', 'sr', 'fa', 'sv', 'hu', 'ko', 'ml', 'bn', 'sa', - 'ta', 'te', 'sl', 'hy', 'el', 'tr', 'vi', 'la', 'ro', 'fi', 'ja', - 'nap', 'nl', 'az', 'ca', 'br', 'kn', 'hr', 'no', 'th', 'eo', 'hi', + 'ta', 'te', 'sl', 'hy', 'tr', 'el', 'la', 'vi', 'ro', 'fi', 'ja', + 'nap', 'nl', 'az', 'ca', 'br', 'kn', 'hr', 'no', 'th', 'hi', 'eo', 'be', 'is', 'vec', 'id', 'pms', 'ban', 'da', 'lij', 'et', 'mk', 'yi', - 'as', 'mr', 'bg', 'li', 'lt', 'wa', 'cy', 'jv', 'pa', 'or', 'eu', 'gl', + 'mr', 'as', 'bg', 'li', 'lt', 'cy', 'wa', 'jv', 'pa', 'or', 'eu', 'gl', 'bs', 'sah', 'sk', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 4f7ade0..b7b6e0c 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -31,17 +31,17 @@ 'ku', 'lt', 'it', 'ca', 'fi', 'hu', 'ta', 'tr', 'io', 'hy', 'ko', 'ja', 'pt', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'et', 'id', 'cs', 'ml', 'my', 'uz', 'li', 'or', 'te', 'eo', 'fa', 'gl', 'ar', 'jv', 'oc', 'az', - 'eu', 'uk', 'br', 'skr', 'ast', 'da', 'lo', 'simple', 'bn', 'la', 'is', + 'eu', 'uk', 'skr', 'br', 'ast', 'da', 'lo', 'simple', 'bn', 'la', 'is', 'hr', 'fj', 'tg', 'sk', 'ky', 'bg', 'wa', 'ur', 'ps', 'cy', 'shn', 'vo', 'sl', 'he', 'af', 'zh-min-nan', 'scn', 'om', 'tl', 'pa', 'sw', - 'fy', 'nn', 'ka', 'lv', 'min', 'sq', 'nds', 'ms', 'co', 'lmo', 'mn', + 'fy', 'nn', 'ka', 'lv', 'lmo', 'min', 'sq', 'ms', 'nds', 'co', 'mn', 'pnb', 'lb', 'bs', 'nah', 'yue', 'mnw', 'sa', 'kk', 'km', 'diq', 'vec', - 'be', 'tk', 'mk', 'sm', 'hsb', 'nia', 'shy', 'gd', 'ga', 'ks', 'an', - 'wo', 'mni', 'gom', 'mr', 'su', 'ia', 'ang', 'mt', 'fo', 'tt', 'sd', + 'be', 'tk', 'mk', 'sm', 'hsb', 'nia', 'shy', 'ks', 'gd', 'ga', 'an', + 'wo', 'mr', 'mni', 'gom', 'su', 'ia', 'ang', 'mt', 'fo', 'tt', 'sd', 'gn', 'ie', 'so', 'csb', 'ug', 'bcl', 'si', 'st', 'roa-rup', 'hif', - 'zu', 'kl', 'mi', 'ay', 'jbo', 'ha', 'ln', 'yi', 'gu', 'na', 'gv', + 'zu', 'kl', 'mi', 'ay', 'ha', 'jbo', 'ln', 'yi', 'gu', 'na', 'gv', 'kw', 'tpi', 'am', 'ne', 'rw', 'ts', 'qu', 'ss', 'chr', 'iu', 'dv', - 'sg', 'ti', 'tn', + 'ti', 'tn', 'sg', ] category_redirect_templates = { -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748276 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: I09610103cbe27b837c503f6e26dcced49b41cd68 Gerrit-Change-Number: 748276 Gerrit-PatchSet: 2 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Update HISTORY.rst
by jenkins-bot (Code Review) 20 Dec '21

20 Dec '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748739 ) Change subject: [doc] Update HISTORY.rst ...................................................................... [doc] Update HISTORY.rst Change-Id: I68f3926073a04235167ab9a788f7701ef2f5a13f --- M HISTORY.rst 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index 65b5cfd..b8dea23 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,20 @@ Release history ^^^^^^^^^^^^^^^ +6.6.3 +----- +*01 December 2021* + +* L10N updates + + +6.6.2 +----- +*28 October 2021* + +* L10N updates (T292423, T294526, T294527) + + 6.6.1 ----- *21 September 2021* -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748739 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: I68f3926073a04235167ab9a788f7701ef2f5a13f Gerrit-Change-Number: 748739 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]: [doc] Update ROADMAP.rst
by Xqt (Code Review) 20 Dec '21

20 Dec '21

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748736 ) Change subject: [doc] Update ROADMAP.rst ...................................................................... [doc] Update ROADMAP.rst Change-Id: Ib18846e4c10e3c8c8330b0e6b63e023b60710901 --- M ROADMAP.rst 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/ROADMAP.rst b/ROADMAP.rst index 7c9aa2f..54ff981 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -4,11 +4,12 @@ Improvements and Bugfixes ------------------------- +* Enable shell script with Pywikibot site package +* Enable generate_user_files.py and generate_family_file with site-package (T107629) * Add support for Python 3.11 * Use page.site.data_repository when creating a _WbDataPage (T296985) * Fix mysql AttributeError for sock.close() on toolforge (T216741) * Pywikibot supports PyPy 3 (T101592) -* Enable move generate_user_files.py with site-package (T107629) * Only search user_script_paths inside config.base_dir (T296204) * pywikibot.argv has been fixed for pwb.py wrapper if called with global args (T254435) * A new method User.is_locked() was added to determine whether the user is currently locked globally (T249392) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748736 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: Ib18846e4c10e3c8c8330b0e6b63e023b60710901 Gerrit-Change-Number: 748736 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 20 Dec '21

20 Dec '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/748707 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I41cf819f51924a9bee7a38344abff98cbdfc9af4 --- A archivebot/scn.json M blockpageschecker/be-tarask.json 2 files changed, 12 insertions(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/archivebot/scn.json b/archivebot/scn.json new file mode 100644 index 0000000..031878f --- /dev/null +++ b/archivebot/scn.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Ajeje Brazorf" + ] + }, + "archivebot-older-than": "cchiù {{PLURAL:%(count)d|vecchiu|vecchî}} di %(duration)s" +} diff --git a/blockpageschecker/be-tarask.json b/blockpageschecker/be-tarask.json index 9ad37e9..f52903d 100644 --- a/blockpageschecker/be-tarask.json +++ b/blockpageschecker/be-tarask.json @@ -1,8 +1,11 @@ { "@metadata": { "authors": [ - "Red Winged Duck" + "Red Winged Duck", + "Renessaince" ] }, + "blockpageschecker-adding": "Робат: даданьне шаблёну блякаваньня старонкі", + "blockpageschecker-modifying": "Робат: зьмена састарэлага шаблёну", "blockpageschecker-deleting": "Робат: выдаленьне састарэлага шаблёну" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/748707 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: I41cf819f51924a9bee7a38344abff98cbdfc9af4 Gerrit-Change-Number: 748707 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]: [bugfix] Change regex to detect meta information
by jenkins-bot (Code Review) 19 Dec '21

19 Dec '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748371 ) Change subject: [bugfix] Change regex to detect meta information ...................................................................... [bugfix] Change regex to detect meta information - enable meta with charset but without content-type - enable quotes with charset information Bug: T298006 Change-Id: Ie1c56848d5485ee91a32c6c0bc75264c018ba05b --- M scripts/reflinks.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Rubin: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/reflinks.py b/scripts/reflinks.py index c37296e..b3e425e 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -481,9 +481,11 @@ .format(self.stop_page.title(as_link=True))) # Regex to grasp content-type meta HTML tag in HTML source - self.META_CONTENT = re.compile(br'(?i)<meta[^>]*content\-type[^>]*>') + self.META_CONTENT = re.compile( + br'(?i)<meta[^>]*(?:content\-type|charset)[^>]*>') # Extract the encoding from a charset property (from content-type !) - self.CHARSET = re.compile(r'(?i)charset\s*=\s*(?P<enc>[^\'",;>/]*)') + self.CHARSET = re.compile( + r'(?i)charset\s*=\s*(?P<enc>(?P<q>[\'"]?)[^\'",;>/]*(?P=q))') # Extract html title from page self.TITLE = re.compile(r'(?is)(?<=<title>).*?(?=</title>)') # Matches content inside <script>/<style>/HTML comments -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748371 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: Ie1c56848d5485ee91a32c6c0bc75264c018ba05b Gerrit-Change-Number: 748371 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Rubin <rubin.happy(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Revert "logging: Fix redirection for terminal interfaces"
by jenkins-bot (Code Review) 19 Dec '21

19 Dec '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748274 ) Change subject: Revert "logging: Fix redirection for terminal interfaces" ...................................................................... Revert "logging: Fix redirection for terminal interfaces" This reverts commit ba527de7dc13cb38a1fc904d92197a3c96ca4a54. Reason for revert: See comment of T283808, missing or delayed output. Bug: T283808 Change-Id: Ic5a82622444f47aad9ee17548fb9bf9c54489f42 --- M pywikibot/userinterfaces/terminal_interface_base.py M pywikibot/userinterfaces/terminal_interface_unix.py M tests/ui_tests.py 3 files changed, 150 insertions(+), 127 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index 1d87b67..c288bdc 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -71,9 +71,9 @@ This caches the std-streams locally so any attempts to monkey-patch the streams later will not work. """ - self.stdin = sys.__stdin__ - self.stdout = sys.__stdout__ - self.stderr = sys.__stderr__ + self.stdin = sys.stdin + self.stdout = sys.stdout + self.stderr = sys.stderr self.argv = sys.argv self.encoding = config.console_encoding self.transliteration_target = config.transliteration_target @@ -141,24 +141,8 @@ return cls.split_col_pat.search(color).groups() def _write(self, text, target_stream): - """ - Optionally encode and write the text to the target stream. - - sys.stderr and sys.stdout are frozen upon initialization to original - streams (which are stored in the sys module as sys.__stderr__ and - sys.__stdout__). This works fine except when using redirect_stderr or - redirect_stdout context managers, where values of global sys.stderr and - sys.stdout are temporarily changed to a redirecting StringIO stream, - in which case writing to the frozen streams (which are still set to - sys.__stderr__ / sys.__stdout__) will not write to the redirecting - stream as expected. So, we check the target stream against the frozen - streams, and then write to the (potentially redirected) sys.stderr or - sys.stdout stream. - """ - if target_stream == self.stderr: - sys.stderr.write(text) - elif target_stream == self.stdout: - sys.stdout.write(text) + """Optionally encode and write the text to the target stream.""" + target_stream.write(text) def support_color(self, target_stream): """Return whether the target stream does support colors.""" diff --git a/pywikibot/userinterfaces/terminal_interface_unix.py b/pywikibot/userinterfaces/terminal_interface_unix.py index eaba92a..8d82f32 100755 --- a/pywikibot/userinterfaces/terminal_interface_unix.py +++ b/pywikibot/userinterfaces/terminal_interface_unix.py @@ -51,3 +51,7 @@ if bg is not None: bg = unixColors[bg] self._write(self.make_unix_bg_color(bg), target_stream) + + def _write(self, text, target_stream): + """Optionally encode and write the text to the target stream.""" + target_stream.write(text) diff --git a/tests/ui_tests.py b/tests/ui_tests.py index 7eaa8b3..e9af702 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -7,9 +7,10 @@ import io import logging import os +import sys import unittest -from contextlib import redirect_stdout, suppress -from unittest.mock import patch + +from contextlib import suppress import pywikibot from pywikibot.bot import ( @@ -32,6 +33,42 @@ from tests.utils import FakeModule +class Stream: + + """Handler for a StringIO instance able to patch itself.""" + + def __init__(self, name: str, patched_streams: dict): + """ + Create a new stream with a StringIO instance. + + :param name: The part after 'std' (e.g. 'err'). + :param patched_streams: A mapping which maps the original stream to + the patched stream. + """ + self._stream = io.StringIO() + self._name = 'std{}'.format(name) + self._original = getattr(sys, self._name) + patched_streams[self._original] = self._stream + + def __repr__(self): + return '<patched {} {!r} wrapping {!r}>'.format( + self._name, self._stream, self._original) + + def reset(self): + """Reset own stream.""" + self._stream.truncate(0) + self._stream.seek(0) + + +patched_streams = {} +strout = Stream('out', patched_streams) +strerr = Stream('err', patched_streams) +strin = Stream('in', {}) + +newstdout = strout._stream +newstderr = strerr._stream +newstdin = strin._stream + logger = logging.getLogger('pywiki') loggingcontext = {'caller_name': 'ui_tests', 'caller_file': 'ui_tests', @@ -47,21 +84,19 @@ def setUp(self): super().setUp() - # Here we patch standard input, output, and errors, essentially - # redirecting to StringIO streams - self.stdout_patcher = patch('sys.stdout', new_callable=io.StringIO) - self.strout = self.stdout_patcher.start() - self.stderr_patcher = patch('sys.stderr', new_callable=io.StringIO) - self.strerr = self.stderr_patcher.start() - self.stdin_patcher = patch('sys.stdin', new_callable=io.StringIO) - self.strin = self.stdin_patcher.start() pywikibot.bot.set_interface('terminal') + self.org_print = pywikibot.bot.ui._print self.org_input = pywikibot.bot.ui._raw_input + pywikibot.bot.ui._print = self._patched_print pywikibot.bot.ui._raw_input = self._patched_input + strout.reset() + strerr.reset() + strin.reset() + pywikibot.config.colorized_output = True pywikibot.config.transliterate = False pywikibot.ui.transliteration_target = None @@ -70,16 +105,23 @@ def tearDown(self): super().tearDown() - self.stdout_patcher.stop() - self.stderr_patcher.stop() - self.stdin_patcher.stop() - + pywikibot.bot.ui._print = self.org_print pywikibot.bot.ui._raw_input = self.org_input pywikibot.bot.set_interface('buffer') + def _patched_print(self, text, target_stream): + try: + stream = patched_streams[target_stream] + except KeyError: + expected = pywikibot.userinterfaces.win32_unicode.UnicodeOutput + assert isinstance(target_stream, expected) + assert target_stream._stream + stream = patched_streams[target_stream._stream] + self.org_print(text, stream) + def _patched_input(self): - return self.strin.readline().strip() + return strin._stream.readline().strip() class TestExceptionError(Exception): @@ -107,56 +149,56 @@ for text, level, out, err in self.tests: with self.subTest(test=text): logger.log(level, text, extra=loggingcontext) - self.assertEqual(self.strout.getvalue(), out) - self.assertEqual(self.strerr.getvalue(), err) + self.assertEqual(newstdout.getvalue(), out) + self.assertEqual(newstderr.getvalue(), err) # reset terminal files - for stream in [self.strout, self.strerr, self.strin]: - stream.truncate(0) - stream.seek(0) + strout.reset() + strerr.reset() + strin.reset() def test_output(self): pywikibot.output('output') - self.assertEqual(self.strout.getvalue(), '') - self.assertEqual(self.strerr.getvalue(), 'output\n') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'output\n') def test_stdout(self): pywikibot.stdout('output') - self.assertEqual(self.strout.getvalue(), 'output\n') - self.assertEqual(self.strerr.getvalue(), '') + self.assertEqual(newstdout.getvalue(), 'output\n') + self.assertEqual(newstderr.getvalue(), '') def test_warning(self): pywikibot.warning('warning') - self.assertEqual(self.strout.getvalue(), '') - self.assertEqual(self.strerr.getvalue(), 'WARNING: warning\n') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'WARNING: warning\n') def test_error(self): pywikibot.error('error') - self.assertEqual(self.strout.getvalue(), '') - self.assertEqual(self.strerr.getvalue(), 'ERROR: error\n') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'ERROR: error\n') def test_log(self): pywikibot.log('log') - self.assertEqual(self.strout.getvalue(), '') - self.assertEqual(self.strerr.getvalue(), '') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), '') def test_critical(self): pywikibot.critical('critical') - self.assertEqual(self.strout.getvalue(), '') - self.assertEqual(self.strerr.getvalue(), 'CRITICAL: critical\n') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'CRITICAL: critical\n') def test_debug(self): pywikibot.debug('debug', 'test') - self.assertEqual(self.strout.getvalue(), '') - self.assertEqual(self.strerr.getvalue(), '') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), '') def test_exception(self): try: raise TestExceptionError('Testing Exception') except TestExceptionError: pywikibot.exception('exception') - self.assertEqual(self.strout.getvalue(), '') - self.assertEqual(self.strerr.getvalue(), + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'ERROR: TestExceptionError: Testing Exception\n') def test_exception_tb(self): @@ -164,8 +206,8 @@ raise TestExceptionError('Testing Exception') except TestExceptionError: pywikibot.exception('exception', tb=True) - self.assertEqual(self.strout.getvalue(), '') - stderrlines = self.strerr.getvalue().split('\n') + self.assertEqual(newstdout.getvalue(), '') + stderrlines = newstderr.getvalue().split('\n') self.assertEqual(stderrlines[0], 'ERROR: TestExceptionError: Testing Exception') self.assertEqual(stderrlines[1], 'Traceback (most recent call last):') @@ -188,22 +230,22 @@ input_choice_output = 'question ([A]nswer 1, a[n]swer 2, an[s]wer 3): ' def testInput(self): - self.strin.write('input to read\n') - self.strin.seek(0) + newstdin.write('input to read\n') + newstdin.seek(0) returned = pywikibot.input('question') - self.assertEqual(self.strout.getvalue(), '') - self.assertEqual(self.strerr.getvalue(), 'question: ') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'question: ') self.assertIsInstance(returned, str) self.assertEqual(returned, 'input to read') def test_input_yn(self): - self.strin.write('\n') - self.strin.seek(0) + newstdin.write('\n') + newstdin.seek(0) returned = pywikibot.input_yn('question', False, automatic_quit=False) - self.assertEqual(self.strout.getvalue(), '') - self.assertEqual(self.strerr.getvalue(), 'question ([y]es, [N]o): ') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'question ([y]es, [N]o): ') self.assertFalse(returned) def _call_input_choice(self): @@ -215,39 +257,39 @@ 'A', automatic_quit=False) - self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(newstdout.getvalue(), '') self.assertIsInstance(rv, str) return rv def testInputChoiceDefault(self): - self.strin.write('\n') - self.strin.seek(0) + newstdin.write('\n') + newstdin.seek(0) returned = self._call_input_choice() self.assertEqual(returned, 'a') def testInputChoiceCapital(self): - self.strin.write('N\n') - self.strin.seek(0) + newstdin.write('N\n') + newstdin.seek(0) returned = self._call_input_choice() - self.assertEqual(self.strerr.getvalue(), self.input_choice_output) + self.assertEqual(newstderr.getvalue(), self.input_choice_output) self.assertEqual(returned, 'n') def testInputChoiceNonCapital(self): - self.strin.write('n\n') - self.strin.seek(0) + newstdin.write('n\n') + newstdin.seek(0) returned = self._call_input_choice() - self.assertEqual(self.strerr.getvalue(), self.input_choice_output) + self.assertEqual(newstderr.getvalue(), self.input_choice_output) self.assertEqual(returned, 'n') def testInputChoiceIncorrectAnswer(self): - self.strin.write('X\nN\n') - self.strin.seek(0) + newstdin.write('X\nN\n') + newstdin.seek(0) returned = self._call_input_choice() - self.assertEqual(self.strerr.getvalue(), self.input_choice_output * 2) + self.assertEqual(newstderr.getvalue(), self.input_choice_output * 2) self.assertEqual(returned, 'n') def test_input_list_choice(self): @@ -255,9 +297,9 @@ options = ('answer 1', 'answer 2', 'answer 3') rv = pywikibot.bot.input_list_choice('question', options, '2') - self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(newstdout.getvalue(), '') self.assertEqual( - self.strerr.getvalue(), + newstderr.getvalue(), ''.join('{}: {}\n'.format(num, items) for num, items in enumerate(options, start=1)) + 'question (default: 2): ') @@ -273,17 +315,17 @@ def testOutputColorizedText(self): pywikibot.output(self.str1) - self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(newstdout.getvalue(), '') self.assertEqual( - self.strerr.getvalue(), + newstderr.getvalue(), 'text \x1b[95mlight purple text\x1b[0m text\n') def testOutputNoncolorizedText(self): pywikibot.config.colorized_output = False pywikibot.output(self.str1) - self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(newstdout.getvalue(), '') self.assertEqual( - self.strerr.getvalue(), + newstderr.getvalue(), 'text light purple text text ***\n') str2 = ('normal text \03{lightpurple} light purple ' @@ -293,9 +335,9 @@ def testOutputColorCascade_incorrect(self): """Test incorrect behavior of testOutputColorCascade.""" pywikibot.output(self.str2) - self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(newstdout.getvalue(), '') self.assertEqual( - self.strerr.getvalue(), + newstderr.getvalue(), 'normal text \x1b[95m light purple ' '\x1b[94m light blue \x1b[95m light purple ' '\x1b[0m normal text\n') @@ -308,18 +350,18 @@ def testOutputUnicodeText(self): pywikibot.output('Заглавная_страница') - self.assertEqual(self.strout.getvalue(), '') - self.assertEqual(self.strerr.getvalue(), 'Заглавная_страница\n') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'Заглавная_страница\n') def testInputUnicodeText(self): - self.strin.write('Заглавная_страница\n') - self.strin.seek(0) + newstdin.write('Заглавная_страница\n') + newstdin.seek(0) returned = pywikibot.input('Википедию? ') - self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(newstdout.getvalue(), '') self.assertEqual( - self.strerr.getvalue(), 'Википедию? ') + newstderr.getvalue(), 'Википедию? ') self.assertIsInstance(returned, str) self.assertEqual(returned, 'Заглавная_страница') @@ -334,9 +376,9 @@ pywikibot.bot.ui.encoding = 'latin-1' pywikibot.config.transliterate = True pywikibot.output('abcd АБГД αβγδ あいうえお') - self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(newstdout.getvalue(), '') self.assertEqual( - self.strerr.getvalue(), + newstderr.getvalue(), 'abcd \x1b[93mA\x1b[0m\x1b[93mB\x1b[0m\x1b[93mG\x1b[0m' '\x1b[93mD\x1b[0m \x1b[93ma\x1b[0m\x1b[93mb\x1b[0m\x1b[93mg' '\x1b[0m\x1b[93md\x1b[0m \x1b[93ma\x1b[0m\x1b[93mi\x1b[0m' @@ -357,9 +399,8 @@ def setUp(self): """Create dummy instances for the test and patch encounter_color.""" super().setUp() + self.stream = io.StringIO() self.ui_obj = self.ui_class() - # Write to sys.stdout stream, which we'll redirect to the stream below - self.redirect = io.StringIO() self._orig_encounter_color = self.ui_obj.encounter_color self.ui_obj.encounter_color = self._encounter_color self._index = 0 @@ -371,6 +412,10 @@ self.assertEqual(self._index, len(self._colors) if self.expect_color else 0) + def _getvalue(self): + """Get the value of the stream.""" + return self.stream.getvalue() + def _encounter_color(self, color, target_stream): """Patched encounter_color method.""" raise AssertionError('This method should not be invoked') @@ -378,51 +423,41 @@ def test_no_color(self): """Test a string without any colors.""" self._colors = () - with redirect_stdout(self.redirect) as f: - self.ui_obj._print('Hello world you!', self.ui_obj.stdout) - self.assertEqual(f.getvalue(), 'Hello world you!') + self.ui_obj._print('Hello world you!', self.stream) + self.assertEqual(self._getvalue(), 'Hello world you!') def test_one_color(self): """Test a string using one color.""" self._colors = (('red', 6), ('default', 10)) - with redirect_stdout(self.redirect) as f: - self.ui_obj._print('Hello \03{red}world you!', self.ui_obj.stdout) - self.assertEqual(f.getvalue(), self.expected) + self.ui_obj._print('Hello \03{red}world you!', self.stream) + self.assertEqual(self._getvalue(), self.expected) def test_flat_color(self): """Test using colors with defaulting in between.""" self._colors = (('red', 6), ('default', 6), ('yellow', 3), ('default', 1)) - with redirect_stdout(self.redirect) as f: - self.ui_obj._print( - 'Hello \03{red}world \03{default}you\03{yellow}!', - self.ui_obj.stdout) - self.assertEqual(f.getvalue(), self.expected) + self.ui_obj._print('Hello \03{red}world \03{default}you\03{yellow}!', + self.stream) + self.assertEqual(self._getvalue(), self.expected) def test_stack_with_pop_color(self): """Test using stacked colors and just popping the latest color.""" self._colors = (('red', 6), ('yellow', 6), ('red', 3), ('default', 1)) - with redirect_stdout(self.redirect) as f: - self.ui_obj._print( - 'Hello \03{red}world \03{yellow}you\03{previous}!', - self.ui_obj.stdout) - self.assertEqual(f.getvalue(), self.expected) + self.ui_obj._print('Hello \03{red}world \03{yellow}you\03{previous}!', + self.stream) + self.assertEqual(self._getvalue(), self.expected) def test_stack_implicit_color(self): """Test using stacked colors without popping any.""" self._colors = (('red', 6), ('yellow', 6), ('default', 4)) - with redirect_stdout(self.redirect) as f: - self.ui_obj._print('Hello \03{red}world \03{yellow}you!', - self.ui_obj.stdout) - self.assertEqual(f.getvalue(), self.expected) + self.ui_obj._print('Hello \03{red}world \03{yellow}you!', self.stream) + self.assertEqual(self._getvalue(), self.expected) def test_one_color_newline(self): """Test with trailing new line and one color.""" self._colors = (('red', 6), ('default', 11)) - with redirect_stdout(self.redirect) as f: - self.ui_obj._print('Hello \03{red}world you!\n', - self.ui_obj.stdout) - self.assertEqual(f.getvalue(), self.expected + '\n') + self.ui_obj._print('Hello \03{red}world you!\n', self.stream) + self.assertEqual(self._getvalue(), self.expected + '\n') class FakeUIColorizedTestBase(TestCase): @@ -454,11 +489,11 @@ def _encounter_color(self, color, target_stream): """Verify that the written data, color and stream are correct.""" - self.assertIs(target_stream, self.ui_obj.stdout) + self.assertIs(target_stream, self.stream) expected_color = self._colors[self._index][0] self._index += 1 self.assertEqual(color, expected_color) - self.assertLength(self.redirect.getvalue(), + self.assertLength(self.stream.getvalue(), sum(e[1] for e in self._colors[:self._index])) @@ -484,7 +519,7 @@ ctypes = FakeModule.create_dotted('ctypes.windll.kernel32') ctypes.windll.kernel32.SetConsoleTextAttribute = self._handle_setattr terminal_interface_win32.ctypes = ctypes - self.ui_obj.stdout._hConsole = object() + self.stream._hConsole = object() def tearDown(self): """Unpatch the ctypes import and check that all colors were used.""" @@ -497,12 +532,12 @@ def _handle_setattr(self, handle, attribute): """Dummy method to handle SetConsoleTextAttribute.""" - self.assertIs(handle, self.ui_obj.stdout._hConsole) + self.assertIs(handle, self.stream._hConsole) color = self._colors[self._index][0] self._index += 1 color = terminal_interface_win32.windowsColors[color] self.assertEqual(attribute, color) - self.assertLength(self.redirect.getvalue(), + self.assertLength(self.stream.getvalue(), sum(e[1] for e in self._colors[:self._index])) @@ -518,7 +553,7 @@ def setUp(self): """Change the local stream's console to None to disable colors.""" super().setUp() - self.ui_obj.stdout._hConsole = None + self.stream._hConsole = None if __name__ == '__main__': # pragma: no cover -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/748274 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: Ic5a82622444f47aad9ee17548fb9bf9c54489f42 Gerrit-Change-Number: 748274 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Chris Maynor <cmchrismaynor(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Add wpbeta and wsbeta to test matrix
by jenkins-bot (Code Review) 15 Dec '21

15 Dec '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/745195 ) Change subject: [tests] Add wpbeta and wsbeta to test matrix ...................................................................... [tests] Add wpbeta and wsbeta to test matrix Bug: T296371 Change-Id: I6c34b949d855d8f74833f08a7e73e8ad48413bc0 --- M .github/workflows/pywikibot-ci.yml 1 file changed, 25 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 8c6d951..65302f3 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -26,6 +26,17 @@ site: ["wikipedia:en", "wikisource:zh"] test_prod_only: [true] include: + - python-version: "3.6" + family: wpbeta + code: en + experimental: true + - python-version: "3.6" + family: wpbeta + code: zh + experimental: true + - python-version: "3.5" + site: wsbeta:en + experimental: true - python-version: "3.7" site: "wikipedia:test" - python-version: "3.7" @@ -62,9 +73,22 @@ pip install wikitextparser python -c "import setuptools; print('setuptools:', setuptools.__version__)" + - name: Generate family files + run: | + if [ ${{matrix.family || 0}} == wpbeta ]; then + python pwb.py generate_family_file http://${{matrix.code}}.wikipedia.beta.wmflabs.org/ wpbeta y + fi + if [ ${{matrix.site || 0}} == 'wsbeta:en' ]; then + python pwb.py generate_family_file http://en.wikisource.beta.wmflabs.org/ wsbeta y + fi + - name: Generate user files run: | - python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -v -debug + if [ ${{matrix.site}} ]; then + python -Werror::UserWarning -m pwb generate_user_files -site:${{matrix.site}} -v -debug + else + python -Werror::UserWarning -m pwb generate_user_files -family:${{matrix.family}} -lang:${{matrix.code}} -v -debug + fi echo "max_retries = 3" >> user-config.py echo "maximum_GET_length = 5000" >> user-config.py echo "console_encoding = 'utf8'" >> user-config.py -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/745195 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: I6c34b949d855d8f74833f08a7e73e8ad48413bc0 Gerrit-Change-Number: 745195 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Legoktm <legoktm(a)debian.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Add macOS to github test matrix
by jenkins-bot (Code Review) 15 Dec '21

15 Dec '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/745214 ) Change subject: [tests] Add macOS to github test matrix ...................................................................... [tests] Add macOS to github test matrix Bug: T110925 Change-Id: Ic77f1a8a7178b1aa7b00f35a48ce36b84a9ad48a --- M .github/workflows/pywikibot-ci.yml 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.github/workflows/pywikibot-ci.yml b/.github/workflows/pywikibot-ci.yml index 8c6d951..f536b54 100644 --- a/.github/workflows/pywikibot-ci.yml +++ b/.github/workflows/pywikibot-ci.yml @@ -15,7 +15,7 @@ jobs: build: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os || 'ubuntu-latest' }} continue-on-error: ${{ matrix.experimental || false }} strategy: @@ -41,6 +41,9 @@ - python-version: "3.11.0-alpha.2" site: "wikipedia:test" experimental: true + - python-version: 3 + site: "wikipedia:de" + os: macOS-latest steps: - uses: actions/checkout@v2 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/745214 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: Ic77f1a8a7178b1aa7b00f35a48ce36b84a9ad48a Gerrit-Change-Number: 745214 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Legoktm <legoktm(a)debian.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: logging: Fix redirection for terminal interfaces
by jenkins-bot (Code Review) 15 Dec '21

15 Dec '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743725 ) Change subject: logging: Fix redirection for terminal interfaces ...................................................................... logging: Fix redirection for terminal interfaces Redirection context managers contextlib.stderr and contextlib.stdout redirect from respective streams by temporarily changing the values of global variables sys.stderr or sys.stdout. 'Caching' these variables as instance attributes in UI means that these variable changes are not tracked, leading to unexpected redirect behavior. One solution might be to explicitly refer to sys.stderr and sys.stdout in the UI code, but handlers initialized with these in the UI will still face the same 'caching' issue. The solution here is to simply resolve the target stream to (potentially redirected) sys.stderr or sys.stdout at write time. This obviously allows writing to monkey-patched sys streams, which is hopefully not an issue. Bug: T283808 Change-Id: Ia11ae4dfcc87216ad9f5f97aacb1478a44142a66 --- M pywikibot/userinterfaces/terminal_interface_base.py M pywikibot/userinterfaces/terminal_interface_unix.py M tests/ui_tests.py 3 files changed, 127 insertions(+), 150 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index c288bdc..1d87b67 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -71,9 +71,9 @@ This caches the std-streams locally so any attempts to monkey-patch the streams later will not work. """ - self.stdin = sys.stdin - self.stdout = sys.stdout - self.stderr = sys.stderr + self.stdin = sys.__stdin__ + self.stdout = sys.__stdout__ + self.stderr = sys.__stderr__ self.argv = sys.argv self.encoding = config.console_encoding self.transliteration_target = config.transliteration_target @@ -141,8 +141,24 @@ return cls.split_col_pat.search(color).groups() def _write(self, text, target_stream): - """Optionally encode and write the text to the target stream.""" - target_stream.write(text) + """ + Optionally encode and write the text to the target stream. + + sys.stderr and sys.stdout are frozen upon initialization to original + streams (which are stored in the sys module as sys.__stderr__ and + sys.__stdout__). This works fine except when using redirect_stderr or + redirect_stdout context managers, where values of global sys.stderr and + sys.stdout are temporarily changed to a redirecting StringIO stream, + in which case writing to the frozen streams (which are still set to + sys.__stderr__ / sys.__stdout__) will not write to the redirecting + stream as expected. So, we check the target stream against the frozen + streams, and then write to the (potentially redirected) sys.stderr or + sys.stdout stream. + """ + if target_stream == self.stderr: + sys.stderr.write(text) + elif target_stream == self.stdout: + sys.stdout.write(text) def support_color(self, target_stream): """Return whether the target stream does support colors.""" diff --git a/pywikibot/userinterfaces/terminal_interface_unix.py b/pywikibot/userinterfaces/terminal_interface_unix.py index 8d82f32..eaba92a 100755 --- a/pywikibot/userinterfaces/terminal_interface_unix.py +++ b/pywikibot/userinterfaces/terminal_interface_unix.py @@ -51,7 +51,3 @@ if bg is not None: bg = unixColors[bg] self._write(self.make_unix_bg_color(bg), target_stream) - - def _write(self, text, target_stream): - """Optionally encode and write the text to the target stream.""" - target_stream.write(text) diff --git a/tests/ui_tests.py b/tests/ui_tests.py index e9af702..7eaa8b3 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -7,10 +7,9 @@ import io import logging import os -import sys import unittest - -from contextlib import suppress +from contextlib import redirect_stdout, suppress +from unittest.mock import patch import pywikibot from pywikibot.bot import ( @@ -33,42 +32,6 @@ from tests.utils import FakeModule -class Stream: - - """Handler for a StringIO instance able to patch itself.""" - - def __init__(self, name: str, patched_streams: dict): - """ - Create a new stream with a StringIO instance. - - :param name: The part after 'std' (e.g. 'err'). - :param patched_streams: A mapping which maps the original stream to - the patched stream. - """ - self._stream = io.StringIO() - self._name = 'std{}'.format(name) - self._original = getattr(sys, self._name) - patched_streams[self._original] = self._stream - - def __repr__(self): - return '<patched {} {!r} wrapping {!r}>'.format( - self._name, self._stream, self._original) - - def reset(self): - """Reset own stream.""" - self._stream.truncate(0) - self._stream.seek(0) - - -patched_streams = {} -strout = Stream('out', patched_streams) -strerr = Stream('err', patched_streams) -strin = Stream('in', {}) - -newstdout = strout._stream -newstderr = strerr._stream -newstdin = strin._stream - logger = logging.getLogger('pywiki') loggingcontext = {'caller_name': 'ui_tests', 'caller_file': 'ui_tests', @@ -84,19 +47,21 @@ def setUp(self): super().setUp() + # Here we patch standard input, output, and errors, essentially + # redirecting to StringIO streams + self.stdout_patcher = patch('sys.stdout', new_callable=io.StringIO) + self.strout = self.stdout_patcher.start() + self.stderr_patcher = patch('sys.stderr', new_callable=io.StringIO) + self.strerr = self.stderr_patcher.start() + self.stdin_patcher = patch('sys.stdin', new_callable=io.StringIO) + self.strin = self.stdin_patcher.start() pywikibot.bot.set_interface('terminal') - self.org_print = pywikibot.bot.ui._print self.org_input = pywikibot.bot.ui._raw_input - pywikibot.bot.ui._print = self._patched_print pywikibot.bot.ui._raw_input = self._patched_input - strout.reset() - strerr.reset() - strin.reset() - pywikibot.config.colorized_output = True pywikibot.config.transliterate = False pywikibot.ui.transliteration_target = None @@ -105,23 +70,16 @@ def tearDown(self): super().tearDown() - pywikibot.bot.ui._print = self.org_print + self.stdout_patcher.stop() + self.stderr_patcher.stop() + self.stdin_patcher.stop() + pywikibot.bot.ui._raw_input = self.org_input pywikibot.bot.set_interface('buffer') - def _patched_print(self, text, target_stream): - try: - stream = patched_streams[target_stream] - except KeyError: - expected = pywikibot.userinterfaces.win32_unicode.UnicodeOutput - assert isinstance(target_stream, expected) - assert target_stream._stream - stream = patched_streams[target_stream._stream] - self.org_print(text, stream) - def _patched_input(self): - return strin._stream.readline().strip() + return self.strin.readline().strip() class TestExceptionError(Exception): @@ -149,56 +107,56 @@ for text, level, out, err in self.tests: with self.subTest(test=text): logger.log(level, text, extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), out) - self.assertEqual(newstderr.getvalue(), err) + self.assertEqual(self.strout.getvalue(), out) + self.assertEqual(self.strerr.getvalue(), err) # reset terminal files - strout.reset() - strerr.reset() - strin.reset() + for stream in [self.strout, self.strerr, self.strin]: + stream.truncate(0) + stream.seek(0) def test_output(self): pywikibot.output('output') - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), 'output\n') + self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(self.strerr.getvalue(), 'output\n') def test_stdout(self): pywikibot.stdout('output') - self.assertEqual(newstdout.getvalue(), 'output\n') - self.assertEqual(newstderr.getvalue(), '') + self.assertEqual(self.strout.getvalue(), 'output\n') + self.assertEqual(self.strerr.getvalue(), '') def test_warning(self): pywikibot.warning('warning') - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), 'WARNING: warning\n') + self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(self.strerr.getvalue(), 'WARNING: warning\n') def test_error(self): pywikibot.error('error') - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), 'ERROR: error\n') + self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(self.strerr.getvalue(), 'ERROR: error\n') def test_log(self): pywikibot.log('log') - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), '') + self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(self.strerr.getvalue(), '') def test_critical(self): pywikibot.critical('critical') - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), 'CRITICAL: critical\n') + self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(self.strerr.getvalue(), 'CRITICAL: critical\n') def test_debug(self): pywikibot.debug('debug', 'test') - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), '') + self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(self.strerr.getvalue(), '') def test_exception(self): try: raise TestExceptionError('Testing Exception') except TestExceptionError: pywikibot.exception('exception') - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), + self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(self.strerr.getvalue(), 'ERROR: TestExceptionError: Testing Exception\n') def test_exception_tb(self): @@ -206,8 +164,8 @@ raise TestExceptionError('Testing Exception') except TestExceptionError: pywikibot.exception('exception', tb=True) - self.assertEqual(newstdout.getvalue(), '') - stderrlines = newstderr.getvalue().split('\n') + self.assertEqual(self.strout.getvalue(), '') + stderrlines = self.strerr.getvalue().split('\n') self.assertEqual(stderrlines[0], 'ERROR: TestExceptionError: Testing Exception') self.assertEqual(stderrlines[1], 'Traceback (most recent call last):') @@ -230,22 +188,22 @@ input_choice_output = 'question ([A]nswer 1, a[n]swer 2, an[s]wer 3): ' def testInput(self): - newstdin.write('input to read\n') - newstdin.seek(0) + self.strin.write('input to read\n') + self.strin.seek(0) returned = pywikibot.input('question') - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), 'question: ') + self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(self.strerr.getvalue(), 'question: ') self.assertIsInstance(returned, str) self.assertEqual(returned, 'input to read') def test_input_yn(self): - newstdin.write('\n') - newstdin.seek(0) + self.strin.write('\n') + self.strin.seek(0) returned = pywikibot.input_yn('question', False, automatic_quit=False) - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), 'question ([y]es, [N]o): ') + self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(self.strerr.getvalue(), 'question ([y]es, [N]o): ') self.assertFalse(returned) def _call_input_choice(self): @@ -257,39 +215,39 @@ 'A', automatic_quit=False) - self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(self.strout.getvalue(), '') self.assertIsInstance(rv, str) return rv def testInputChoiceDefault(self): - newstdin.write('\n') - newstdin.seek(0) + self.strin.write('\n') + self.strin.seek(0) returned = self._call_input_choice() self.assertEqual(returned, 'a') def testInputChoiceCapital(self): - newstdin.write('N\n') - newstdin.seek(0) + self.strin.write('N\n') + self.strin.seek(0) returned = self._call_input_choice() - self.assertEqual(newstderr.getvalue(), self.input_choice_output) + self.assertEqual(self.strerr.getvalue(), self.input_choice_output) self.assertEqual(returned, 'n') def testInputChoiceNonCapital(self): - newstdin.write('n\n') - newstdin.seek(0) + self.strin.write('n\n') + self.strin.seek(0) returned = self._call_input_choice() - self.assertEqual(newstderr.getvalue(), self.input_choice_output) + self.assertEqual(self.strerr.getvalue(), self.input_choice_output) self.assertEqual(returned, 'n') def testInputChoiceIncorrectAnswer(self): - newstdin.write('X\nN\n') - newstdin.seek(0) + self.strin.write('X\nN\n') + self.strin.seek(0) returned = self._call_input_choice() - self.assertEqual(newstderr.getvalue(), self.input_choice_output * 2) + self.assertEqual(self.strerr.getvalue(), self.input_choice_output * 2) self.assertEqual(returned, 'n') def test_input_list_choice(self): @@ -297,9 +255,9 @@ options = ('answer 1', 'answer 2', 'answer 3') rv = pywikibot.bot.input_list_choice('question', options, '2') - self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(self.strout.getvalue(), '') self.assertEqual( - newstderr.getvalue(), + self.strerr.getvalue(), ''.join('{}: {}\n'.format(num, items) for num, items in enumerate(options, start=1)) + 'question (default: 2): ') @@ -315,17 +273,17 @@ def testOutputColorizedText(self): pywikibot.output(self.str1) - self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(self.strout.getvalue(), '') self.assertEqual( - newstderr.getvalue(), + self.strerr.getvalue(), 'text \x1b[95mlight purple text\x1b[0m text\n') def testOutputNoncolorizedText(self): pywikibot.config.colorized_output = False pywikibot.output(self.str1) - self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(self.strout.getvalue(), '') self.assertEqual( - newstderr.getvalue(), + self.strerr.getvalue(), 'text light purple text text ***\n') str2 = ('normal text \03{lightpurple} light purple ' @@ -335,9 +293,9 @@ def testOutputColorCascade_incorrect(self): """Test incorrect behavior of testOutputColorCascade.""" pywikibot.output(self.str2) - self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(self.strout.getvalue(), '') self.assertEqual( - newstderr.getvalue(), + self.strerr.getvalue(), 'normal text \x1b[95m light purple ' '\x1b[94m light blue \x1b[95m light purple ' '\x1b[0m normal text\n') @@ -350,18 +308,18 @@ def testOutputUnicodeText(self): pywikibot.output('Заглавная_страница') - self.assertEqual(newstdout.getvalue(), '') - self.assertEqual(newstderr.getvalue(), 'Заглавная_страница\n') + self.assertEqual(self.strout.getvalue(), '') + self.assertEqual(self.strerr.getvalue(), 'Заглавная_страница\n') def testInputUnicodeText(self): - newstdin.write('Заглавная_страница\n') - newstdin.seek(0) + self.strin.write('Заглавная_страница\n') + self.strin.seek(0) returned = pywikibot.input('Википедию? ') - self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(self.strout.getvalue(), '') self.assertEqual( - newstderr.getvalue(), 'Википедию? ') + self.strerr.getvalue(), 'Википедию? ') self.assertIsInstance(returned, str) self.assertEqual(returned, 'Заглавная_страница') @@ -376,9 +334,9 @@ pywikibot.bot.ui.encoding = 'latin-1' pywikibot.config.transliterate = True pywikibot.output('abcd АБГД αβγδ あいうえお') - self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(self.strout.getvalue(), '') self.assertEqual( - newstderr.getvalue(), + self.strerr.getvalue(), 'abcd \x1b[93mA\x1b[0m\x1b[93mB\x1b[0m\x1b[93mG\x1b[0m' '\x1b[93mD\x1b[0m \x1b[93ma\x1b[0m\x1b[93mb\x1b[0m\x1b[93mg' '\x1b[0m\x1b[93md\x1b[0m \x1b[93ma\x1b[0m\x1b[93mi\x1b[0m' @@ -399,8 +357,9 @@ def setUp(self): """Create dummy instances for the test and patch encounter_color.""" super().setUp() - self.stream = io.StringIO() self.ui_obj = self.ui_class() + # Write to sys.stdout stream, which we'll redirect to the stream below + self.redirect = io.StringIO() self._orig_encounter_color = self.ui_obj.encounter_color self.ui_obj.encounter_color = self._encounter_color self._index = 0 @@ -412,10 +371,6 @@ self.assertEqual(self._index, len(self._colors) if self.expect_color else 0) - def _getvalue(self): - """Get the value of the stream.""" - return self.stream.getvalue() - def _encounter_color(self, color, target_stream): """Patched encounter_color method.""" raise AssertionError('This method should not be invoked') @@ -423,41 +378,51 @@ def test_no_color(self): """Test a string without any colors.""" self._colors = () - self.ui_obj._print('Hello world you!', self.stream) - self.assertEqual(self._getvalue(), 'Hello world you!') + with redirect_stdout(self.redirect) as f: + self.ui_obj._print('Hello world you!', self.ui_obj.stdout) + self.assertEqual(f.getvalue(), 'Hello world you!') def test_one_color(self): """Test a string using one color.""" self._colors = (('red', 6), ('default', 10)) - self.ui_obj._print('Hello \03{red}world you!', self.stream) - self.assertEqual(self._getvalue(), self.expected) + with redirect_stdout(self.redirect) as f: + self.ui_obj._print('Hello \03{red}world you!', self.ui_obj.stdout) + self.assertEqual(f.getvalue(), self.expected) def test_flat_color(self): """Test using colors with defaulting in between.""" self._colors = (('red', 6), ('default', 6), ('yellow', 3), ('default', 1)) - self.ui_obj._print('Hello \03{red}world \03{default}you\03{yellow}!', - self.stream) - self.assertEqual(self._getvalue(), self.expected) + with redirect_stdout(self.redirect) as f: + self.ui_obj._print( + 'Hello \03{red}world \03{default}you\03{yellow}!', + self.ui_obj.stdout) + self.assertEqual(f.getvalue(), self.expected) def test_stack_with_pop_color(self): """Test using stacked colors and just popping the latest color.""" self._colors = (('red', 6), ('yellow', 6), ('red', 3), ('default', 1)) - self.ui_obj._print('Hello \03{red}world \03{yellow}you\03{previous}!', - self.stream) - self.assertEqual(self._getvalue(), self.expected) + with redirect_stdout(self.redirect) as f: + self.ui_obj._print( + 'Hello \03{red}world \03{yellow}you\03{previous}!', + self.ui_obj.stdout) + self.assertEqual(f.getvalue(), self.expected) def test_stack_implicit_color(self): """Test using stacked colors without popping any.""" self._colors = (('red', 6), ('yellow', 6), ('default', 4)) - self.ui_obj._print('Hello \03{red}world \03{yellow}you!', self.stream) - self.assertEqual(self._getvalue(), self.expected) + with redirect_stdout(self.redirect) as f: + self.ui_obj._print('Hello \03{red}world \03{yellow}you!', + self.ui_obj.stdout) + self.assertEqual(f.getvalue(), self.expected) def test_one_color_newline(self): """Test with trailing new line and one color.""" self._colors = (('red', 6), ('default', 11)) - self.ui_obj._print('Hello \03{red}world you!\n', self.stream) - self.assertEqual(self._getvalue(), self.expected + '\n') + with redirect_stdout(self.redirect) as f: + self.ui_obj._print('Hello \03{red}world you!\n', + self.ui_obj.stdout) + self.assertEqual(f.getvalue(), self.expected + '\n') class FakeUIColorizedTestBase(TestCase): @@ -489,11 +454,11 @@ def _encounter_color(self, color, target_stream): """Verify that the written data, color and stream are correct.""" - self.assertIs(target_stream, self.stream) + self.assertIs(target_stream, self.ui_obj.stdout) expected_color = self._colors[self._index][0] self._index += 1 self.assertEqual(color, expected_color) - self.assertLength(self.stream.getvalue(), + self.assertLength(self.redirect.getvalue(), sum(e[1] for e in self._colors[:self._index])) @@ -519,7 +484,7 @@ ctypes = FakeModule.create_dotted('ctypes.windll.kernel32') ctypes.windll.kernel32.SetConsoleTextAttribute = self._handle_setattr terminal_interface_win32.ctypes = ctypes - self.stream._hConsole = object() + self.ui_obj.stdout._hConsole = object() def tearDown(self): """Unpatch the ctypes import and check that all colors were used.""" @@ -532,12 +497,12 @@ def _handle_setattr(self, handle, attribute): """Dummy method to handle SetConsoleTextAttribute.""" - self.assertIs(handle, self.stream._hConsole) + self.assertIs(handle, self.ui_obj.stdout._hConsole) color = self._colors[self._index][0] self._index += 1 color = terminal_interface_win32.windowsColors[color] self.assertEqual(attribute, color) - self.assertLength(self.stream.getvalue(), + self.assertLength(self.redirect.getvalue(), sum(e[1] for e in self._colors[:self._index])) @@ -553,7 +518,7 @@ def setUp(self): """Change the local stream's console to None to disable colors.""" super().setUp() - self.stream._hConsole = None + self.ui_obj.stdout._hConsole = None if __name__ == '__main__': # pragma: no cover -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/743725 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: Ia11ae4dfcc87216ad9f5f97aacb1478a44142a66 Gerrit-Change-Number: 743725 Gerrit-PatchSet: 3 Gerrit-Owner: Chris Maynor <cmchrismaynor(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Remove site_detect_tests.APIDisabledTestCase
by jenkins-bot (Code Review) 15 Dec '21

15 Dec '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/747505 ) Change subject: [tests] Remove site_detect_tests.APIDisabledTestCase ...................................................................... [tests] Remove site_detect_tests.APIDisabledTestCase API is available for http://wiki.linuxquestions.org Bug: T297781 Change-Id: Ie78da6fd88b1c42313a3d1fdbac3b5f31991e465 --- M tests/site_detect_tests.py 1 file changed, 0 insertions(+), 9 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 0e2ed0d..fd9d397 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -176,15 +176,6 @@ self.assertNoSite('http://wiki.animutationportal.com/index.php/$1') -class APIDisabledTestCase(SiteDetectionTestCase): - - """Test MediaWiki sites without an enabled API.""" - - def test_linuxquestions(self): - """Test detection of MediaWiki sites for wiki.linuxquestions.org.""" - self.assertNoSite('http://wiki.linuxquestions.org/wiki/$1') - - class NoSiteTestCase(SiteDetectionTestCase): """Test detection of non-wiki sites.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/747505 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: Ie78da6fd88b1c42313a3d1fdbac3b5f31991e465 Gerrit-Change-Number: 747505 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Maverick <manpreetkaur9411(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2021