Pywikibot-commits September 2020

pywikibot-commits@lists.wikimedia.org

1 participants
110 discussions

[Gerrit] ...core[master]: [cleanup] Cleanup pagegenerators.py and tests

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/631196 ) Change subject: [cleanup] Cleanup pagegenerators.py and tests ...................................................................... [cleanup] Cleanup pagegenerators.py and tests Cleanup warnings from IDE, fix docstrings, replace deprecated functions. Change-Id: I81171d1d1a8f509f2de94acab8ef8412d6be097d --- M pywikibot/pagegenerators.py M tests/pagegenerators_tests.py 2 files changed, 11 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 6adcbb0..b301109 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -48,6 +48,7 @@ from pywikibot import date, config, i18n, xmlreader from pywikibot.bot import ShowingListOption from pywikibot.comms import http +from pywikibot.data import api from pywikibot.exceptions import ServerError, UnknownExtension from pywikibot.proofreadpage import ProofreadPage @@ -502,7 +503,7 @@ for i in range(len(self.gens)): if self.namespaces: - if (isinstance(self.gens[i], pywikibot.data.api.QueryGenerator) + if (isinstance(self.gens[i], api.QueryGenerator) and self.gens[i].support_namespace()): self.gens[i].set_namespace(self.namespaces) # QueryGenerator does not support namespace param. @@ -1286,7 +1287,7 @@ @deprecated_args(number='total', step=None, namespace='namespaces', repeat=None, get_redirect=None) -def NewpagesPageGenerator(site=None, namespaces=[0], total=None): +def NewpagesPageGenerator(site=None, namespaces=(0, ), total=None): """ Iterate Page objects for all new titles in a single namespace. @@ -1669,10 +1670,10 @@ on_repo = False if on_repo: if page.namespace() == page.site.property_namespace: - cls = pywikibot.PropertyPage + page_cls = pywikibot.PropertyPage else: - cls = pywikibot.ItemPage - page = cls(page.site, page.title(with_ns=False)) + page_cls = pywikibot.ItemPage + page = page_cls(page.site, page.title(with_ns=False)) else: try: page = pywikibot.ItemPage.fromPage(page) @@ -1957,6 +1958,7 @@ @param show_filtered: Output a message for each page not yielded @type show_filtered: bool """ + ts = None if timestamp: if isinstance(timestamp, str): ts = pywikibot.Timestamp.fromtimestampformat(timestamp) @@ -2169,8 +2171,8 @@ """ A wrapper generator used to exclude if page has a wikibase item or not. - @param gen: Generator to wrap. - @type gen: generator + @param generator: Generator to wrap. + @type generator: generator @param has_item: Exclude pages without an item if True, or only include pages without an item if False @type has_item: bool @@ -2660,7 +2662,7 @@ @param start: skip entries below that value @type start: str or None @param namespaces: namespace filter - @type identifiers: iterable of basestring or Namespace key, + @type namespaces: iterable of str or Namespace key, or a single instance of those types @param site: current site for the generator @type site: pywikibot.Site or None diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index aef081b..3f16fe1 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -492,7 +492,6 @@ """Setup class for tests.""" super(TestDayPageGenerator, cls).setUpClass() cls.site = cls.get_site() - cls.fd = date.FormatDate(cls.site) def _run_test(self, start_month=1, end_month=12, year=2000): """Test method for DayPageGenerator.""" @@ -516,7 +515,7 @@ expected = [] for month in range(start_month, end_month + 1): for day in range(1, calendar.monthrange(year, month)[1] + 1): - expected.append(self.fd(month, day)) + expected.append(date.format_date(month, day, self.site)) self.assertPageTitlesEqual(gen2, expected) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/631196 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: I81171d1d1a8f509f2de94acab8ef8412d6be097d Gerrit-Change-Number: 631196 Gerrit-PatchSet: 3 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [cleanup] cleanup proofreadpage.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/631220 ) Change subject: [cleanup] cleanup proofreadpage.py ...................................................................... [cleanup] cleanup proofreadpage.py Move decorators out of ProofreadPage(). Change-Id: I4881580cf12141e54a09f59b89273ab492f15a2b --- M pywikibot/proofreadpage.py 1 file changed, 28 insertions(+), 25 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index f05e09e..561a968 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -54,11 +54,36 @@ from pywikibot.comms import http from pywikibot.data.api import Request from pywikibot.exceptions import OtherPageSaveError +from pywikibot import textlib from pywikibot.tools import ModuleDeprecationWrapper _logger = 'proofreadpage' +def decompose(fn): # noqa: N805 + """Decorator. + + Decompose text if needed and recompose text. + """ + def wrapper(obj, *args, **kwargs): + if not hasattr(obj, '_full_header'): + obj._decompose_page() + _res = fn(obj, *args, **kwargs) + obj._compose_page() + return _res + + return wrapper + + +def check_if_cached(fn): # noqa: N805 + """Decorator to check if data are cached and cache them if needed.""" + def wrapper(self, *args, **kwargs): + if self._cached is False: + self._get_page_mappings() + return fn(self, *args, **kwargs) + return wrapper + + class FullHeader: """Header of a ProofreadPage object.""" @@ -290,19 +315,6 @@ return int(self._quality) return self.ql - def decompose(fn): # noqa: N805 - """Decorator. - - Decompose text if needed and recompose text. - """ - def wrapper(obj, *args, **kwargs): - if not hasattr(obj, '_full_header'): - obj._decompose_page() - _res = fn(obj, *args, **kwargs) - obj._compose_page() - return _res - return wrapper - @property @decompose def ql(self): @@ -595,7 +607,6 @@ try: response = http.fetch(cmd_uri) except ReadTimeout as e: - timeout = e pywikibot.warning('ReadTimeout %s: %s' % (cmd_uri, e)) except Exception as e: pywikibot.error('"{}": {}'.format(cmd_uri, e)) @@ -608,7 +619,7 @@ pywikibot.warning('retrying in {} seconds ...'.format(retry)) time.sleep(retry) else: - return True, timeout + return True, ReadTimeout if 400 <= response.status < 600: return (True, 'Http response status {}'.format(response.status)) @@ -795,14 +806,6 @@ self._cached = False - def check_if_cached(fn): # noqa: N805 - """Decorator to check if data are cached and cache them if needed.""" - def wrapper(self, *args, **kwargs): - if self._cached is False: - self._get_page_mappings() - return fn(self, *args, **kwargs) - return wrapper - def _parse_redlink(self, href): """Parse page title when link in Index is a redlink.""" p_href = re.compile( @@ -835,9 +838,9 @@ return False # Discard all inner templates as only top-level ones matter - tmplts = pywikibot.textlib.extract_templates_and_params_regex_simple( + templates = textlib.extract_templates_and_params_regex_simple( self.text) - if len(tmplts) != 1 or tmplts[0][0] != self.INDEX_TEMPLATE: + if len(templates) != 1 or templates[0][0] != self.INDEX_TEMPLATE: # Only a single call to the INDEX_TEMPLATE is allowed return False -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/631220 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: I4881580cf12141e54a09f59b89273ab492f15a2b Gerrit-Change-Number: 631220 Gerrit-PatchSet: 2 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [IMPR] shorten super() calls in utils.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/631138 ) Change subject: [IMPR] shorten super() calls in utils.py ...................................................................... [IMPR] shorten super() calls in utils.py Change-Id: I42ebe46312e8a623214eb27f56f5ab5a7ab5c057 --- M tests/utils.py 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/utils.py b/tests/utils.py index b8ab0a7..9db82d4 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -105,7 +105,7 @@ warning that matches the skip_list won't be adjusted. @type skip_list: list of object or (obj, str, int, int) """ - super(WarningSourceSkipContextManager, self).__init__(record=True) + super().__init__(record=True) self.skip_list = skip_list @property @@ -180,7 +180,7 @@ log.append(warn_msg) - log = super(WarningSourceSkipContextManager, self).__enter__() + log = super().__enter__() self._module.showwarning = detailed_show_warning return log @@ -233,7 +233,7 @@ def __init__(self, *args, **kwargs): """Initializer.""" - super(DryParamInfo, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.modules = set() self.action_modules = set() self.query_modules = set() @@ -251,7 +251,7 @@ def __getitem__(self, name): """Return dry data or a dummy parameter block.""" try: - return super(DryParamInfo, self).__getitem__(name) + return super().__getitem__(name) except KeyError: return {'name': name, 'limit': None} @@ -340,7 +340,7 @@ def __init__(self, code, fam, user): """Initializer.""" - super(DrySite, self).__init__(code, fam, user) + super().__init__(code, fam, user) self._userinfo = pywikibot.tools.EMPTY_DEFAULT self._paraminfo = DryParamInfo() self._siteinfo = DummySiteinfo({}) @@ -414,7 +414,7 @@ """Dummy class to use instead of L{pywikibot.site.DataSite}.""" def _build_namespaces(self): - namespaces = super(DryDataSite, self)._build_namespaces() + namespaces = super()._build_namespaces() namespaces[0].defaultcontentmodel = 'wikibase-item' namespaces[120] = Namespace(id=120, case='first-letter', @@ -526,7 +526,7 @@ @param data: The data returned for any request or fetch. @type data: callable or False (or other depending on request/fetch) """ - super(PatchedHttp, self).__init__() + super().__init__() self._module = module self.data = data -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/631138 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: I42ebe46312e8a623214eb27f56f5ab5a7ab5c057 Gerrit-Change-Number: 631138 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [help] Only show _GLOBAL_HELP options if explicitly wanted

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/222762 ) Change subject: [help] Only show _GLOBAL_HELP options if explicitly wanted ...................................................................... [help] Only show _GLOBAL_HELP options if explicitly wanted - Many scripts have a long documentation to show all the options supported. Now do not show global options by default but show a short hint how they are printed. There are two ways: -help:global prints the global options after the others pwb.py -help prints the global options as well as pwb.py -help:global - rename showHelp to show_help due to naming convention and deprecate the old variant. - reorder imports - use module_name directly for import - update casechecker.py - update script_tests.py - update pywikibot/__init__.py Change-Id: I77bd3b9d214e5ecb866602bf7111375dc4cba31f --- M pywikibot/__init__.py M pywikibot/bot.py M scripts/casechecker.py M tests/script_tests.py 4 files changed, 40 insertions(+), 21 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 98c543c..9524911 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -24,7 +24,7 @@ from pywikibot._wbtypes import WbRepresentation as _WbRepresentation from pywikibot.bot import ( - input, input_choice, input_yn, handle_args, showHelp, ui, + input, input_choice, input_yn, handle_args, show_help, ui, calledModuleName, Bot, CurrentPageBot, WikidataBot, # the following are flagged as deprecated on usage handleArgs, @@ -92,12 +92,13 @@ 'output', 'Page', 'PageCreatedConflict', 'PageDeletedConflict', 'PageNotSaved', 'PageRelatedError', 'PageSaveRelatedError', 'PropertyPage', 'QuitKeyboardInterrupt', 'SectionError', 'Server504Error', 'ServerError', - 'showDiff', 'showHelp', 'Site', 'SiteDefinitionError', 'SiteLink', - 'SpamblacklistError', 'stdout', 'Timestamp', 'TitleblacklistError', - 'translate', 'ui', 'unicode2html', 'UnknownExtension', 'UnknownFamily', - 'UnknownSite', 'UnsupportedPage', 'UploadWarning', 'url2unicode', 'User', - 'UserBlocked', 'warning', 'WbGeoShape', 'WbMonolingualText', 'WbQuantity', - 'WbTabularData', 'WbTime', 'WbUnknown', 'WikiBaseError', 'WikidataBot', + 'showDiff', 'show_help', 'showHelp', 'Site', 'SiteDefinitionError', + 'SiteLink', 'SpamblacklistError', 'stdout', 'Timestamp', + 'TitleblacklistError', 'translate', 'ui', 'unicode2html', + 'UnknownExtension', 'UnknownFamily', 'UnknownSite', 'UnsupportedPage', + 'UploadWarning', 'url2unicode', 'User', 'UserBlocked', 'warning', + 'WbGeoShape', 'WbMonolingualText', 'WbQuantity', 'WbTabularData', 'WbTime', + 'WbUnknown', 'WikiBaseError', 'WikidataBot', ) @@ -1403,3 +1404,5 @@ wrapper._add_deprecated_attr('__release__', __version__, replacement_name='pywikibot.__version__', since='20200707') +wrapper._add_deprecated_attr('showHelp', show_help, + since='20200705', future_warning=True) diff --git a/pywikibot/bot.py b/pywikibot/bot.py index da21a7f..34eead8 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -72,7 +72,7 @@ 'QuitKeyboardInterrupt', 'InteractiveReplace', 'calledModuleName', 'handle_args', 'handleArgs', - 'showHelp', 'suggest_help', + 'show_help', 'showHelp', 'suggest_help', 'writeToCommandLogFile', 'open_webbrowser', 'OptionHandler', 'BaseBot', 'Bot', 'ConfigParserBot', 'SingleSiteBot', 'MultipleSitesBot', @@ -128,7 +128,6 @@ from pywikibot.tools._logging import LoggingFormatter, RotatingFileHandler from pywikibot.tools.formatter import color_format - # Note: all output goes through python std library "logging" module _logger = 'bot' @@ -165,7 +164,7 @@ -help Show this help text. -log Enable the log file, using the default filename - '%s-bot.log' + '{}-bot.log' Logs will be stored in the logs subdirectory. -log:xyz Enable the log file, using 'xyz' as the filename. @@ -202,6 +201,13 @@ """ +_GLOBAL_HELP_NOTE = """ +GLOBAL OPTIONS +============== +For global options use -help:global or run pwb.py -help + +""" + class UnhandledAnswer(Exception): @@ -767,7 +773,7 @@ for arg in args: option, _, value = arg.partition(':') if do_help is not False and option == '-help': - do_help = True + do_help = value or True elif option == '-dir': pass elif option == '-family': @@ -856,7 +862,7 @@ pywikibot.output('Python ' + sys.version) if do_help: - showHelp() + show_help(show_global=do_help == 'global') sys.exit(0) debug('handle_args() completed.', _logger) @@ -869,7 +875,7 @@ return handle_args(args) -def showHelp(module_name=None): +def show_help(module_name=None, show_global=False): """Show help for the Bot.""" if not module_name: module_name = calledModuleName() @@ -879,19 +885,29 @@ except NameError: module_name = 'no_module' - global_help = _GLOBAL_HELP % module_name try: - module = import_module('%s' % module_name) + module = import_module(module_name) help_text = module.__doc__ if hasattr(module, 'docuReplacements'): for key, value in module.docuReplacements.items(): help_text = help_text.replace(key, value.strip('\n\r')) - pywikibot.stdout(help_text) # output to STDOUT except Exception: if module_name: - pywikibot.stdout('Sorry, no help available for %s' % module_name) - pywikibot.log('showHelp:', exc_info=True) - pywikibot.stdout(global_help) + pywikibot.stdout('Sorry, no help available for ' + module_name) + pywikibot.log('show_help:', exc_info=True) + else: + pywikibot.stdout(help_text) # output to STDOUT + + if show_global or module_name == 'pwb': + pywikibot.stdout(_GLOBAL_HELP.format(module_name)) + else: + pywikibot.stdout(_GLOBAL_HELP_NOTE) + + +@deprecated('show_help', since='20200705') +def showHelp(module_name=None): + """DEPRECATED. Use show_help().""" + return show_help(module_name) def suggest_help(missing_parameters=[], missing_generator=False, diff --git a/scripts/casechecker.py b/scripts/casechecker.py index 4e76a00..7768c2b 100755 --- a/scripts/casechecker.py +++ b/scripts/casechecker.py @@ -121,7 +121,7 @@ self.doFailed = True else: pywikibot.output('Unknown argument {}.'.format(arg)) - pywikibot.showHelp() + pywikibot.show_help() sys.exit() if self.namespaces == [] and not self.doFailed: diff --git a/tests/script_tests.py b/tests/script_tests.py index 6186a48..085a748 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -352,7 +352,7 @@ _expected_failures = {'version'} _allowed_failures = [] - _arguments = '-help' + _arguments = '-help:global' _results = None -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/222762 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: I77bd3b9d214e5ecb866602bf7111375dc4cba31f Gerrit-Change-Number: 222762 Gerrit-PatchSet: 14 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)disroot.org> Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: textlib_tests.py: split test_regexes

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630932 ) Change subject: textlib_tests.py: split test_regexes ...................................................................... textlib_tests.py: split test_regexes Divide test_regexes() in: - test_etp_regex() - test_nested_template_regex() Change-Id: If0aa7f872e71df8abcc0f81ab6e52d309a34d133 --- M tests/textlib_tests.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index e3bdbd9..9f07b1f 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -587,8 +587,8 @@ self.assertEqual(func('{{a|{{c|{{d|{{e|}}}} }} }} foo {{b}}'), [(None, OrderedDict())]) - def test_regexes(self): - """Test _ETP_REGEX and NESTED_TEMPLATE_REGEX.""" + def test_etp_regex(self): + """Test _ETP_REGEX.""" func = textlib._ETP_REGEX.search self.assertIsNotNone(func('{{{1}}}')) @@ -620,6 +620,8 @@ self.assertIsNone(func('{{a|{{c}} }}')) self.assertIsNone(func('{{a|{{c|d}} }}')) + def test_nested_template_regex(self): + """Test NESTED_TEMPLATE_REGEX.""" func = textlib.NESTED_TEMPLATE_REGEX.search # Numerically named templates are rejected -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630932 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: If0aa7f872e71df8abcc0f81ab6e52d309a34d133 Gerrit-Change-Number: 630932 Gerrit-PatchSet: 1 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: site.py: remove unresolved references

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630938 ) Change subject: site.py: remove unresolved references ...................................................................... site.py: remove unresolved references Remove from __all__: - Family - NonMWAPISite Change-Id: Id1f65b97e08997e4f8f5d54cba0ed776e2e1955a --- M pywikibot/site/__init__.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 72b0dac..1f6f804 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -89,8 +89,8 @@ SelfCallString, ) -__all__ = ('APISite', 'DataSite', 'Family', 'LoginStatus', 'Namespace', - 'NamespacesDict', 'NonMWAPISite', 'PageInUse', 'RemovedSite', +__all__ = ('APISite', 'DataSite', 'LoginStatus', 'Namespace', + 'NamespacesDict', 'PageInUse', 'RemovedSite', 'Siteinfo', 'TokenWallet') _logger = 'wiki.site' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630938 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: Id1f65b97e08997e4f8f5d54cba0ed776e2e1955a Gerrit-Change-Number: 630938 Gerrit-PatchSet: 1 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [tests] Add a intersect generator test which is known as failing

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630808 ) Change subject: [tests] Add a intersect generator test which is known as failing ...................................................................... [tests] Add a intersect generator test which is known as failing Bug: T263947 Change-Id: I95c0810c8839fdbf7d9c96e880105b21f54a814a --- M tests/thread_tests.py 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/thread_tests.py b/tests/thread_tests.py index 81d5ff7..615395b 100644 --- a/tests/thread_tests.py +++ b/tests/thread_tests.py @@ -68,6 +68,11 @@ """Test basic interset with duplicates.""" self.assertEqualItertools(['aabc', 'dddb', 'baa']) + @unittest.expectedFailure + def test_intersect_with_dups_failing(self): + """Failing basic intersect test with duplicates.""" + self.assertEqualItertools(['abb', 'bb']) + if __name__ == '__main__': # pragma: no cover with suppress(SystemExit): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630808 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: I95c0810c8839fdbf7d9c96e880105b21f54a814a Gerrit-Change-Number: 630808 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [cleanup] Remove desupported textlib methods

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/627851 ) Change subject: [cleanup] Remove desupported textlib methods ...................................................................... [cleanup] Remove desupported textlib methods textlib methods should be imported from textlib instead of pywikibot. Using the methods pywikibot are deprecated for 6 years. Change-Id: I8f976961f0c562fc9a00192bf324022383af68f3 --- M pywikibot/__init__.py M scripts/imagecopy_self.py 2 files changed, 6 insertions(+), 25 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 7045a95..98c543c 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -55,7 +55,6 @@ critical, debug, error, exception, log, output, stdout, warning ) from pywikibot.site import BaseSite -import pywikibot.textlib as textlib from pywikibot.tools import ( # __ to avoid conflict with ModuleDeprecationWrapper._deprecated classproperty, @@ -77,16 +76,6 @@ cache = lru_cache(None) -textlib_methods = ( - 'categoryFormat', 'compileLinkR', 'extract_templates_and_params', - 'getCategoryLinks', 'getLanguageLinks', 'interwikiFormat', 'interwikiSort', - 'isDisabled', 'removeCategoryLinks', 'removeCategoryLinksAndSeparator', - 'removeDisabledParts', 'removeHTMLParts', 'removeLanguageLinks', - 'removeLanguageLinksAndSeparator', 'replaceCategoryInPlace', - 'replaceCategoryLinks', 'replaceExcept', 'replaceLanguageLinks', - 'TimeStripper', 'unescape', -) - __all__ = ( '__copyright__', '__description__', '__download_url__', '__license__', '__maintainer__', '__maintainer_email__', '__name__', '__release__', @@ -110,13 +99,6 @@ 'UserBlocked', 'warning', 'WbGeoShape', 'WbMonolingualText', 'WbQuantity', 'WbTabularData', 'WbTime', 'WbUnknown', 'WikiBaseError', 'WikidataBot', ) -__all__ += textlib_methods - - -for _name in textlib_methods: - target = getattr(textlib, _name) - wrapped_func = redirect_func(target, since='20140820', future_warning=True) - globals()[_name] = wrapped_func class Timestamp(datetime.datetime): @@ -211,23 +193,21 @@ def __add__(self, other): """Perform addition, returning a Timestamp instead of datetime.""" - newdt = super(Timestamp, self).__add__(other) + newdt = super().__add__(other) if isinstance(newdt, datetime.datetime): return Timestamp(newdt.year, newdt.month, newdt.day, newdt.hour, newdt.minute, newdt.second, newdt.microsecond, newdt.tzinfo) - else: - return newdt + return newdt def __sub__(self, other): """Perform subtraction, returning a Timestamp instead of datetime.""" - newdt = super(Timestamp, self).__sub__(other) + newdt = super().__sub__(other) if isinstance(newdt, datetime.datetime): return Timestamp(newdt.year, newdt.month, newdt.day, newdt.hour, newdt.minute, newdt.second, newdt.microsecond, newdt.tzinfo) - else: - return newdt + return newdt class Coordinate(_WbRepresentation): diff --git a/scripts/imagecopy_self.py b/scripts/imagecopy_self.py index ee55da5..8580388 100644 --- a/scripts/imagecopy_self.py +++ b/scripts/imagecopy_self.py @@ -50,6 +50,7 @@ from pywikibot import pagegenerators, i18n from pywikibot.specialbots import UploadRobot +from pywikibot.textlib import removeCategoryLinks from pywikibot.tools import PY2 from scripts import imagerecat, image @@ -504,7 +505,7 @@ for (regex, repl) in licenseTemplates[imagepage.site.lang]: text = re.sub(regex, '', text, flags=re.IGNORECASE) - text = pywikibot.removeCategoryLinks(text, imagepage.site()) + text = removeCategoryLinks(text, imagepage.site()) description = self.convertLinks(text.strip(), imagepage.site()) date = self.getUploadDate(imagepage) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/627851 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: I8f976961f0c562fc9a00192bf324022383af68f3 Gerrit-Change-Number: 627851 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 7 months

[Gerrit] ...core[master]: [IMPR] Show all environment settings starting with "PYWIKIBOT"

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/481665 ) Change subject: [IMPR] Show all environment settings starting with "PYWIKIBOT" ...................................................................... [IMPR] Show all environment settings starting with "PYWIKIBOT" Change-Id: Ie4c3f98fbb58bb34cec6db2094e6cfa64a633064 --- M scripts/version.py 1 file changed, 9 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/version.py b/scripts/version.py index ed06b6e..3fe6695 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -28,13 +28,6 @@ WMF_CACERT = 'MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs' -def check_environ(environ_name) -> None: - """Print environment variable.""" - pywikibot.output('{0}: {1}'.format(environ_name, - os.environ.get(environ_name, - 'Not set'))) - - def main(*args) -> None: """Print pywikibot version and important settings.""" pywikibot.output('Pywikibot: ' + getversion()) @@ -67,9 +60,15 @@ if toolforge_env_hostname: pywikibot.output('Toolforge hostname: ' + toolforge_env_hostname) - check_environ('PYWIKIBOT_DIR') - check_environ('PYWIKIBOT_DIR_PWB') - check_environ('PYWIKIBOT_NO_USER_CONFIG') + # check environment settings + settings = {key for key in os.environ if key.startswith('PYWIKIBOT')} + settings.update(['PYWIKIBOT_DIR', 'PYWIKIBOT_DIR_PWB', + 'PYWIKIBOT_NO_USER_CONFIG']) + for environ_name in sorted(settings): + pywikibot.output('{0}: {1}'.format(environ_name, + os.environ.get(environ_name, + 'Not set'))) + pywikibot.output('Config base dir: ' + pywikibot.config2.base_dir) for family, usernames in pywikibot.config2.usernames.items(): if not usernames: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/481665 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: Ie4c3f98fbb58bb34cec6db2094e6cfa64a633064 Gerrit-Change-Number: 481665 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-MessageType: merged

