Pywikibot-commits March 2022

pywikibot-commits@lists.wikimedia.org

1 participants
162 discussions

[Gerrit] ...core[master]: remove unnecessary noqa comments

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770153 ) Change subject: remove unnecessary noqa comments ...................................................................... remove unnecessary noqa comments Change-Id: Ia6fa41892195d35538c35a16e673e0948e36dd8d --- M pywikibot/proofreadpage.py M tests/cosmetic_changes_tests.py M tests/family_tests.py M tests/logentries_tests.py M tests/namespace_tests.py 5 files changed, 8 insertions(+), 11 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index 9ce5bf9..895566a 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -77,7 +77,7 @@ _IndexType = Tuple[Optional['IndexPage'], List['IndexPage']] -def decompose(fn: Callable) -> Callable: # type: ignore # noqa: N805 +def decompose(fn: Callable) -> Callable: # type: ignore """Decorator for ProofreadPage. Decompose text if needed and recompose text. @@ -92,7 +92,7 @@ return wrapper -def check_if_cached(fn: Callable) -> Callable: # type: ignore # noqa: N805 +def check_if_cached(fn: Callable) -> Callable: # type: ignore """Decorator for IndexPage to ensure data is cached.""" def wrapper(self: 'IndexPage', *args: Any, **kwargs: Any) -> Any: if self._cached is False: diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py index de22979..bd85465 100755 --- a/tests/cosmetic_changes_tests.py +++ b/tests/cosmetic_changes_tests.py @@ -560,7 +560,7 @@ ISBN_INVALIDLENGTHERROR_RE = 'The number has an invalid length' @classmethod - def setUpClass(cls): # noqa: N802 + def setUpClass(cls): """Skip tests if isbn libraries are missing.""" if not has_module('stdnum', version='1.17'): raise unittest.SkipTest('python-stdnum is not available.') diff --git a/tests/family_tests.py b/tests/family_tests.py index b212c20..17fa26a 100755 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -80,14 +80,12 @@ family = Family.load('wikipedia') other = 'wikipedia' self.assertEqual(family, other) - self.assertFalse(family != other) # noqa: H204 def test_ne_family_with_string_repr_different_family(self): """Test that Family and string with different name are not equal.""" family = Family.load('wikipedia') other = 'wikisource' self.assertNotEqual(family, other) - self.assertFalse(family == other) # noqa: H204 def test_eq_family_with_string_repr_not_existing_family(self): """Test that Family and string with different name are not equal.""" diff --git a/tests/logentries_tests.py b/tests/logentries_tests.py index 30717be..357f13b 100755 --- a/tests/logentries_tests.py +++ b/tests/logentries_tests.py @@ -279,7 +279,6 @@ le4 = next(gen1) le5 = next(gen2) self.assertEqual(le1, le2) - self.assertFalse(le1 != le2) # noqa: H204 self.assertNotEqual(le1, le3) self.assertNotEqual(le1, site) self.assertIsInstance(le4, OtherLogEntry) diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index 5549c9e..e0f18b0 100755 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -137,9 +137,9 @@ self.assertEqual(a, 0) self.assertEqual(a, '') - self.assertFalse(a < 0) # noqa: H205 - self.assertFalse(a > 0) # noqa: H205 - self.assertNotEqual(a, None) # noqa: H203 + self.assertGreaterEqual(a, 0) + self.assertLessEqual(a, 0) + self.assertIsNotNone(a) self.assertGreater(a, -1) @@ -166,8 +166,8 @@ self.assertEqual(x, 'image') self.assertEqual(x, 'Image') - self.assertFalse(x < 6) # noqa: H205 - self.assertFalse(x > 6) # noqa: H205 + self.assertGreaterEqual(x, 6) + self.assertLessEqual(x, 6) self.assertEqual(y, 'ملف') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770153 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: Ia6fa41892195d35538c35a16e673e0948e36dd8d Gerrit-Change-Number: 770153 Gerrit-PatchSet: 2 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 1 month