3 years, 7 months

[Gerrit] ...core[master]: [cleanup] remove deprecated Family.version methods

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630605 ) Change subject: [cleanup] remove deprecated Family.version methods ...................................................................... [cleanup] remove deprecated Family.version methods Change-Id: Iaabdfac04933eadc444db1ab63bb147d3d5427e2 --- M generate_family_file.py M pywikibot/families/wikihow_family.py M pywikibot/families/wikispore_family.py M pywikibot/families/wowwiki_family.py M pywikibot/family.py 5 files changed, 1 insertion(+), 52 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_family_file.py b/generate_family_file.py index 25d6e22..3c4e1e4 100755 --- a/generate_family_file.py +++ b/generate_family_file.py @@ -130,11 +130,6 @@ "'{code}': '{path}',".format(code=k, path=w.scriptpath) for k, w in self.wikis.items()) - code_version_pairs = '\n '.join( - "'{code}': None,".format(code=k) if w.version is None else - "'{code}': '{version}',".format(code=k, version=w.version) - for k, w in self.wikis.items()) - code_protocol_pairs = '\n '.join( "'{code}': '{protocol}',".format( code=k, protocol=urlparse(w.server).scheme @@ -145,7 +140,6 @@ 'url': self.base_url, 'name': self.name, 'code_hostname_pairs': code_hostname_pairs, 'code_path_pairs': code_path_pairs, - 'code_version_pairs': code_version_pairs, 'code_protocol_pairs': code_protocol_pairs}) @@ -161,7 +155,6 @@ Please do not commit this to the Git repository! \"\"\" from pywikibot import family -from pywikibot.tools import deprecated class Family(family.Family): # noqa: D101 @@ -176,12 +169,6 @@ %(code_path_pairs)s }[code] - @deprecated('APISite.version()', since='20141225') - def version(self, code): - return { - %(code_version_pairs)s - }[code] - def protocol(self, code): return { %(code_protocol_pairs)s diff --git a/pywikibot/families/wikihow_family.py b/pywikibot/families/wikihow_family.py index 478fca3..174d5b1 100644 --- a/pywikibot/families/wikihow_family.py +++ b/pywikibot/families/wikihow_family.py @@ -6,7 +6,7 @@ # Distributed under the terms of the MIT license. # from pywikibot import family -from pywikibot.tools import deprecated, classproperty +from pywikibot.tools import classproperty class Family(family.SubdomainFamily): # noqa: D101 @@ -50,11 +50,6 @@ """Return the script path for this family.""" return '' - @deprecated('APISite.version()', since='20141225') - def version(self, code): - """Return the version for this family.""" - return '1.33.0-alpha' - def protocol(self, code): """Return 'https' as the protocol.""" return 'https' diff --git a/pywikibot/families/wikispore_family.py b/pywikibot/families/wikispore_family.py index f395cb7..1213d2c 100644 --- a/pywikibot/families/wikispore_family.py +++ b/pywikibot/families/wikispore_family.py @@ -6,7 +6,6 @@ # Distributed under the terms of the MIT license. # from pywikibot import family -from pywikibot.tools import deprecated class Family(family.Family): # noqa: D101 @@ -19,9 +18,5 @@ 'test': 'wikispore-test.wmflabs.org', } - @deprecated('APISite.version()', since='20141225') - def version(self, code): - return '1.36.0-alpha' - def protocol(self, code): return 'https' diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py index fa6dac1..49f9f7d 100644 --- a/pywikibot/families/wowwiki_family.py +++ b/pywikibot/families/wowwiki_family.py @@ -32,13 +32,6 @@ """DEPRECATED. languages_by_size property for compatibility purpose.""" return list(cls.codes) - @deprecated('APISite.version()', since='20141225') - def version(self, code): - """Return the version for this family.""" - if code == 'es': - return '1.33.1' - return super().version(code) - @classproperty def langs(cls): """Property listing family languages.""" diff --git a/pywikibot/family.py b/pywikibot/family.py index 8df90ce..ea62c52 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -19,7 +19,6 @@ from typing import Dict, List, Optional, Tuple import pywikibot -from pywikibot.comms.http import fetch from pywikibot import config from pywikibot.exceptions import UnknownFamily, FamilyMaintenanceWarning from pywikibot.tools import ( @@ -1030,21 +1029,6 @@ """Return the name of the MySQL database.""" return '%s%s' % (code, self.name) - # Which version of MediaWiki is used? - @deprecated('APISite.version()', since='20141225') - def version(self, code): - """Return MediaWiki version number as a string. - - Use L{pywikibot.site.mw_version} to compare version strings. - """ - # Here we return the latest mw release for downloading - if not hasattr(self, '_version'): - self._version = fetch( - 'https://www.mediawiki.org/w/api.php?action=expandtemplates' - '&text={{MW_stable_release_number}}&prop=wikitext&format=json' - ).data.json()['expandtemplates']['wikitext'] - return self._version - def force_version(self, code): """ Return a manual version number. @@ -1263,11 +1247,6 @@ """Common features of Fandom families.""" - @deprecated('APISite.version()', since='20141225') - def version(self, code): - """Return the version for this family.""" - return '1.19.24' - @classproperty def langs(cls): """Property listing family languages.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630605 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: Iaabdfac04933eadc444db1ab63bb147d3d5427e2 Gerrit-Change-Number: 630605 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2020