[Gerrit] ...core[master]: match executable bits with shebangs

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770152 ) Change subject: match executable bits with shebangs ...................................................................... match executable bits with shebangs Change-Id: I228f8048896d7083b7163cc0d49aa684986fa767 --- M pywikibot/bot_choice.py M pywikibot/cosmetic_changes.py M pywikibot/families/vikidia_family.py M pywikibot/userinterfaces/buffer_interface.py M pywikibot/userinterfaces/terminal_interface_base.py M pywikibot/userinterfaces/terminal_interface_unix.py M pywikibot/userinterfaces/terminal_interface_win32.py M pywikibot/userinterfaces/win32_unicode.py M setup.py M tests/add_text_tests.py M tests/api_tests.py M tests/archive/disambredir_tests.py M tests/archive/imagecopy_tests.py M tests/archive/isbn_tests.py M tests/archivebot_tests.py M tests/basesite_tests.py M tests/bot_tests.py M tests/cache_tests.py M tests/category_bot_tests.py M tests/category_tests.py M tests/checkimages_tests.py M tests/collections_tests.py M tests/cosmetic_changes_tests.py M tests/data/csv_ingestion.csv M tests/data_ingestion_tests.py M tests/datasite_tests.py M tests/date_tests.py M tests/deletionbot_tests.py M tests/deprecation_tests.py M tests/diff_tests.py M tests/djvu_tests.py M tests/dry_api_tests.py M tests/dry_site_tests.py M tests/echo_tests.py M tests/edit_failure_tests.py M tests/edit_tests.py M tests/eventstreams_tests.py M tests/family_tests.py M tests/file_tests.py M tests/fixes_tests.py M tests/fixing_redirects_tests.py M tests/flow_edit_tests.py M tests/flow_tests.py M tests/flow_thanks_tests.py M tests/generate_family_file_tests.py M tests/generate_user_files_tests.py M tests/http_tests.py M tests/i18n_tests.py M tests/interwiki_graph_tests.py M tests/interwiki_link_tests.py M tests/interwikidata_tests.py M tests/interwikimap_tests.py M tests/l10n_tests.py M tests/link_tests.py M tests/linter_tests.py M tests/logentries_tests.py M tests/login_tests.py M tests/mediawikiversion_tests.py M tests/mysql_tests.py M tests/namespace_tests.py M tests/noreferences_tests.py M tests/oauth_tests.py M tests/page_tests.py M tests/pagegenerators_tests.py M tests/paraminfo_tests.py M tests/patrolbot_tests.py M tests/plural_tests.py M tests/proofreadpage_tests.py M tests/protectbot_tests.py M tests/pwb/print_argv.py M tests/pwb/print_env.py M tests/pwb/print_locals.py M tests/pwb/print_unicode.py M tests/pwb_tests.py M tests/redirect_bot_tests.py M tests/reflinks_tests.py M tests/replacebot_tests.py M tests/script_tests.py M tests/site_decorators_tests.py M tests/site_detect_tests.py M tests/site_login_logout_tests.py M tests/site_tests.py M tests/siteinfo_tests.py M tests/sparql_tests.py M tests/template_bot_tests.py M tests/tests_tests.py M tests/textlib_tests.py M tests/thanks_tests.py M tests/thread_tests.py M tests/timestamp_tests.py M tests/timestripper_tests.py M tests/titletranslate_tests.py M tests/tk_tests.py M tests/token_tests.py M tests/tools_chars_tests.py M tests/tools_formatter_tests.py M tests/tools_tests.py M tests/ui_options_tests.py M tests/ui_tests.py M tests/update_script_tests.py M tests/upload_tests.py M tests/uploadbot_tests.py M tests/uploadscript_tests.py M tests/user_tests.py M tests/weblinkchecker_tests.py M tests/wikibase_edit_tests.py M tests/wikibase_tests.py M tests/wikistats_tests.py M tests/xmlreader_tests.py 109 files changed, 0 insertions(+), 0 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot_choice.py b/pywikibot/bot_choice.py old mode 100755 new mode 100644 diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py old mode 100755 new mode 100644 diff --git a/pywikibot/families/vikidia_family.py b/pywikibot/families/vikidia_family.py old mode 100755 new mode 100644 diff --git a/pywikibot/userinterfaces/buffer_interface.py b/pywikibot/userinterfaces/buffer_interface.py old mode 100755 new mode 100644 diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py old mode 100755 new mode 100644 diff --git a/pywikibot/userinterfaces/terminal_interface_unix.py b/pywikibot/userinterfaces/terminal_interface_unix.py old mode 100755 new mode 100644 diff --git a/pywikibot/userinterfaces/terminal_interface_win32.py b/pywikibot/userinterfaces/terminal_interface_win32.py old mode 100755 new mode 100644 diff --git a/pywikibot/userinterfaces/win32_unicode.py b/pywikibot/userinterfaces/win32_unicode.py old mode 100755 new mode 100644 diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 diff --git a/tests/add_text_tests.py b/tests/add_text_tests.py old mode 100644 new mode 100755 diff --git a/tests/api_tests.py b/tests/api_tests.py old mode 100644 new mode 100755 diff --git a/tests/archive/disambredir_tests.py b/tests/archive/disambredir_tests.py old mode 100644 new mode 100755 diff --git a/tests/archive/imagecopy_tests.py b/tests/archive/imagecopy_tests.py old mode 100644 new mode 100755 diff --git a/tests/archive/isbn_tests.py b/tests/archive/isbn_tests.py old mode 100644 new mode 100755 diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py old mode 100644 new mode 100755 diff --git a/tests/basesite_tests.py b/tests/basesite_tests.py old mode 100644 new mode 100755 diff --git a/tests/bot_tests.py b/tests/bot_tests.py old mode 100644 new mode 100755 diff --git a/tests/cache_tests.py b/tests/cache_tests.py old mode 100644 new mode 100755 diff --git a/tests/category_bot_tests.py b/tests/category_bot_tests.py old mode 100644 new mode 100755 diff --git a/tests/category_tests.py b/tests/category_tests.py old mode 100644 new mode 100755 diff --git a/tests/checkimages_tests.py b/tests/checkimages_tests.py old mode 100644 new mode 100755 diff --git a/tests/collections_tests.py b/tests/collections_tests.py old mode 100644 new mode 100755 diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py old mode 100644 new mode 100755 diff --git a/tests/data/csv_ingestion.csv b/tests/data/csv_ingestion.csv old mode 100755 new mode 100644 diff --git a/tests/data_ingestion_tests.py b/tests/data_ingestion_tests.py old mode 100644 new mode 100755 diff --git a/tests/datasite_tests.py b/tests/datasite_tests.py old mode 100644 new mode 100755 diff --git a/tests/date_tests.py b/tests/date_tests.py old mode 100644 new mode 100755 diff --git a/tests/deletionbot_tests.py b/tests/deletionbot_tests.py old mode 100644 new mode 100755 diff --git a/tests/deprecation_tests.py b/tests/deprecation_tests.py old mode 100644 new mode 100755 diff --git a/tests/diff_tests.py b/tests/diff_tests.py old mode 100644 new mode 100755 diff --git a/tests/djvu_tests.py b/tests/djvu_tests.py old mode 100644 new mode 100755 diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py old mode 100644 new mode 100755 diff --git a/tests/dry_site_tests.py b/tests/dry_site_tests.py old mode 100644 new mode 100755 diff --git a/tests/echo_tests.py b/tests/echo_tests.py old mode 100644 new mode 100755 diff --git a/tests/edit_failure_tests.py b/tests/edit_failure_tests.py old mode 100644 new mode 100755 diff --git a/tests/edit_tests.py b/tests/edit_tests.py old mode 100644 new mode 100755 diff --git a/tests/eventstreams_tests.py b/tests/eventstreams_tests.py old mode 100644 new mode 100755 diff --git a/tests/family_tests.py b/tests/family_tests.py old mode 100644 new mode 100755 diff --git a/tests/file_tests.py b/tests/file_tests.py old mode 100644 new mode 100755 diff --git a/tests/fixes_tests.py b/tests/fixes_tests.py old mode 100644 new mode 100755 diff --git a/tests/fixing_redirects_tests.py b/tests/fixing_redirects_tests.py old mode 100644 new mode 100755 diff --git a/tests/flow_edit_tests.py b/tests/flow_edit_tests.py old mode 100644 new mode 100755 diff --git a/tests/flow_tests.py b/tests/flow_tests.py old mode 100644 new mode 100755 diff --git a/tests/flow_thanks_tests.py b/tests/flow_thanks_tests.py old mode 100644 new mode 100755 diff --git a/tests/generate_family_file_tests.py b/tests/generate_family_file_tests.py old mode 100644 new mode 100755 diff --git a/tests/generate_user_files_tests.py b/tests/generate_user_files_tests.py old mode 100644 new mode 100755 diff --git a/tests/http_tests.py b/tests/http_tests.py old mode 100644 new mode 100755 diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py old mode 100644 new mode 100755 diff --git a/tests/interwiki_graph_tests.py b/tests/interwiki_graph_tests.py old mode 100644 new mode 100755 diff --git a/tests/interwiki_link_tests.py b/tests/interwiki_link_tests.py old mode 100644 new mode 100755 diff --git a/tests/interwikidata_tests.py b/tests/interwikidata_tests.py old mode 100644 new mode 100755 diff --git a/tests/interwikimap_tests.py b/tests/interwikimap_tests.py old mode 100644 new mode 100755 diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py old mode 100644 new mode 100755 diff --git a/tests/link_tests.py b/tests/link_tests.py old mode 100644 new mode 100755 diff --git a/tests/linter_tests.py b/tests/linter_tests.py old mode 100644 new mode 100755 diff --git a/tests/logentries_tests.py b/tests/logentries_tests.py old mode 100644 new mode 100755 diff --git a/tests/login_tests.py b/tests/login_tests.py old mode 100644 new mode 100755 diff --git a/tests/mediawikiversion_tests.py b/tests/mediawikiversion_tests.py old mode 100644 new mode 100755 diff --git a/tests/mysql_tests.py b/tests/mysql_tests.py old mode 100644 new mode 100755 diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py old mode 100644 new mode 100755 diff --git a/tests/noreferences_tests.py b/tests/noreferences_tests.py old mode 100644 new mode 100755 diff --git a/tests/oauth_tests.py b/tests/oauth_tests.py old mode 100644 new mode 100755 diff --git a/tests/page_tests.py b/tests/page_tests.py old mode 100644 new mode 100755 diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py old mode 100644 new mode 100755 diff --git a/tests/paraminfo_tests.py b/tests/paraminfo_tests.py old mode 100644 new mode 100755 diff --git a/tests/patrolbot_tests.py b/tests/patrolbot_tests.py old mode 100644 new mode 100755 diff --git a/tests/plural_tests.py b/tests/plural_tests.py old mode 100644 new mode 100755 diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py old mode 100644 new mode 100755 diff --git a/tests/protectbot_tests.py b/tests/protectbot_tests.py old mode 100644 new mode 100755 diff --git a/tests/pwb/print_argv.py b/tests/pwb/print_argv.py old mode 100644 new mode 100755 diff --git a/tests/pwb/print_env.py b/tests/pwb/print_env.py old mode 100644 new mode 100755 diff --git a/tests/pwb/print_locals.py b/tests/pwb/print_locals.py old mode 100644 new mode 100755 diff --git a/tests/pwb/print_unicode.py b/tests/pwb/print_unicode.py old mode 100644 new mode 100755 diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py old mode 100644 new mode 100755 diff --git a/tests/redirect_bot_tests.py b/tests/redirect_bot_tests.py old mode 100644 new mode 100755 diff --git a/tests/reflinks_tests.py b/tests/reflinks_tests.py old mode 100644 new mode 100755 diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py old mode 100644 new mode 100755 diff --git a/tests/script_tests.py b/tests/script_tests.py old mode 100644 new mode 100755 diff --git a/tests/site_decorators_tests.py b/tests/site_decorators_tests.py old mode 100644 new mode 100755 diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py old mode 100644 new mode 100755 diff --git a/tests/site_login_logout_tests.py b/tests/site_login_logout_tests.py old mode 100644 new mode 100755 diff --git a/tests/site_tests.py b/tests/site_tests.py old mode 100644 new mode 100755 diff --git a/tests/siteinfo_tests.py b/tests/siteinfo_tests.py old mode 100644 new mode 100755 diff --git a/tests/sparql_tests.py b/tests/sparql_tests.py old mode 100644 new mode 100755 diff --git a/tests/template_bot_tests.py b/tests/template_bot_tests.py old mode 100644 new mode 100755 diff --git a/tests/tests_tests.py b/tests/tests_tests.py old mode 100644 new mode 100755 diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py old mode 100644 new mode 100755 diff --git a/tests/thanks_tests.py b/tests/thanks_tests.py old mode 100644 new mode 100755 diff --git a/tests/thread_tests.py b/tests/thread_tests.py old mode 100644 new mode 100755 diff --git a/tests/timestamp_tests.py b/tests/timestamp_tests.py old mode 100644 new mode 100755 diff --git a/tests/timestripper_tests.py b/tests/timestripper_tests.py old mode 100644 new mode 100755 diff --git a/tests/titletranslate_tests.py b/tests/titletranslate_tests.py old mode 100644 new mode 100755 diff --git a/tests/tk_tests.py b/tests/tk_tests.py old mode 100644 new mode 100755 diff --git a/tests/token_tests.py b/tests/token_tests.py old mode 100644 new mode 100755 diff --git a/tests/tools_chars_tests.py b/tests/tools_chars_tests.py old mode 100644 new mode 100755 diff --git a/tests/tools_formatter_tests.py b/tests/tools_formatter_tests.py old mode 100644 new mode 100755 diff --git a/tests/tools_tests.py b/tests/tools_tests.py old mode 100644 new mode 100755 diff --git a/tests/ui_options_tests.py b/tests/ui_options_tests.py old mode 100644 new mode 100755 diff --git a/tests/ui_tests.py b/tests/ui_tests.py old mode 100644 new mode 100755 diff --git a/tests/update_script_tests.py b/tests/update_script_tests.py old mode 100644 new mode 100755 diff --git a/tests/upload_tests.py b/tests/upload_tests.py old mode 100644 new mode 100755 diff --git a/tests/uploadbot_tests.py b/tests/uploadbot_tests.py old mode 100644 new mode 100755 diff --git a/tests/uploadscript_tests.py b/tests/uploadscript_tests.py old mode 100644 new mode 100755 diff --git a/tests/user_tests.py b/tests/user_tests.py old mode 100644 new mode 100755 diff --git a/tests/weblinkchecker_tests.py b/tests/weblinkchecker_tests.py old mode 100644 new mode 100755 diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py old mode 100644 new mode 100755 diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py old mode 100644 new mode 100755 diff --git a/tests/wikistats_tests.py b/tests/wikistats_tests.py old mode 100644 new mode 100755 diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py old mode 100644 new mode 100755 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770152 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: I228f8048896d7083b7163cc0d49aa684986fa767 Gerrit-Change-Number: 770152 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 1 month

[Gerrit] ...core[master]: [fix] apisite: BaseSite.username() is callable

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770145 ) Change subject: [fix] apisite: BaseSite.username() is callable ...................................................................... [fix] apisite: BaseSite.username() is callable Change-Id: I5c4cb3008eb50b92f097efebe6608041ae338dd0 --- M pywikibot/site/_apisite.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 8eba59a..c5df593 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -512,7 +512,7 @@ :raises TypeError: Inappropriate argument type of 'user' """ if user is None: - user = self.username + user = self.username() param = {} elif isinstance(user, str): param = {'guiuser': user} @@ -558,7 +558,7 @@ ..versionadded:: 7.0 """ with suppress(KeyError): - del self._globaluserinfo[self.username] + del self._globaluserinfo[self.username()] def is_blocked(self, force: bool = False) -> bool: """Return True when logged in user is blocked. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770145 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: I5c4cb3008eb50b92f097efebe6608041ae338dd0 Gerrit-Change-Number: 770145 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 1 month

[Gerrit] ...core[master]: namespace-typing: fix invalid types

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770143 ) Change subject: namespace-typing: fix invalid types ...................................................................... namespace-typing: fix invalid types Change-Id: I4e38226c95b9204a05403e5d95713234e9f903d8 --- M pywikibot/site/_namespace.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/_namespace.py b/pywikibot/site/_namespace.py index 9a52e73..1618449 100644 --- a/pywikibot/site/_namespace.py +++ b/pywikibot/site/_namespace.py @@ -8,12 +8,13 @@ from enum import IntEnum from typing import Optional, Union +from pywikibot.backports import Iterable as IterableType from pywikibot.backports import List from pywikibot.tools import ComparableMixin, SelfCallMixin -NamespaceIDType = 'Union[int, str, Namespace]' -NamespaceArgType = 'Union[NamespaceIDType, Iterable[NamespaceIDType], None]' +NamespaceIDType = Union[int, str, 'Namespace'] +NamespaceArgType = Union[NamespaceIDType, IterableType[NamespaceIDType], None] class BuiltinNamespace(IntEnum): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770143 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: I4e38226c95b9204a05403e5d95713234e9f903d8 Gerrit-Change-Number: 770143 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 1 month

[Gerrit] ...core[master]: exceptions-typing: pages can be a BasePage

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770142 ) Change subject: exceptions-typing: pages can be a BasePage ...................................................................... exceptions-typing: pages can be a BasePage Change-Id: I02d5ddb7b674308f5b1aa626c33dfb17c5bd8c83 --- M pywikibot/exceptions.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index de97765..8fd93ab 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -326,7 +326,7 @@ message = 'Edit to page {title} failed:\n{reason}' - def __init__(self, page: 'pywikibot.page.Page', + def __init__(self, page: 'pywikibot.page.BasePage', reason: Union[str, Exception]) -> None: """Initializer. @@ -379,7 +379,7 @@ """Page receives a title inconsistent with query.""" - def __init__(self, page: 'pywikibot.page.Page', actual: str) -> None: + def __init__(self, page: 'pywikibot.page.BasePage', actual: str) -> None: """Initializer. :param page: Page that caused the exception @@ -455,8 +455,8 @@ 'Page: {page}\n' 'Target page: {target_page} on {target_site}.') - def __init__(self, page: 'pywikibot.page.Page', - target_page: 'pywikibot.page.Page') -> None: + def __init__(self, page: 'pywikibot.page.BasePage', + target_page: 'pywikibot.page.BasePage') -> None: """Initializer. :param target_page: Target page of the redirect. @@ -550,7 +550,7 @@ message = ('Edit to page {title} disallowed by the AbuseFilter.\n' '{info}') - def __init__(self, page: 'pywikibot.page.Page', info: str) -> None: + def __init__(self, page: 'pywikibot.page.BasePage', info: str) -> None: """Initializer.""" self.info = info super().__init__(page) @@ -563,7 +563,7 @@ message = ('Edit to page {title} rejected by spam filter due to ' 'content:\n{url}') - def __init__(self, page: 'pywikibot.page.Page', url: str) -> None: + def __init__(self, page: 'pywikibot.page.BasePage', url: str) -> None: """Initializer.""" self.url = url super().__init__(page) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770142 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: I02d5ddb7b674308f5b1aa626c33dfb17c5bd8c83 Gerrit-Change-Number: 770142 Gerrit-PatchSet: 2 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 1 month

[Gerrit] ...core[master]: [L10N] Update languages_by_size

by jenkins-bot (Code Review)

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

2 years, 1 month

[Gerrit] ...core[master]: [IMPR] use os constants for os._exit

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770125 ) Change subject: [IMPR] use os constants for os._exit ...................................................................... [IMPR] use os constants for os._exit Change-Id: I8fb3a475a275ae7bb0817e9a5eeff57a00ac1c1b --- M pywikibot/daemonize.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/daemonize.py b/pywikibot/daemonize.py index 0cba456..6b433e8 100644 --- a/pywikibot/daemonize.py +++ b/pywikibot/daemonize.py @@ -1,6 +1,6 @@ """Module to daemonize the current process on Unix.""" # -# (C) Pywikibot team, 2007-2021 +# (C) Pywikibot team, 2007-2022 # # Distributed under the terms of the MIT license. # @@ -56,10 +56,11 @@ if chdir: os.chdir('/') return + # Write out the pid path = os.path.basename(sys.argv[0]) + '.pid' with codecs.open(path, 'w', 'utf-8') as f: f.write(str(pid)) # Exit to return control to the terminal # os._exit to prevent the cleanup to run - os._exit(0) + os._exit(os.EX_OK) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770125 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: I8fb3a475a275ae7bb0817e9a5eeff57a00ac1c1b Gerrit-Change-Number: 770125 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 1 month

[Gerrit] ...core[master]: [doc] Update documentation

by Xqt (Code Review)

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770124 ) Change subject: [doc] Update documentation ...................................................................... [doc] Update documentation Change-Id: I33a38cb492d1461bd0ba25aeeee9c3555a47d8c1 --- M pywikibot/page/__init__.py M pywikibot/textlib.py 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 4606772..2d030ce 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -740,7 +740,7 @@ A static redirect must be a valid redirect, and contain the magic word __STATICREDIRECT__. - .. versionchanged:: 7.0.0 + .. versionchanged:: 7.0 __STATICREDIRECT__ can be transcluded :param force: Bypass local caching @@ -1396,9 +1396,9 @@ For the parameters refer :py:mod:`APISite.pagelinks<pywikibot.site.APISite.pagelinks>` - .. versionadded:: 7.0.0 + .. versionadded:: 7.0 the `follow_redirects` keyword argument - .. deprecated:: 7.0.0 + .. deprecated:: 7.0 the positional arguments .. seealso:: https://www.mediawiki.org/wiki/API:Links @@ -5906,7 +5906,7 @@ Uses the first encoding that doesn't cause an error. - .. deprecated:: 6.2.0 + .. deprecated:: 6.2 Use :func:`pywikibot.tools.chars.url2string` instead. :param title: URL-encoded character data to convert diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index d033913..dc313df 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -1928,7 +1928,7 @@ def fix_digits(line): """Make non-latin digits like Persian to latin to parse. - .. deprecated:: 7.0.0 + .. deprecated:: 7.0 Use :func:`to_latin_digits` instead. """ return to_latin_digits(line) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/770124 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: I33a38cb492d1461bd0ba25aeeee9c3555a47d8c1 Gerrit-Change-Number: 770124 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

2 years, 1 month

[Gerrit] ...core[master]: Restore "logging: Fix redirection for terminal interfaces""

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/769911 ) Change subject: Restore "logging: Fix redirection for terminal interfaces"" ...................................................................... Restore "logging: Fix redirection for terminal interfaces"" This reverts commit 55ae880d0980e774a6c8e6a8383c551d4d8769c9. 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: Ibfd4916525367b6698a05088e6e679da9e0aaea2 --- M pywikibot/userinterfaces/terminal_interface_base.py M tests/ui_tests.py 2 files changed, 146 insertions(+), 145 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 b855863..6b3c64b 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -71,10 +71,15 @@ This caches the std-streams locally so any attempts to monkey-patch the streams later will not work. + + .. versionchanged:: 7.1 + memorize original streams """ - self.stdin = sys.stdin - self.stdout = sys.stdout - self.stderr = sys.stderr + # for Windows GUI they can be None under some conditions + self.stdin = sys.__stdin__ or sys.stdin + self.stdout = sys.__stdout__ or sys.stdout + self.stderr = sys.__stderr__ or sys.stderr + self.argv = sys.argv self.encoding = config.console_encoding self.transliteration_target = config.transliteration_target @@ -145,9 +150,37 @@ """ return cls.split_col_pat.search(color).groups() - def _write(self, text, target_stream) -> None: - """Optionally encode and write the text to the target stream.""" - target_stream.write(text) + def _write(self, text: str, target_stream) -> None: + """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. + + .. versionchanged:: 7.1 + instead of writing to `target_stream`, dispatch to + `sys.stderr` or `sys.stdout`. + """ + if target_stream == self.stderr: + sys.stderr.write(text) + elif target_stream == self.stdout: + sys.stdout.write(text) + else: + try: + out, err = self.stdout.name, self.stderr.name + except AttributeError: + out, err = self.stdout, self.stderr + raise OSError( + 'Target stream {} is neither stdin ({}) nor stderr ({})' + .format(target_stream.name, out, err)) def support_color(self, target_stream) -> bool: """Return whether the target stream does support colors.""" diff --git a/tests/ui_tests.py b/tests/ui_tests.py index c9d8109..9f443fd 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -8,9 +8,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 +33,6 @@ from tests.aspects import TestCase, TestCaseBase -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', @@ -83,45 +47,42 @@ net = False def setUp(self): + """Setup test. + + Here we patch standard input, output, and errors, essentially + redirecting to `StringIO` streams. + """ super().setUp() + 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 pywikibot.ui.encoding = 'utf-8' def tearDown(self): + """Cleanup test.""" super().tearDown() - pywikibot.bot.ui._print = self.org_print - pywikibot.bot.ui._raw_input = self.org_input + 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 +110,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 +167,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 +191,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 +218,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 +258,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 +276,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 +296,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 +311,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 +337,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' @@ -421,8 +382,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 @@ -434,10 +396,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') @@ -445,41 +403,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): @@ -504,11 +472,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])) @@ -534,7 +502,7 @@ def setUp(self): """Patch the ctypes import and initialize a stream and UI instance.""" super().setUp() - self.stream.isatty = lambda: self.expect_color + self.ui_obj.stdout.isatty = lambda: self.expect_color class FakeWin32UncolorizedTest(FakeWin32Test): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/769911 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: Ibfd4916525367b6698a05088e6e679da9e0aaea2 Gerrit-Change-Number: 769911 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Chris Maynor <cmchrismaynor(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

2 years, 1 month

[Gerrit] ...core[master]: [cleanup] no longer use win32_unicode for Python 3.6+

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/769693 ) Change subject: [cleanup] no longer use win32_unicode for Python 3.6+ ...................................................................... [cleanup] no longer use win32_unicode for Python 3.6+ This reverts revert 13f59c7f18593601a6635d2f94ad3066b7bec0a3. - flash target in UI._print if necessary. This has to be done if the after a text is processed with UI._print and before a color is changed - get console_handle to set color attribute in Win32UI.encounter_color - define isatty() for Python 3.5 to keep the old behaviour - update and simplify tests - remove unused utils.FakeModule - ignore win32_unicode.py from coverage Bug: T303373 Bug: T283808 Bug: T281042 Change-Id: Icd3f45a8a907bf2c4a11da68e25339b79de11eaf --- M .codecov.yml M pywikibot/userinterfaces/terminal_interface_base.py M pywikibot/userinterfaces/terminal_interface_win32.py M pywikibot/userinterfaces/win32_unicode.py M tests/ui_tests.py M tests/utils.py 6 files changed, 47 insertions(+), 73 deletions(-) Approvals: Chris Maynor: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.codecov.yml b/.codecov.yml index 3314ceb..b19bd5e 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -17,6 +17,7 @@ - pywikibot/backports.py - pywikibot/daemonize.py - pywikibot/families/__init__.py + - pywikibot/userinterfaces/win32_unicode.py - scripts/archive/ - scripts/userscripts/ - scripts/maintenance/colors.py diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index 21c4c87..b855863 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -190,8 +190,13 @@ if current_color != next_color and colorized: # set the new color, but only if they change + # flush first to enable color change on Windows (T283808) + target_stream.flush() self.encounter_color(color_stack[-1], target_stream) + # finally flush stream to show the text, required for Windows (T303373) + target_stream.flush() + def output(self, text, targetStream=None) -> None: """Forward text to cache and flush if output is not locked. diff --git a/pywikibot/userinterfaces/terminal_interface_win32.py b/pywikibot/userinterfaces/terminal_interface_win32.py index 1a0ef51..20d4b12 100755 --- a/pywikibot/userinterfaces/terminal_interface_win32.py +++ b/pywikibot/userinterfaces/terminal_interface_win32.py @@ -6,7 +6,8 @@ # import ctypes -from pywikibot.userinterfaces import terminal_interface_base, win32_unicode +from pywikibot.tools import PYTHON_VERSION +from pywikibot.userinterfaces import terminal_interface_base windowsColors = { @@ -37,16 +38,18 @@ def __init__(self) -> None: """Initializer.""" super().__init__() - (stdin, stdout, stderr, argv) = win32_unicode.get_unicode_console() - self.stdin = stdin - self.stdout = stdout - self.stderr = stderr - self.argv = argv - self.encoding = 'utf-8' + if PYTHON_VERSION == (3, 5): # issue1602 solved in Python 3.6 + from pywikibot.userinterfaces import win32_unicode + stdin, stdout, stderr, argv = win32_unicode.get_unicode_console() + self.stdin = stdin + self.stdout = stdout + self.stderr = stderr + self.argv = argv + self.encoding = 'utf-8' def support_color(self, target_stream): """Return whether the target stream supports actually color.""" - return getattr(target_stream, '_hConsole', None) is not None + return target_stream.isatty() def encounter_color(self, color, target_stream) -> None: """Set the new color.""" @@ -55,8 +58,21 @@ # Merge foreground/backgroung color if needed. if bg is not None: windows_color = windowsColors[bg] << 4 | windows_color - ctypes.windll.kernel32.SetConsoleTextAttribute( - target_stream._hConsole, windows_color) + + if target_stream == self.stdin: + addr = -10 + elif target_stream == self.stdout: + addr = -11 + elif target_stream == self.stderr: + addr = -12 + else: + super().encounter_color(color, target_stream) + + from ctypes.wintypes import DWORD, HANDLE + get_handle = ctypes.WINFUNCTYPE(HANDLE, DWORD)( + ('GetStdHandle', ctypes.windll.kernel32)) + handle = get_handle(DWORD(addr)) + ctypes.windll.kernel32.SetConsoleTextAttribute(handle, windows_color) def _raw_input(self): data = self.stdin.readline() diff --git a/pywikibot/userinterfaces/win32_unicode.py b/pywikibot/userinterfaces/win32_unicode.py index ae7c1f5..75008a4 100755 --- a/pywikibot/userinterfaces/win32_unicode.py +++ b/pywikibot/userinterfaces/win32_unicode.py @@ -153,6 +153,10 @@ _complain('{}.writelines: {!r}'.format(self.name, e)) raise + def isatty(self): + """Return True if the stream is interactive.""" + return self._hConsole is not None + def old_fileno(std_name): """Return the fileno or None if that doesn't work.""" diff --git a/tests/ui_tests.py b/tests/ui_tests.py index 8e78ea3..c9d8109 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -31,7 +31,6 @@ ) from pywikibot.userinterfaces.transliteration import NON_LATIN_DIGITS, _trans from tests.aspects import TestCase, TestCaseBase -from tests.utils import FakeModule class Stream: @@ -487,7 +486,10 @@ """Base class for test cases requiring that colorized output is active.""" + net = False + expect_color = True + expected = 'Hello world you!' def setUp(self): """Force colorized_output to True.""" @@ -500,16 +502,6 @@ pywikibot.config.colorized_output = self._old_config super().tearDown() - -class FakeUnixTest(FakeUIColorizedTestBase, FakeUITest): - - """Test case to allow doing colorized Unix tests in any environment.""" - - net = False - - expected = 'Hello world you!' - ui_class = terminal_interface_unix.UnixUI - def _encounter_color(self, color, target_stream): """Verify that the written data, color and stream are correct.""" self.assertIs(target_stream, self.stream) @@ -520,6 +512,13 @@ sum(e[1] for e in self._colors[:self._index])) +class FakeUnixTest(FakeUIColorizedTestBase, FakeUITest): + + """Test case to allow doing colorized Unix tests in any environment.""" + + ui_class = terminal_interface_unix.UnixUI + + class FakeWin32Test(FakeUIColorizedTestBase, FakeUITest): """ @@ -530,54 +529,21 @@ import these will be unpatched. """ - net = False - - expected = 'Hello world you!' ui_class = terminal_interface_win32.Win32UI def setUp(self): """Patch the ctypes import and initialize a stream and UI instance.""" super().setUp() - self._orig_ctypes = terminal_interface_win32.ctypes - ctypes = FakeModule.create_dotted('ctypes.windll.kernel32') - ctypes.windll.kernel32.SetConsoleTextAttribute = self._handle_setattr - terminal_interface_win32.ctypes = ctypes - self.stream._hConsole = object() - - def tearDown(self): - """Unpatch the ctypes import and check that all colors were used.""" - terminal_interface_win32.ctypes = self._orig_ctypes - super().tearDown() - - def _encounter_color(self, color, target_stream): - """Call the original method.""" - self._orig_encounter_color(color, target_stream) - - def _handle_setattr(self, handle, attribute): - """Dummy method to handle SetConsoleTextAttribute.""" - 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.stream.getvalue(), - sum(e[1] for e in self._colors[:self._index])) + self.stream.isatty = lambda: self.expect_color class FakeWin32UncolorizedTest(FakeWin32Test): """Test case to allow doing uncolorized Win32 tests in any environment.""" - net = False - expected = 'Hello world you! ***' expect_color = False - def setUp(self): - """Change the local stream's console to None to disable colors.""" - super().setUp() - self.stream._hConsole = None - if __name__ == '__main__': # pragma: no cover with suppress(SystemExit): diff --git a/tests/utils.py b/tests/utils.py index 5731aae..35f3372 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -11,7 +11,6 @@ import warnings from contextlib import contextmanager from subprocess import PIPE, Popen, TimeoutExpired -from types import ModuleType import pywikibot from pywikibot import config @@ -60,23 +59,6 @@ return False -class FakeModule(ModuleType): - - """An empty fake module.""" - - @classmethod - def create_dotted(cls, name): - """Create a chain of modules based on the name separated by periods.""" - modules = name.split('.') - mod = None - for mod_name in modules[::-1]: - module = cls(str(mod_name)) - if mod: - setattr(module, mod.__name__, mod) - mod = module - return mod - - class WarningSourceSkipContextManager(warnings.catch_warnings): """ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/769693 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: Icd3f45a8a907bf2c4a11da68e25339b79de11eaf Gerrit-Change-Number: 769693 Gerrit-PatchSet: 8 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Chris Maynor <cmchrismaynor(a)gmail.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Meno25 <meno25mail(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

2 years, 1 month

← Newer
1
...
7
8
9
10
11
12
13
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits March 2022