Pywikibot-commits September 2020

pywikibot-commits@lists.wikimedia.org

1 participants
110 discussions

[Gerrit] ...core[master]: [cleanup] Remove desupported args which are deprecated with FutureWar...
by jenkins-bot (Code Review) 29 Sep '20

29 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/628121 ) Change subject: [cleanup] Remove desupported args which are deprecated with FutureWarning ...................................................................... [cleanup] Remove desupported args which are deprecated with FutureWarning Also add some type hints Change-Id: I0c3889464530dcc55039e945bb0a89c5a0c500e8 --- M pywikibot/page/__init__.py 1 file changed, 110 insertions(+), 100 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index f819ab0..0929ce0 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -446,12 +446,8 @@ return self.autoFormat()[0] is not None @remove_last_args(['sysop']) - @deprecated_args(throttle=True, - change_edit_time=True, - expandtemplates=True) - def get(self, force=False, get_redirect=False) -> str: - """ - Return the wiki-text of the page. + def get(self, force: bool = False, get_redirect: bool = False) -> str: + """Return the wiki-text of the page. This will retrieve the page from the server if it has not been retrieved yet, or if force is True. This can raise the following @@ -512,8 +508,8 @@ raise self._getexception @remove_last_args(['sysop']) - @deprecated_args(throttle=True, change_edit_time=True) - def getOldVersion(self, oldid, force=False, get_redirect=False) -> str: + def getOldVersion(self, oldid, + force: bool = False, get_redirect: bool = False) -> str: """ Return text of an old revision of this page; same options as get(). @@ -938,15 +934,17 @@ disambig_in_page = disambigs.intersection(templates) return self.namespace() != 10 and len(disambig_in_page) > 0 - @deprecated_args( - step=True, withTemplateInclusion='with_template_inclusion', - onlyTemplateInclusion='only_template_inclusion', - redirectsOnly='filter_redirects') - def getReferences( - self, follow_redirects=True, with_template_inclusion=True, - only_template_inclusion=False, filter_redirects=False, - namespaces=None, total=None, content=False - ): + @deprecated_args(withTemplateInclusion='with_template_inclusion', + onlyTemplateInclusion='only_template_inclusion', + redirectsOnly='filter_redirects') + def getReferences(self, + follow_redirects: bool = True, + with_template_inclusion: bool = True, + only_template_inclusion: bool = False, + filter_redirects: bool = False, + namespaces=None, + total: Optional[int] = None, + content: bool = False): """ Return an iterator all pages that refer to or embed the page. @@ -982,10 +980,14 @@ content=content ) - @deprecated_args(step=True, followRedirects='follow_redirects', + @deprecated_args(followRedirects='follow_redirects', filterRedirects='filter_redirects') - def backlinks(self, follow_redirects=True, filter_redirects=None, - namespaces=None, total=None, content=False): + def backlinks(self, + follow_redirects: bool = True, + filter_redirects: Optional[bool] = None, + namespaces=None, + total: Optional[int] = None, + content: bool = False): """ Return an iterator for pages that link to this page. @@ -1007,9 +1009,11 @@ content=content ) - @deprecated_args(step=True) - def embeddedin(self, filter_redirects=None, namespaces=None, - total=None, content=False): + def embeddedin(self, + filter_redirects: Optional[bool] = None, + namespaces=None, + total: Optional[int] = None, + content: bool = False): """ Return an iterator for pages that embed this page as a template. @@ -1188,16 +1192,21 @@ return True @deprecate_arg('async', 'asynchronous') # T106230 - @deprecated_args(comment='summary', sysop=True) - def save(self, summary=None, watch=None, minor=True, botflag=None, - force=False, asynchronous=False, callback=None, - apply_cosmetic_changes=None, quiet=False, **kwargs): + @deprecated_args(comment='summary') + def save(self, + summary: Optional[str] = None, + watch: Union[str, bool, None] = None, + minor: bool = True, + botflag: Optional[bool] = None, + force: bool = False, + asynchronous: bool = False, + callback=None, apply_cosmetic_changes=None, + quiet: bool = False, **kwargs): """ Save the current contents of page's text to the wiki. @param summary: The edit summary for the modification (optional, but most wikis strongly encourage its use) - @type summary: str @param watch: Specify how the watchlist is affected by this edit, set to one of "watch", "unwatch", "preferences", "nochange": * watch: add the page to the watchlist @@ -1211,11 +1220,9 @@ user's watchlist. @type watch: str, bool (deprecated) or None @param minor: if True, mark this edit as minor - @type minor: bool @param botflag: if True, mark this edit as made by a bot (default: True if user has bot status, False if not) @param force: if True, ignore botMayEdit() setting - @type force: bool @param asynchronous: if True, launch a separate thread to save asynchronously @param callback: a callable object that will be called after the @@ -1231,7 +1238,6 @@ defaults to False. In asynchronous mode, if True, it is up to the calling bot to manage the output e.g. via callback. - @type quiet: bool """ if not summary: summary = config.default_edit_summary @@ -1399,8 +1405,9 @@ else: raise pywikibot.NoPage(self) - @deprecated_args(step=True) - def linkedPages(self, namespaces=None, total=None, content=False): + def linkedPages(self, namespaces=None, + total: Optional[int] = None, + content: bool = False): """ Iterate Pages that this Page links to. @@ -1412,11 +1419,8 @@ @param namespaces: only iterate links in these namespaces @param namespaces: int, or list of ints @param total: iterate no more than this number of pages in total - @type total: int @param content: if True, retrieve the content of the current version of each linked page (default False) - @type content: bool - @return: a generator that yields Page objects. @rtype: generator """ @@ -1481,16 +1485,14 @@ else: return [i for i in self._langlinks if not i.site.obsolete] - @deprecated_args(step=True) - def iterlanglinks(self, total=None, include_obsolete=False): - """ - Iterate all inter-language links on this page. + def iterlanglinks(self, + total: Optional[int] = None, + include_obsolete: bool = False): + """Iterate all inter-language links on this page. @param total: iterate no more than this number of pages in total @param include_obsolete: if true, yield even Link object whose site is obsolete - @type include_obsolete: bool - @return: a generator that yields Link objects. @rtype: generator """ @@ -1511,8 +1513,7 @@ """ return ItemPage.fromPage(self) - @deprecated_args(get_redirect=True) - def templates(self, content=False): + def templates(self, content: bool = False): """ Return a list of Page objects for templates used on this Page. @@ -1530,8 +1531,9 @@ return self._templates - @deprecated_args(step=True) - def itertemplates(self, total=None, content=False): + def itertemplates(self, + total: Optional[int] = None, + content: bool = False): """ Iterate Page objects for templates used on this Page. @@ -1548,8 +1550,7 @@ return iter(self._templates) return self.site.pagetemplates(self, total=total, content=content) - @deprecated_args(followRedirects=True, loose=True, step=True) - def imagelinks(self, total=None, content=False): + def imagelinks(self, total: Optional[int] = None, content: bool = False): """ Iterate FilePage objects for images displayed on this Page. @@ -1560,9 +1561,11 @@ """ return self.site.pageimages(self, total=total, content=content) - @deprecated_args(nofollow_redirects=True, get_redirect=True, step=True, - withSortKey='with_sort_key') - def categories(self, with_sort_key=False, total=None, content=False): + @deprecated_args(withSortKey='with_sort_key') + def categories(self, + with_sort_key: bool = False, + total: Optional[int] = None, + content: bool = False): """ Iterate categories that the article is in. @@ -1579,8 +1582,7 @@ return self.site.pagecategories(self, total=total, content=content) - @deprecated_args(step=True) - def extlinks(self, total=None): + def extlinks(self, total: Optional[int] = None): """ Iterate all external URLs (not interwiki links) from this page. @@ -1674,9 +1676,11 @@ else: return lastmove.target_page - @deprecated_args(getText='content', reverseOrder='reverse', step=True, - rollback=True) - def revisions(self, reverse=False, total=None, content=False, + @deprecated_args(getText='content', reverseOrder='reverse') + def revisions(self, + reverse: bool = False, + total: Optional[int] = None, + content: bool = False, starttime=None, endtime=None): """Generator which loads the version history as Revision instances.""" # TODO: Only request uncached revisions @@ -1686,8 +1690,10 @@ return (self._revisions[rev] for rev in sorted(self._revisions, reverse=not reverse)[:total]) - @deprecated_args(forceReload=True, reverseOrder='reverse', step=True) - def getVersionHistoryTable(self, reverse=False, total=None): + @deprecated_args(reverseOrder='reverse') + def getVersionHistoryTable(self, + reverse: bool = False, + total: Optional[int] = None): """Return the version history as a wiki table.""" result = '{| class="wikitable"\n' result += '! oldid || date/time || username || edit summary\n' @@ -1698,8 +1704,9 @@ result += '|}\n' return result - @deprecated_args(step=True) - def contributors(self, total=None, starttime=None, endtime=None): + def contributors(self, + total: Optional[int] = None, + starttime=None, endtime=None): """ Compile contributors of this page with edit counts. @@ -1715,8 +1722,7 @@ starttime=starttime, endtime=endtime)) @deprecated('contributors().keys()', since='20150206', future_warning=True) - @deprecated_args(step=True) - def contributingUsers(self, total=None): + def contributingUsers(self, total: Optional[int] = None): """ Return a set of usernames (or IPs) of users who edited this page. @@ -1781,10 +1787,13 @@ """ self.site.merge_history(self, dest, timestamp, reason) - @deprecated_args( - throttle=True, deleteAndMove='noredirect', movetalkpage='movetalk') + @deprecated_args(deleteAndMove='noredirect', movetalkpage='movetalk') @remove_last_args(['safe']) - def move(self, newtitle, reason=None, movetalk=True, noredirect=False): + def move(self, + newtitle: str, + reason: Optional[str] = None, + movetalk: bool = True, + noredirect: bool = False): """ Move this page to a new title. @@ -1802,8 +1811,11 @@ movetalk=movetalk, noredirect=noredirect) - @deprecated_args(throttle=True) - def delete(self, reason=None, prompt=True, mark=False, quit=False): + def delete(self, + reason: Optional[str] = None, + prompt: bool = True, + mark: bool = False, + quit: bool = False): """ Delete the page from the wiki. Requires administrator status. @@ -1867,8 +1879,7 @@ self._has_deleted_revisions = bool(list(gen)) return self._has_deleted_revisions - @deprecated_args(step=True) - def loadDeletedRevisions(self, total=None, **kwargs): + def loadDeletedRevisions(self, total: Optional[int] = None, **kwargs): """ Retrieve deleted revisions for this Page. @@ -1924,8 +1935,8 @@ 'Timestamp %d is not a deleted revision' % timestamp) self._deletedRevs[timestamp]['marked'] = undelete - @deprecated_args(comment='reason', throttle=True) - def undelete(self, reason=None): + @deprecated_args(comment='reason') + def undelete(self, reason: Optional[str] = None): """ Undelete revisions based on the markers set by previous calls. @@ -1961,9 +1972,11 @@ 'Please enter a reason for the undeletion:') self.site.undelete_page(self, reason, undelete_revs) - @deprecated_args(throttle=True) - def protect(self, edit=False, move=False, create=None, upload=None, - unprotect=False, + def protect(self, + edit: bool = False, + move: bool = False, + create=None, upload=None, + unprotect: bool = False, reason: Optional[str] = None, prompt: Optional[bool] = None, protections: Optional[dict] = None, @@ -2182,8 +2195,8 @@ """Page: A MediaWiki page.""" - @deprecated_args(defaultNamespace='ns', insite=True) - def __init__(self, source, title='', ns=0): + @deprecated_args(defaultNamespace='ns') + def __init__(self, source, title: str = '', ns=0): """Instantiate a Page object.""" if isinstance(source, pywikibot.site.BaseSite): if not title: @@ -2210,7 +2223,6 @@ return self._raw_extracted_templates - @deprecated_args(get_redirect=True) def templatesWithParams(self): """ Return templates used on this Page. @@ -2375,8 +2387,7 @@ Supports the same interface as Page, with some added methods. """ - @deprecated_args(insite=True) - def __init__(self, source, title=''): + def __init__(self, source, title: str = ''): """Initializer.""" self._file_revisions = {} # dictionary to cache File history. super().__init__(source, title, 6) @@ -2518,10 +2529,8 @@ '| {{int:filehist-dimensions}} || {{int:filehist-comment}}\n' '|-\n%s\n|}\n' % '\n|-\n'.join(lines)) - @deprecated_args(step=True) - def usingPages(self, total=None, content=False): - """ - Yield Pages on which the file is displayed. + def usingPages(self, total: Optional[int] = None, content: bool = False): + """Yield Pages on which the file is displayed. @param total: iterate no more than this number of pages in total @param content: if True, load the current content of each iterated page @@ -2647,8 +2656,8 @@ """A page in the Category: namespace.""" - @deprecated_args(insite=True, sortKey='sort_key') - def __init__(self, source, title='', sort_key=None): + @deprecated_args(sortKey='sort_key') + def __init__(self, source, title: str = '', sort_key=None): """ Initializer. @@ -2660,10 +2669,8 @@ raise ValueError("'%s' is not in the category namespace!" % title) - @deprecated_args( - forceInterwiki=True, textlink=True, noInterwiki=True, - sortKey='sort_key') - def aslink(self, sort_key=None) -> str: + @deprecated_args(sortKey='sort_key') + def aslink(self, sort_key: Optional[str] = None) -> str: """ Return a link to place a page in this Category. @@ -2672,7 +2679,6 @@ @param sort_key: The sort key for the article to be placed in this Category; if omitted, default sort key is used. - @type sort_key: (optional) str """ key = sort_key or self.sortKey if key is not None: @@ -2681,8 +2687,10 @@ title_with_sort_key = self.title(with_section=False) return '[[%s]]' % title_with_sort_key - @deprecated_args(startFrom=True, cacheResults=True, step=True) - def subcategories(self, recurse=False, total=None, content=False): + def subcategories(self, + recurse: Union[int, bool] = False, + total: Optional[int] = None, + content: bool = False): """ Iterate all subcategories of the current category. @@ -2690,7 +2698,6 @@ subcategories. If an int, limit recursion to this number of levels. (Example: recurse=1 will iterate direct subcats and first-level sub-sub-cats, but no deeper.) - @type recurse: int or bool @param total: iterate no more than this number of subcategories in total (at all levels) @param content: if True, retrieve the content of the current version @@ -2733,13 +2740,15 @@ if total == 0: return - @deprecated_args(startFrom='startprefix', step=True) + @deprecated_args(startFrom='startprefix') def articles(self, recurse: Union[int, bool] = False, - total=None, content=False, + total: Optional[int] = None, + content: bool = False, namespaces: Union[int, List[int]] = None, - sortby: str = None, - reverse=False, starttime=None, endtime=None, + sortby: Optional[str] = None, + reverse: bool = False, + starttime=None, endtime=None, startsort: Optional[str] = None, endsort: Optional[str] = None, startprefix: Optional[str] = None, @@ -2831,8 +2840,9 @@ if total == 0: return - @deprecated_args(step=True) - def members(self, recurse=False, namespaces=None, total=None, + def members(self, recurse: bool = False, + namespaces=None, + total: Optional[int] = None, content=False): """Yield all category contents (subcats, pages, and files). @@ -6490,7 +6500,7 @@ return string -@deprecated_args(site2=True, site='encodings') +@deprecated_args(site='encodings') def url2unicode(title: str, encodings='utf-8') -> str: """ Convert URL-encoded text to unicode using several encoding. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/628121 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: I0c3889464530dcc55039e945bb0a89c5a0c500e8 Gerrit-Change-Number: 628121 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [cleanup] remove desupported txtlib.TEMP_REGEX
by jenkins-bot (Code Review) 29 Sep '20

29 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630642 ) Change subject: [cleanup] remove desupported txtlib.TEMP_REGEX ...................................................................... [cleanup] remove desupported txtlib.TEMP_REGEX Change-Id: Ifa430ce119d0e77e9e997cea99c5e7be6f8e89cd --- M pywikibot/textlib.py M tests/textlib_tests.py 2 files changed, 1 insertion(+), 50 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 972c290..d7945db 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -26,7 +26,6 @@ from pywikibot.tools import ( deprecate_arg, deprecated, - DeprecatedRegex, issue_deprecation_warning, ) @@ -46,22 +45,6 @@ r'{{(?:msg:)?(?P<name>[^{\|]+?)' r'(?:\|(?P<params>[^{]+?(?:{[^{]+?}[^{]*?)?)?)?}}') -# This template is a more inclusive template matching algorithm -# that allows system variables, but does not match nested templates. -# It exists for backwards compatibility to the old 'TEMP_REGEX' -# which was the _ETP_REGEX. -TEMP_REGEX = DeprecatedRegex( - r""" - {{\s*(?:msg:\s*)? - (?P<name>[^{\|]+?)\s* - (?:\|(?P<params>[^{]* - (?:(?:{}|{{[A-Z]+(?:\:[^}])?}}|{{{[^}]+}}}) [^{]*)* - )? - )? - }} - """, re.VERBOSE, 'textlib.TEMP_REGEX', 'textlib.NESTED_TEMPLATE_REGEX', - since='20150212') - # The regex below collects nested templates, providing simpler # identification of templates used at the top-level of wikitext. # It doesn't match {{{1|...}}}, however it also does not match templates diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index b647ab6..e3bdbd9 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -5,8 +5,6 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import codecs from collections import OrderedDict import functools @@ -18,7 +16,6 @@ from pywikibot.site import _IWEntry from pywikibot.textlib import _MultiTemplateMatchBuilder, extract_sections -from pywikibot.tools import suppress_warnings from pywikibot import UnknownSite from tests.aspects import ( @@ -591,7 +588,7 @@ [(None, OrderedDict())]) def test_regexes(self): - """Test _ETP_REGEX, NESTED_TEMPLATE_REGEX and TEMP_REGEX.""" + """Test _ETP_REGEX and NESTED_TEMPLATE_REGEX.""" func = textlib._ETP_REGEX.search self.assertIsNotNone(func('{{{1}}}')) @@ -623,35 +620,6 @@ self.assertIsNone(func('{{a|{{c}} }}')) self.assertIsNone(func('{{a|{{c|d}} }}')) - with suppress_warnings('textlib.TEMP_REGEX is deprecated'): - func = textlib.TEMP_REGEX.search - - self.assertIsNotNone(func('{{{1}}}')) - self.assertIsNotNone(func('{{a|b={{c}} }}')) - self.assertIsNotNone(func('{{a|b={{c|d=1}} }}')) - self.assertIsNotNone(func('{{a|{{c}} }}')) - self.assertIsNotNone(func('{{a|{{c|d}} }}')) - - with suppress_warnings('textlib.TEMP_REGEX is deprecated'): - func = textlib.TEMP_REGEX.match - - self.assertIsNotNone(func('{{#if:foo}}')) - self.assertIsNotNone(func('{{foo:}}')) - - self.assertIsNotNone(func('{{CURRENTYEAR}}')) - self.assertIsNotNone(func('{{1}}')) - - self.assertIsNotNone(func('{{a|b={{CURRENTYEAR}} }}')) - self.assertIsNotNone(func('{{a|b={{{1}}} }}')) - - self.assertIsNone(func('{{a|b={{c}} }}')) - self.assertIsNone(func('{{a|b={{c|d=1}} }}')) - self.assertIsNotNone(func('{{a|b={} }}')) - self.assertIsNone(func('{{:a|b={{c|d=1}} }}')) - - self.assertIsNone(func('{{a|{{c}} }}')) - self.assertIsNone(func('{{a|{{c|d}} }}')) - func = textlib.NESTED_TEMPLATE_REGEX.search # Numerically named templates are rejected -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630642 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: Ifa430ce119d0e77e9e997cea99c5e7be6f8e89cd Gerrit-Change-Number: 630642 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [cleanup] remove desupported Djvu.file_djvu property
by jenkins-bot (Code Review) 29 Sep '20

29 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630628 ) Change subject: [cleanup] remove desupported Djvu.file_djvu property ...................................................................... [cleanup] remove desupported Djvu.file_djvu property Change-Id: I7991a52125ad7ba2cf8551b32d5c76ca7b9b92c9 --- M pywikibot/tools/djvu.py 1 file changed, 1 insertion(+), 7 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/djvu.py b/pywikibot/tools/djvu.py index f13436c..73992b0 100644 --- a/pywikibot/tools/djvu.py +++ b/pywikibot/tools/djvu.py @@ -14,7 +14,7 @@ import pywikibot -from pywikibot.tools import deprecated, deprecated_args +from pywikibot.tools import deprecated_args def _call_cmd(args, lib='djvulibre') -> tuple: @@ -92,12 +92,6 @@ """Return a string representation.""" return str("{}('{}')").format(self.__class__.__name__, self._filename) - @property - @deprecated('DjVuFile.file', since='2010222', future_warning=True) - def file_djvu(self): - """Deprecated file_djvu instance variable.""" - return self.file - def check_cache(fn): """Decorator to check if cache shall be cleared.""" cache = ['_page_count', '_has_text', '_page_info'] -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630628 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: I7991a52125ad7ba2cf8551b32d5c76ca7b9b92c9 Gerrit-Change-Number: 630628 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

1 0

[Gerrit] ...core[master]: [cleanup] Show a FutureWarning for methods which are deprecated for 5...
by jenkins-bot (Code Review) 28 Sep '20

28 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630638 ) Change subject: [cleanup] Show a FutureWarning for methods which are deprecated for 5 years ...................................................................... [cleanup] Show a FutureWarning for methods which are deprecated for 5 years Bug: T106121 Change-Id: I9678cb0866b07c683fde3a9a925856fbfbc0f126 --- M pywikibot/__init__.py M pywikibot/bot.py M pywikibot/comms/http.py M pywikibot/data/api.py M pywikibot/date.py M pywikibot/editor.py M pywikibot/families/wikimediachapter_family.py M pywikibot/family.py M pywikibot/i18n.py M pywikibot/logentries.py M pywikibot/page/__init__.py M pywikibot/site/__init__.py M pywikibot/textlib.py M pywikibot/tools/__init__.py 14 files changed, 71 insertions(+), 47 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index df21568..7045a95 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -1252,7 +1252,8 @@ # alias for backwards-compability -getSite = redirect_func(Site, old_name='getSite', since='20150924') +getSite = redirect_func(Site, old_name='getSite', since='20150924', + future_warning=True) # These imports depend on Wb* classes above. @@ -1408,12 +1409,12 @@ wrapper = _ModuleDeprecationWrapper(__name__) wrapper._add_deprecated_attr( 'cookie_jar', replacement_name='pywikibot.comms.http.cookie_jar', - since='20150921') + since='20150921', future_warning=True) wrapper._add_deprecated_attr( 'QuitKeyboardInterrupt', _QuitKeyboardInterrupt, warning_message='pywikibot.QuitKeyboardInterrupt is deprecated; ' 'use pywikibot.bot.QuitKeyboardInterrupt instead.', - since='20150619') + since='20150619', future_warning=True) wrapper._add_deprecated_attr( 'MediaWikiVersion', _MediaWikiVersion, warning_message='pywikibot.MediaWikiVersion is deprecated; ' diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 619f6a6..da21a7f 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -863,7 +863,7 @@ return non_global_args -@deprecated('handle_args', since='20150409') +@deprecated('handle_args', since='20150409', future_warning=True) def handleArgs(*args): """DEPRECATED. Use handle_args().""" return handle_args(args) @@ -1545,7 +1545,8 @@ super().__init__(**kwargs) @property - @deprecated("the page's site property", since='20150615') + @deprecated("the page's site property", since='20150615', + future_warning=True) def site(self): """ Return the site if it's set and ValueError otherwise. diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 74e5f98..ffd1c48 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -242,7 +242,7 @@ # +1 because of @deprecate_arg issue_deprecation_warning( 'Invoking http.request without argument site', 'http.fetch()', 3, - since='20150814') + warning_class=FutureWarning, since='20150814') r = fetch(uri, method, params, body, headers, **kwargs) return r.text diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index be9f6b2..e7be358 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -708,7 +708,7 @@ return {'{}+{}'.format(prefix, mod) for mod in modules} @property - @deprecated('prefix_map', since='20150715') + @deprecated('prefix_map', since='20150715', future_warning=True) def prefixes(self): """ Mapping of module to its prefix for all modules with a prefix. @@ -752,7 +752,7 @@ return {mod: self[mod][attribute] for mod in modules if attribute in self[mod]} - @deprecated('attributes', since='20150715') + @deprecated('attributes', since='20150715', future_warning=True) def module_attribute_map(self, attribute: str, modules: Optional[set] = None): """ @@ -775,7 +775,7 @@ for mod in modules if self[mod][attribute]} @property - @deprecated('parameter()', since='20150905') + @deprecated('parameter()', since='20150905', future_warning=True) def query_modules_with_limits(self): """Set of all query modules which have limits.""" if not self._with_limits: diff --git a/pywikibot/date.py b/pywikibot/date.py index 9d0bf50..360099e 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -177,7 +177,7 @@ return v[0] -@deprecated(since='20151014') +@deprecated(since='20151014', future_warning=True) def encNoConv(i): """Return i.""" return i @@ -2164,7 +2164,7 @@ formatLimits[dayMnthFmts[monthId]] = _format_limit_dom(30) -@deprecated('calendar.monthrange', since='20150707') +@deprecated('calendar.monthrange', since='20150707', future_warning=True) def getNumberOfDaysInMonth(month): """ Return the maximum number of days in a given month, 1 being January, etc. diff --git a/pywikibot/editor.py b/pywikibot/editor.py index b505a56..a95401d 100644 --- a/pywikibot/editor.py +++ b/pywikibot/editor.py @@ -71,8 +71,7 @@ return ' '.join("'{0}'".format(part) if ' ' in part else part for part in command) - @deprecated('_command (should not be used from the outside)', - since='20150111', future_warning=True) + @deprecated(since='20150111', future_warning=True) def command(self, tempFilename, text, jumpIndex=None): """Return editor selected in user-config.py.""" return TextEditor._concat(self._command(tempFilename, text, jumpIndex)) diff --git a/pywikibot/families/wikimediachapter_family.py b/pywikibot/families/wikimediachapter_family.py index ed59ba5..063f771 100644 --- a/pywikibot/families/wikimediachapter_family.py +++ b/pywikibot/families/wikimediachapter_family.py @@ -28,7 +28,7 @@ ] @classproperty - @deprecated(since='20150621') + @deprecated(since='20150621', future_warning=True) def countries(cls): """Deprecated.""" return cls.codes diff --git a/pywikibot/family.py b/pywikibot/family.py index 58e2c92..e980d95 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -663,14 +663,17 @@ issue_deprecation_warning('nocapitalize', "APISite.siteinfo['case'] or " "Namespace.case == 'case-sensitive'", + warning_class=FutureWarning, since='20150214') elif name == 'known_families': issue_deprecation_warning('known_families', 'APISite.interwiki(prefix)', + warning_class=FutureWarning, since='20150503') elif name == 'shared_data_repository': issue_deprecation_warning('shared_data_repository', 'APISite.data_repository()', + warning_class=FutureWarning, since='20151023') return super().__getattribute__(name) @@ -731,14 +734,15 @@ return cls @classproperty - @deprecated('Family.codes or APISite.validLanguageLinks', since='20151014') + @deprecated('Family.codes or APISite.validLanguageLinks', since='20151014', + future_warning=True) def iwkeys(cls): """DEPRECATED: List of (interwiki_forward's) family codes.""" if cls.interwiki_forward: return list(pywikibot.Family(cls.interwiki_forward).langs.keys()) return list(cls.langs.keys()) - @deprecated('APISite.interwiki', since='20151014') + @deprecated('APISite.interwiki', since='20151014', future_warning=True) def get_known_families(self, site): """DEPRECATED: Return dict of inter-family interwiki links.""" return self.known_families @@ -912,7 +916,7 @@ """Return path to api.php.""" return '%s/api.php' % self.scriptpath(code) - @deprecated('APISite.article_path', since='20150905') + @deprecated('APISite.article_path', since='20150905', future_warning=True) def nicepath(self, code): """DEPRECATED: Return nice path prefix, e.g. '/wiki/'.""" return '/wiki/' @@ -930,7 +934,8 @@ """Return the path to title using index.php with redirects disabled.""" return '%s?title=%s&redirect=no' % (self.path(code), title) - @deprecated('APISite.nice_get_address(title)', since='20150628') + @deprecated('APISite.nice_get_address(title)', since='20150628', + future_warning=True) def nice_get_address(self, code, title): """DEPRECATED: Return the nice path to title using index.php.""" return '%s%s' % (self.nicepath(code), title) diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 99fe2e3..d748422 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -775,7 +775,7 @@ return trans -@deprecated('twtranslate', since='20151009') +@deprecated('twtranslate', since='20151009', future_warning=True) @deprecated_args(code='source') def twntranslate(source, twtitle, parameters=None): """DEPRECATED: Get translated string for the key.""" diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index 61a31a3..b9a5d41 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -99,7 +99,7 @@ else: # try old mw style preceding mw 1.19 return self[self._expected_type] - @deprecated('page()', since='20150617') + @deprecated('page()', since='20150617', future_warning=True) def title(self): """ DEPRECATED: Alias for page(). @@ -285,7 +285,7 @@ _expected_type = 'move' - @deprecated('target_ns.id', since='20150518') + @deprecated('target_ns.id', since='20150518', future_warning=True) def new_ns(self): """Return namespace id of target page.""" return self.target_ns.id @@ -298,7 +298,7 @@ if 'target_ns' in self._params else self._params['new_ns']] - @deprecated('target_page', since='20150518') + @deprecated('target_page', since='20150518', future_warning=True) def new_title(self): """Return page object of the new title.""" return self.target_page diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index f819ab0..d22780a 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -584,12 +584,12 @@ del self.latest_revision_id self._revid = value - @deprecated('latest_revision_id', since='20150727') + @deprecated('latest_revision_id', since='20150727', future_warning=True) def latestRevision(self): """Return the current revision id for this page.""" return self.latest_revision_id - @deprecated('latest_revision_id', since='20150407') + @deprecated('latest_revision_id', since='20150407', future_warning=True) def pageAPInfo(self): """Return the current revision id for this page.""" if self.isRedirectPage(): @@ -738,7 +738,7 @@ @property @deprecated('latest_revision.parent_id (0 instead of -1 when no parent)', - since='20150609') + since='20150609', future_warning=True) def previous_revision_id(self) -> int: """ Return the revision id for the previous revision of this Page. @@ -748,7 +748,7 @@ return self.latest_revision.parent_id or -1 @deprecated('latest_revision.parent_id (0 instead of -1 when no parent)', - since='20150609') + since='20150609', future_warning=True) def previousRevision(self) -> int: """ Return the revision id for the previous revision. @@ -833,7 +833,7 @@ return Category(Link(self._catredirect, self.site)) raise pywikibot.IsNotRedirectPage(self) - @deprecated(since='20151207') + @deprecated(since='20151207', future_warning=True) def isEmpty(self) -> bool: """ Return True if the page text has less than 4 characters. @@ -1638,7 +1638,7 @@ """ return self.site.getredirtarget(self) - @deprecated('moved_target()', since='20150524') + @deprecated('moved_target()', since='20150524', future_warning=True) def getMovedTarget(self): """ Return a Page object for the target this Page was moved to. @@ -1748,7 +1748,8 @@ return sum(cnt[user.username] if isinstance(user, User) else cnt[user] for user in contributors) - @deprecated('contributors() or revisions()', since='20150206') + @deprecated('contributors() or revisions()', since='20150206', + future_warning=True) @deprecated_args(limit='total') def getLatestEditors(self, total=1) -> list: """ @@ -2130,7 +2131,7 @@ 'required.' % self.title(as_link=True)) return False - @deprecated('Page.is_flow_page()', since='20150128') + @deprecated('Page.is_flow_page()', since='20150128', future_warning=True) def isFlowPage(self): """DEPRECATED: use self.is_flow_page instead.""" return self.is_flow_page() @@ -2171,7 +2172,7 @@ # ####### DEPRECATED METHODS ######## - @deprecated('Page.protection()', since='20150725') + @deprecated('Page.protection()', since='20150725', future_warning=True) def getRestrictions(self): """DEPRECATED. Use self.protection() instead.""" restrictions = self.protection() @@ -4108,6 +4109,7 @@ if name == 'lastrevid': issue_deprecation_warning( 'WikibasePage.lastrevid', 'latest_revision_id', + warning_class=FutureWarning, since='20150607') name = '_revid' return super().__getattribute__(name) @@ -4117,6 +4119,7 @@ if attr == 'lastrevid': issue_deprecation_warning( 'WikibasePage.lastrevid', 'latest_revision_id', + warning_class=FutureWarning, since='20150607') attr = '_revid' return super().__setattr__(attr, value) @@ -4126,6 +4129,7 @@ if attr == 'lastrevid': issue_deprecation_warning( 'WikibasePage.lastrevid', 'latest_revision_id', + warning_class=FutureWarning, since='20150607') attr = '_revid' return super().__delattr__(attr) diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index dfcd1b3..72b0dac 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -386,7 +386,8 @@ return False @classmethod - @deprecated('NamespacesDict.lookup_name', since='20150703') + @deprecated('NamespacesDict.lookup_name', since='20150703', + future_warning=True) def lookup_name(cls, name, namespaces=None): """ Find the Namespace for a name. @@ -404,7 +405,8 @@ return NamespacesDict._lookup_name(name, namespaces) @staticmethod - @deprecated('NamespacesDict.resolve', since='20150703') + @deprecated('NamespacesDict.resolve', since='20150703', + future_warning=True) def resolve(identifiers, namespaces=None): """ Resolve namespace identifiers to obtain Namespace objects. @@ -943,7 +945,8 @@ """ return self._interwikimap[prefix].local - @deprecated('APISite.namespaces.lookup_name', since='20150703') + @deprecated('APISite.namespaces.lookup_name', since='20150703', + future_warning=True) def ns_index(self, namespace): """ Return the Namespace for a given namespace name. @@ -955,7 +958,8 @@ """ return self.namespaces.lookup_name(namespace) - @deprecated('APISite.namespaces.lookup_name', since='20150703') + @deprecated('APISite.namespaces.lookup_name', since='20150703', + future_warning=True) def getNamespaceIndex(self, namespace): """DEPRECATED: Return the Namespace for a given namespace name.""" return self.namespaces.lookup_name(namespace) @@ -1152,7 +1156,8 @@ """Return local name for the Category namespace.""" return self.namespace(14) - @deprecated('list(namespaces.CATEGORY)', since='20150829') + @deprecated('list(namespaces.CATEGORY)', since='20150829', + future_warning=True) def category_namespaces(self): """Return names for the Category namespace.""" return list(self.namespace(14, all=True)) @@ -1174,7 +1179,8 @@ # deprecated methods for backwards-compatibility - @deprecated('pywikibot.data.api.encode_url', since='20151211') + @deprecated('pywikibot.data.api.encode_url', since='20151211', + future_warning=True) def urlEncode(self, query): """DEPRECATED.""" return api.encode_url(query) @@ -1978,7 +1984,7 @@ else: return [word] - @deprecated('expand_text', since='20150831') + @deprecated('expand_text', since='20150831', future_warning=True) def resolvemagicwords(self, wikitext): """ Replace the {{ns:xx}} marks in a wikitext with the namespace names. @@ -2073,7 +2079,8 @@ """Site information dict.""" return self._siteinfo - @deprecated('siteinfo or Namespace instance', since='20150830') + @deprecated('siteinfo or Namespace instance', since='20150830', + future_warning=True) def case(self): """Return this site's capitalization rule.""" # This is the global setting via $wgCapitalLinks, it is used whenever @@ -2084,7 +2091,7 @@ """Return this site's internal id.""" return self.siteinfo['wikiid'] - @deprecated('APISite.lang', since='20150629') + @deprecated('APISite.lang', since='20150629', future_warning=True) def language(self): """Return the code for the language of this Site.""" return self.lang @@ -2468,7 +2475,8 @@ return (pageitem['imageinfo'] if history else pageitem['imageinfo'][0]) - @deprecated('Check the content model instead', since='20150128') + @deprecated('Check the content model instead', since='20150128', + future_warning=True) def loadflowinfo(self, page): """ Load Flow-related information about a given page. @@ -2938,7 +2946,7 @@ return user_tokens - @deprecated("the 'tokens' property", since='20150218') + @deprecated("the 'tokens' property", since='20150218', future_warning=True) @remove_last_args(['sysop']) def getToken(self, getalways=True, getagain=False): """DEPRECATED: Get edit token.""" @@ -2955,7 +2963,7 @@ del self.tokens._tokens[self.user()][token] return self.tokens[token] - @deprecated("the 'tokens' property", since='20150218') + @deprecated("the 'tokens' property", since='20150218', future_warning=True) @remove_last_args(['sysop']) def getPatrolToken(self): """DEPRECATED: Get patrol token.""" @@ -5618,7 +5626,8 @@ '"report_success" is True or None', '"report_success=False" or define ' '"ignore_warnings" as callable/iterable', - 3, since='20150823') + 3, warning_class=FutureWarning, + since='20150823') if isinstance(ignore_warnings, Iterable): ignored_warnings = ignore_warnings @@ -6914,6 +6923,7 @@ """Check that claim.on_item is set and matches baserevid if used.""" if not claim.on_item: issue_deprecation_warning('claim without on_item set', depth=3, + warning_class=FutureWarning, since='20160309') if not baserevid: warn('Neither claim.on_item nor baserevid provided', @@ -6965,7 +6975,8 @@ else: # urls instead = None issue_deprecation_warning('DataSite.{0}()'.format(attr), - instead, since='20151022') + instead, warning_class=FutureWarning, + since='20151022') if props == 'urls': props = 'sitelinks/urls' method = self._get_propertyitem diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 972c290..2fe5fe2 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -313,6 +313,7 @@ issue_deprecation_warning( 'site=None', "a valid site for '{}' regex".format(exc), + warning_class=FutureWarning, since='20151006') site = pywikibot.Site() @@ -2034,7 +2035,7 @@ """Deprecated comment_pattern instance variable.""" return self._comment_pat - @deprecated('module function', since='20151118') + @deprecated('module function', since='20151118', future_warning=True) def findmarker(self, text: str, base: str = '@@', delta: str = '@'): """Find a string which is not part of text.""" return findmarker(text, base, delta) diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 9293b20..10bf6bc 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -892,7 +892,9 @@ """Do nothing and just return itself.""" if hasattr(self, '_own_desc'): issue_deprecation_warning('Calling {}'.format(self._own_desc), - 'it directly', since='20150515') + 'it directly', + warning_class=FutureWarning, + since='20150515') return self -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630638 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: I9678cb0866b07c683fde3a9a925856fbfbc0f126 Gerrit-Change-Number: 630638 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Isaacandy <isaac(a)iznd.xyz> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Raise RuntimeError instead of AttributeError for old wikis
by jenkins-bot (Code Review) 28 Sep '20

28 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630384 ) Change subject: [bugfix] Raise RuntimeError instead of AttributeError for old wikis ...................................................................... [bugfix] Raise RuntimeError instead of AttributeError for old wikis - raise RuntimeError if version is outdated at an early point - add ecoreality to Pre119SiteTestCase - remove test_wikitree, the url is not reachable Bug: T263951 Change-Id: I93d5043e34cc80fc70634055f04ff0ea90a3cd7b --- M pywikibot/site_detect.py M tests/site_detect_tests.py 2 files changed, 23 insertions(+), 19 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py index d55342a..4e9b100 100644 --- a/pywikibot/site_detect.py +++ b/pywikibot/site_detect.py @@ -21,6 +21,8 @@ SERVER_DB_ERROR_MSG = \ '<h1>Sorry! This site is experiencing technical difficulties.</h1>' +MIN_VERSION = MediaWikiVersion('1.19') + class MWSite: @@ -41,7 +43,7 @@ check_response(r) if fromurl != r.data.url: - pywikibot.log('{0} redirected to {1}'.format(fromurl, r.data.url)) + pywikibot.log('{} redirected to {}'.format(fromurl, r.data.url)) fromurl = r.data.url self.fromurl = fromurl @@ -62,13 +64,16 @@ except (ServerError, RequestException): raise except Exception as e: - pywikibot.log('MW detection failed: {0!r}'.format(e)) + pywikibot.log('MW detection failed: {!r}'.format(e)) if not self.version: self._fetch_old_version() if not self.api: - raise RuntimeError('Unsupported url: {0}'.format(self.fromurl)) + raise RuntimeError('Unsupported url: {}'.format(self.fromurl)) + + if not self.version or self.version < MIN_VERSION: + raise RuntimeError('Unsupported version: {}'.format(self.version)) if not self.articlepath: if self.private_wiki: @@ -80,14 +85,10 @@ 'private. Use the Main Page URL instead of the API.') else: raise RuntimeError('Unable to determine articlepath: ' - '{0}'.format(self.fromurl)) - - if (not self.version - or self.version < MediaWikiVersion('1.19')): - raise RuntimeError('Unsupported version: {0}'.format(self.version)) + '{}'.format(self.fromurl)) def __repr__(self): - return '{0}("{1}")'.format( + return '{}("{}")'.format( self.__class__.__name__, self.fromurl) @property @@ -150,8 +151,9 @@ info = site.siteinfo else: info = info['query']['general'] + self.version = MediaWikiVersion.from_generator(info['generator']) - if self.version < MediaWikiVersion('1.17'): + if self.version < MIN_VERSION: return self.server = urljoin(self.fromurl, info['server']) @@ -228,7 +230,7 @@ if not new_parsed_url.scheme or not new_parsed_url.netloc: new_parsed_url = urlparse( - '{0}://{1}{2}'.format( + '{}://{}{}'.format( new_parsed_url.scheme or self.url.scheme, new_parsed_url.netloc or self.url.netloc, new_parsed_url.path)) @@ -244,11 +246,11 @@ or self._parsed_url.netloc in new_parsed_url.netloc): return - assert new_parsed_url == self._parsed_url, '{0} != {1}'.format( + assert new_parsed_url == self._parsed_url, '{} != {}'.format( self._parsed_url, new_parsed_url) self._parsed_url = new_parsed_url - self.server = '{0}://{1}'.format( + self.server = '{}://{}'.format( self._parsed_url.scheme, self._parsed_url.netloc) self.scriptpath = self._parsed_url.path diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index 03b9946..34b4878 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -107,16 +107,18 @@ def test_hrwiki(self): """Test detection of MediaWiki sites for www.hrwiki.org.""" - self.assertNoSite('http://www.hrwiki.org/index.php/$1') # v 1.15 + self.assertNoSite('http://www.hrwiki.org/index.php/$1') # v 1.15.4 def test_wikifon(self): """Test detection of MediaWiki sites for www.wikifon.org.""" - self.assertNoSite('http://www.wikifon.org/$1') # v1.11 + self.assertNoSite('http://www.wikifon.org/$1') # v1.11.0 - def test_wikitree(self): - """Test detection of MediaWiki sites for wikitree.org.""" - # v1.11, with no query module - self.assertNoSite('http://wikitree.org/index.php?title=$1') + def test_ecoreality(self): + """Test detection of MediaWiki sites for www.ecoreality.org. + + api.php is not available. Anyway the wiki is outdated. + """ + self.assertNoSite('http://www.ecoreality.org/wiki/$1') # v1.16.2 class PreAPISiteTestCase(SiteDetectionTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630384 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: I93d5043e34cc80fc70634055f04ff0ea90a3cd7b Gerrit-Change-Number: 630384 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [cleanup] Remove ArgumentDeprecationWarning for several scripts
by jenkins-bot (Code Review) 28 Sep '20

28 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612556 ) Change subject: [cleanup] Remove ArgumentDeprecationWarning for several scripts ...................................................................... [cleanup] Remove ArgumentDeprecationWarning for several scripts remove issue_deprecation_warning for outdated options which are printed as ArgumentDeprecationWarning (which is both, a FutureWarning and a UserWarning) since years Change-Id: I55f8228b531666c5eb08452d939c97da35beb792 --- M pywikibot/pagegenerators.py M scripts/checkimages.py M scripts/delete.py M scripts/imageuncat.py M scripts/movepages.py M scripts/nowcommons.py M scripts/pagefromfile.py M scripts/redirect.py M scripts/replace.py M scripts/table2wiki.py M scripts/template.py M scripts/unusedfiles.py M tests/pagegenerators_tests.py 13 files changed, 31 insertions(+), 182 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index b9b163e..9b8e460 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -31,7 +31,6 @@ from functools import partial from itertools import zip_longest from requests.exceptions import ReadTimeout -from warnings import warn import pywikibot @@ -41,7 +40,6 @@ DequeGenerator, filter_unique, intersect_generators, - issue_deprecation_warning, itergroup, ModuleDeprecationWrapper, redirect_func, @@ -50,11 +48,7 @@ from pywikibot import date, config, i18n, xmlreader from pywikibot.bot import ShowingListOption from pywikibot.comms import http -from pywikibot.exceptions import ( - ArgumentDeprecationWarning, - ServerError, - UnknownExtension, -) +from pywikibot.exceptions import ServerError, UnknownExtension from pywikibot.proofreadpage import ProofreadPage @@ -586,43 +580,30 @@ return dupfiltergen @deprecated_args(arg='category') - def getCategory(self, category): + def getCategory(self, category: str) -> tuple: """ Return Category and start as defined by category. @param category: category name with start parameter - @type category: str - @rtype: tuple """ - if category and category.startswith('-'): - categoryname = category.partition(':')[2] - issue_deprecation_warning( - 'The usage of "{0}" as actual parameter of ' - 'pagegenerators.getCategory'.format(category), - categoryname, depth=3, - warning_class=ArgumentDeprecationWarning, - since='20141019') - else: - categoryname = category - - if not categoryname: - categoryname = i18n.input( + if not category: + category = i18n.input( 'pywikibot-enter-category-name', fallback_prompt='Please enter the category name:') - categoryname = categoryname.replace('#', '|') + category = category.replace('#', '|') - categoryname, sep, startfrom = categoryname.partition('|') + category, _, startfrom = category.partition('|') if not startfrom: startfrom = None - # Insert Category: before category name to avoid parsing problems in + # Insert "Category:" before category name to avoid parsing problems in # Link.parse() when categoryname contains ":"; # Part before ":" might be interpreted as an interwiki prefix - prefix = categoryname.split(':', 1)[0] # whole word if ":" not present + prefix = category.split(':', 1)[0] # whole word if ":" not present if prefix not in self.site.namespaces[14]: - categoryname = '{0}:{1}'.format( - self.site.namespace(14), categoryname) - cat = pywikibot.Category(pywikibot.Link(categoryname, + category = '{}:{}'.format( + self.site.namespace(14), category) + cat = pywikibot.Category(pywikibot.Link(category, source=self.site, default_namespace=14)) return cat, startfrom @@ -713,7 +694,7 @@ valid_cats = [c for _list in cats.values() for c in _list] value = '' if value is None else value - cat, sep, lint_from = value.partition('/') + cat, _, lint_from = value.partition('/') if not lint_from: lint_from = None @@ -880,11 +861,7 @@ def _handle_namespaces(self, value): """Handle `-namespaces` argument.""" - if isinstance(self._namespaces, frozenset): - warn('Cannot handle arg -namespaces as namespaces can not ' - 'be altered after a generator is created.', - ArgumentDeprecationWarning, 3) - return True + assert not isinstance(self._namespaces, frozenset) if not value: value = pywikibot.input('What namespace are you filtering on?') NOT_KEY = 'not:' @@ -1119,27 +1096,6 @@ (temp[0][0], temp[0][1], dict(temp[1:]), ifnot)) return True - @staticmethod - def _handle_yahoo(value): - """Handle `-yahoo` argument.""" - issue_deprecation_warning('-yahoo', depth=3, - warning_class=ArgumentDeprecationWarning, - since='20181125') - - @staticmethod - def _handle_untagged(value): - """Handle `-untagged` argument.""" - issue_deprecation_warning('-untagged', depth=3, - warning_class=ArgumentDeprecationWarning, - since='20161116') - - @staticmethod - def _handle_wikidataquery(value): - """Handle `-wikidataquery` argument.""" - issue_deprecation_warning('-wikidataquery', depth=3, - warning_class=ArgumentDeprecationWarning, - since='20170520') - def _handle_sparqlendpoint(self, value): """Handle `-sparqlendpoint` argument.""" if not value: @@ -1198,7 +1154,7 @@ value = arg arg = '-' + self._positional_arg_name else: - arg, sep, value = arg.partition(':') + arg, _, value = arg.partition(':') if value == '': value = None diff --git a/scripts/checkimages.py b/scripts/checkimages.py index e4271eb..1d612fa 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -92,12 +92,11 @@ import pywikibot from pywikibot.bot import suggest_help -from pywikibot.exceptions import ArgumentDeprecationWarning, NotEmailableError +from pywikibot.exceptions import NotEmailableError from pywikibot.family import Family from pywikibot import i18n from pywikibot import pagegenerators as pg from pywikibot.site import Namespace -from pywikibot.tools import issue_deprecation_warning ############################################################################### # <--------------------------- Change only below! ---------------------------># @@ -1549,15 +1548,9 @@ 'How many files do you want to check?')) else: limit = int(arg[7:]) - elif arg.startswith(('-sleep', '-time')): - if arg.startswith('-sleep'): - length = len('-sleep') - else: - issue_deprecation_warning('-time', '-sleep', 2, - ArgumentDeprecationWarning, - since='20151209') - length = len('-time') - if len(arg) == length: + elif arg.startswith('-sleep'): + length = len(arg) + if length == len('-sleep'): time_sleep = int(pywikibot.input( 'How many seconds do you want runs to be apart?')) else: @@ -1568,12 +1561,7 @@ logFullError = False elif arg == '-commons': commonsActive = True - elif arg == '-duplicatesreport' or arg == '-duplicatereport': - if arg == '-duplicatereport': - issue_deprecation_warning('-duplicatereport', - '-duplicatesreport', - 2, ArgumentDeprecationWarning, - since='20161116') + elif arg == '-duplicatesreport': duplicatesReport = True elif arg.startswith('-duplicates'): duplicatesActive = True diff --git a/scripts/delete.py b/scripts/delete.py index 0db37bc..ac63729 100755 --- a/scripts/delete.py +++ b/scripts/delete.py @@ -59,11 +59,9 @@ import collections from typing import Set -from warnings import warn import pywikibot -from pywikibot import exceptions from pywikibot import i18n, pagegenerators from pywikibot.bot import MultipleSitesBot, CurrentPageBot from pywikibot.page import Page @@ -256,10 +254,6 @@ summary = pywikibot.input('Enter a reason for the deletion:') else: summary = arg[len('-summary:'):] - elif arg.startswith('-images'): - warn('-image option is deprecated. Please use -imageused instead.', - exceptions.ArgumentDeprecationWarning) - local_args.append('-imageused' + arg[7:]) elif arg.startswith('-undelete'): options['undelete'] = True elif arg.startswith('-isorphan'): diff --git a/scripts/imageuncat.py b/scripts/imageuncat.py index 3e03bf8..5151df9 100755 --- a/scripts/imageuncat.py +++ b/scripts/imageuncat.py @@ -1354,14 +1354,6 @@ 'The usage of "-yesterday"', '-logevents:"upload,,YYYYMMDD,YYYYMMDD"', 2, ArgumentDeprecationWarning, since='20160305') - elif arg.startswith('-recentchanges'): - if param_value is None: - arg = arg + ':120,70' - issue_deprecation_warning( - '-recentchanges without parameters', - '-recentchanges:offset,duration', - 2, ArgumentDeprecationWarning, since='20160320') - gen_factory.handleArg(arg) else: gen_factory.handleArg(arg) diff --git a/scripts/movepages.py b/scripts/movepages.py index f6739dd..8c82286 100755 --- a/scripts/movepages.py +++ b/scripts/movepages.py @@ -42,8 +42,6 @@ from pywikibot import i18n, pagegenerators from pywikibot.bot import MultipleSitesBot -from pywikibot.exceptions import ArgumentDeprecationWarning -from pywikibot.tools import issue_deprecation_warning # This is required for the text that is shown when you run this script @@ -192,12 +190,7 @@ for arg in local_args: if genFactory.handleArg(arg): continue - if arg == '-pairs' or arg.startswith('-pairs:'): - issue_deprecation_warning( - '-pairs', - '-pairsfile', - 2, ArgumentDeprecationWarning, since='20160304') - elif arg.startswith('-pairsfile'): + if arg.startswith('-pairsfile'): if len(arg) == len('-pairsfile'): filename = pywikibot.input( 'Enter the name of the file containing pairs:') diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py index 48f4a4a..79c5135 100755 --- a/scripts/nowcommons.py +++ b/scripts/nowcommons.py @@ -51,16 +51,13 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - from itertools import chain import sys import pywikibot from pywikibot import Bot, i18n -from pywikibot.exceptions import ArgumentDeprecationWarning from pywikibot import pagegenerators as pg -from pywikibot.tools import filter_unique, issue_deprecation_warning +from pywikibot.tools import filter_unique from pywikibot.tools.formatter import color_format from scripts.image import ImageRobot as ImageBot @@ -190,7 +187,7 @@ 'replaceloose': False, 'replaceonly': False, }) - super(NowCommonsDeleteBot, self).__init__(**kwargs) + super().__init__(**kwargs) self.site = pywikibot.Site() if not self.site.has_image_repository: @@ -390,14 +387,6 @@ if arg == '-replacealways': options['replace'] = True options['replacealways'] = True - elif arg == '-hash': # T132303 - raise NotImplementedError( - "The '-hash' argument is not implemented anymore.") - elif arg == '-autonomous': - issue_deprecation_warning('-autonomous', '-always', 2, - ArgumentDeprecationWarning, - since='20140724') - options['always'] = True elif arg.startswith('-'): if arg[1:] in ('always', 'replace', 'replaceloose', 'replaceonly'): options[arg[1:]] = True diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index 537ae7c..de480d8 100755 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -70,13 +70,11 @@ import re from typing import Generator, Tuple -from warnings import warn import pywikibot from pywikibot import config, i18n from pywikibot.bot import CurrentPageBot, OptionHandler, SingleSiteBot -from pywikibot.exceptions import ArgumentDeprecationWarning class NoTitle(Exception): @@ -301,12 +299,7 @@ arg, sep, value = arg.partition(':') option = arg.partition('-')[2] # reader options - if option == 'start': - r_options['begin'] = value - warn('-start param (text that marks the beginning) of a page has ' - 'been deprecated in favor of begin; make sure to use the ' - 'updated param.', ArgumentDeprecationWarning) - elif option in ('begin', 'end', 'titlestart', 'titleend', 'title'): + if option in ('begin', 'end', 'titlestart', 'titleend', 'title'): r_options[option] = value elif option == 'file': filename = value diff --git a/scripts/redirect.py b/scripts/redirect.py index 3261cc4..69cf441 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -83,9 +83,7 @@ from pywikibot import i18n, xmlreader from pywikibot.bot import (ExistingPageBot, OptionHandler, RedirectPageBot, SingleSiteBot) -from pywikibot.exceptions import ArgumentDeprecationWarning from pywikibot.textlib import extract_templates_and_params_regex_simple -from pywikibot.tools import issue_deprecation_warning def space_to_underscore(link) -> str: @@ -731,13 +729,8 @@ gen_options[option] = int(value) elif option in ('page', 'start', 'until'): gen_options[option] = value - elif option in ('limit', 'total'): + elif option == 'limit': options['limit'] = gen_options['limit'] = int(value) - if option == 'total': - issue_deprecation_warning('The usage of "{0}"'.format(arg), - '-limit', 2, - ArgumentDeprecationWarning, - since='20190120') else: pywikibot.output('Unknown argument: ' + arg) diff --git a/scripts/replace.py b/scripts/replace.py index d725073..5e6ed05 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -150,17 +150,11 @@ import pywikibot from pywikibot import editor -from pywikibot.exceptions import ArgumentDeprecationWarning # Imports predefined replacements tasks from fixes.py from pywikibot import fixes from pywikibot import i18n, textlib, pagegenerators from pywikibot.bot import ExistingPageBot, SingleSiteBot -from pywikibot.tools import ( - chars, - deprecated, - deprecated_args, - issue_deprecation_warning, -) +from pywikibot.tools import chars, deprecated, deprecated_args # This is required for the text that is shown when you run this script @@ -384,7 +378,7 @@ return _get_text_exceptions(self.fix_set.exceptions or {}) -class XmlDumpReplacePageGenerator(object): +class XmlDumpReplacePageGenerator: """ Iterator that will yield Pages that might contain text to replace. @@ -893,11 +887,7 @@ xmlFilename = i18n.input('pywikibot-enter-xml-filename') else: xmlFilename = arg[5:] - elif arg.startswith(('-sql', '-mysqlquery')): - if arg.startswith('-sql'): - issue_deprecation_warning('The usage of "-sql"', '-mysqlquery', - 1, ArgumentDeprecationWarning, - since='20180617') + elif arg.startswith('-mysqlquery'): useSql = True sql_query = arg.partition(':')[2] elif arg.startswith('-excepttitle:'): @@ -930,11 +920,6 @@ edit_summary = True elif arg.startswith('-manualinput'): manual_input = True - elif arg.startswith('-replacementfile'): - issue_deprecation_warning( - '-replacementfile', - '-pairsfile', - 2, ArgumentDeprecationWarning, since='20160304') elif arg.startswith('-pairsfile'): if len(commandline_replacements) % 2: replacement_file_arg_misplaced = True diff --git a/scripts/table2wiki.py b/scripts/table2wiki.py index 0756847..925daa4 100644 --- a/scripts/table2wiki.py +++ b/scripts/table2wiki.py @@ -56,9 +56,7 @@ from pywikibot.bot import (SingleSiteBot, ExistingPageBot, NoRedirectPageBot, suggest_help, input_yn) -from pywikibot.exceptions import ArgumentDeprecationWarning from pywikibot.textlib import replaceExcept -from pywikibot.tools import issue_deprecation_warning # This is required for the text that is shown when you run this script # with the parameter -help. @@ -533,25 +531,15 @@ gen_factory = pagegenerators.GeneratorFactory(positional_arg_name='page') for arg in local_args: - option, sep, value = arg.partition(':') + option, _, value = arg.partition(':') if option == '-xml': filename = value or pywikibot.input( "Please enter the XML dump's filename:") gen = TableXmlDumpPageGenerator(filename) - elif option == '-auto': - issue_deprecation_warning( - 'The usage of "-auto"', '-always', - 1, ArgumentDeprecationWarning, since='20170205') - options['always'] = True elif option in ['-always', '-quiet', '-skipwarning']: options[option[1:]] = True else: - if option in ('-sql', '-mysqlquery'): - if option == '-sql': - issue_deprecation_warning( - 'The usage of "-sql"', '-mysqlquery', - 1, ArgumentDeprecationWarning, since='20170205') - + if option == '-mysqlquery': query = value or """ SELECT page_namespace, page_title FROM page JOIN text ON (page_id = old_id) diff --git a/scripts/template.py b/scripts/template.py index 78accae..2c18a7b 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -113,13 +113,11 @@ import re from itertools import chain -from warnings import warn import pywikibot from pywikibot import i18n, pagegenerators, textlib from pywikibot.bot import SingleSiteBot -from pywikibot.exceptions import ArgumentDeprecationWarning from pywikibot.pagegenerators import XMLDumpPageGenerator from pywikibot.tools import deprecated, filter_unique from scripts.replace import ReplaceRobot as ReplaceBot @@ -280,12 +278,6 @@ # read command line parameters local_args = pywikibot.handle_args(args) - # Avoid conflicts with pagegenerators.py parameters. - if any(arg.startswith('-category:') for arg in local_args): - warn('-category (to append a category to each edited page) has been' - ' renamed to -addcat; make sure you are using the correct param.', - ArgumentDeprecationWarning) - site = pywikibot.Site() gen_factory = pagegenerators.GeneratorFactory() for arg in local_args: diff --git a/scripts/unusedfiles.py b/scripts/unusedfiles.py index d563a80..7ee2549 100755 --- a/scripts/unusedfiles.py +++ b/scripts/unusedfiles.py @@ -16,14 +16,10 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import pywikibot from pywikibot import i18n, pagegenerators from pywikibot.bot import SingleSiteBot, AutomaticTWSummaryBot, ExistingPageBot -from pywikibot.exceptions import ArgumentDeprecationWarning from pywikibot.flow import Board -from pywikibot.tools import issue_deprecation_warning template_to_the_image = { 'meta': '{{Orphan file}}', @@ -51,7 +47,7 @@ self.availableOptions.update({ 'nouserwarning': False # do not warn uploader }) - super(UnusedFilesBot, self).__init__(**kwargs) + super().__init__(**kwargs) self.template_image = i18n.translate(self.site, template_to_the_image) @@ -129,11 +125,6 @@ arg, sep, value = arg.partition(':') if arg == '-limit': total = value - elif arg == '-total': - total = value - issue_deprecation_warning('The usage of "{0}"'.format(arg), - '-limit', 2, ArgumentDeprecationWarning, - since='20190120') else: options[arg[1:]] = True diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index ffbe993..aef081b 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -672,13 +672,8 @@ gf.handleArg('-ns:1,6') self.assertEqual(gf.namespaces, {1, 6}) self.assertIsInstance(gf.namespaces, frozenset) - with suppress_warnings( - 'Cannot handle arg -namespaces as namespaces can not be altered ' - 'after a generator is created.', - pywikibot.exceptions.ArgumentDeprecationWarning - ): + with self.assertRaises(AssertionError): gf.handleArg('-ns:0') - self.assertEqual(gf.namespaces, {1, 6}) def test_unsupported_quality_level_filter(self): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612556 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: I55f8228b531666c5eb08452d939c97da35beb792 Gerrit-Change-Number: 612556 Gerrit-PatchSet: 7 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [cleanup] Remove deprecated pywikbot.deprecated and pywikibot.depreca...
by jenkins-bot (Code Review) 28 Sep '20

28 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630603 ) Change subject: [cleanup] Remove deprecated pywikbot.deprecated and pywikibot.deprecate_arg ...................................................................... [cleanup] Remove deprecated pywikbot.deprecated and pywikibot.deprecate_arg deprecated and deprecate_arg decorators are imported from tools for all their occurences. The redirected pywikibot functions can be removed without having a FutureWarning first because they are for internal use only to deprecate or desupport framework code. Change-Id: I2a2b1d312a41cffc34ce4a21019cb1cffe84d4a5 --- M pywikibot/__init__.py 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index b855a0e..df21568 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -119,10 +119,6 @@ globals()[_name] = wrapped_func -deprecated = redirect_func(__deprecated) -deprecate_arg = redirect_func(_deprecate_arg) - - class Timestamp(datetime.datetime): """Class for handling MediaWiki timestamps. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630603 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: I2a2b1d312a41cffc34ce4a21019cb1cffe84d4a5 Gerrit-Change-Number: 630603 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

1 0

[Gerrit] ...core[master]: [cleanup] Cleanup for outdated MediaWiki versions
by jenkins-bot (Code Review) 28 Sep '20

28 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630585 ) Change subject: [cleanup] Cleanup for outdated MediaWiki versions ...................................................................... [cleanup] Cleanup for outdated MediaWiki versions Change-Id: Ibda7b9a96d26ee05d11f54907c420f2581b99830 --- M pywikibot/data/mysql.py M pywikibot/page/__init__.py 2 files changed, 12 insertions(+), 11 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/mysql.py b/pywikibot/data/mysql.py index 620d589..a1c1c77 100644 --- a/pywikibot/data/mysql.py +++ b/pywikibot/data/mysql.py @@ -6,6 +6,7 @@ # Distributed under the terms of the MIT license. # from contextlib import closing +from typing import Optional import pywikibot @@ -20,7 +21,9 @@ @deprecated_args(encoding=None) -def mysql_query(query: str, params=None, dbname=None, verbose=None): +def mysql_query(query: str, params=None, + dbname: Optional[str] = None, + verbose: Optional[bool] = None): """Yield rows from a MySQL query. An example query that yields all ns0 pages might look like:: @@ -31,19 +34,17 @@ FROM page WHERE page_namespace = 0; - From MediaWiki 1.5, all projects use Unicode (UTF-8) character encoding. + Supported MediaWiki projects use Unicode (UTF-8) character encoding. Cursor charset is utf8. @param query: MySQL query to execute @param params: input parameters for the query, if needed if list or tuple, %s shall be used as placeholder in the query string. if a dict, %(key)s shall be used as placeholder in the query string. - @type params: tuple, list or dict of str (unicode in py2) + @type params: tuple, list or dict of str @param dbname: db name - @type dbname: str @param verbose: if True, print query to be executed; if None, config.verbose_output will be used. - @type verbose: None or bool @return: generator which yield tuples """ # These are specified in config2.py or user-config.py diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 5452121..f819ab0 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -1963,23 +1963,23 @@ @deprecated_args(throttle=True) def protect(self, edit=False, move=False, create=None, upload=None, - unprotect=False, reason=None, prompt=None, protections=None, + unprotect=False, + reason: Optional[str] = None, + prompt: Optional[bool] = None, + protections: Optional[dict] = None, **kwargs): """ Protect or unprotect a wiki page. Requires administrator status. - Valid protection levels (in MediaWiki 1.12) are '' (equivalent to - 'none'), 'autoconfirmed', and 'sysop'. If None is given, however, + Valid protection levels are '' (equivalent to 'none'), + 'autoconfirmed', and 'sysop'. If None is given, however, that protection will be skipped. @param protections: A dict mapping type of protection to protection level of that type. - @type protections: dict @param reason: Reason for the action - @type reason: basestring @param prompt: Whether to ask user for confirmation (deprecated). Defaults to protections is None - @type prompt: bool """ def process_deprecated_arg(value, arg_name): # if protections was set and value is None, don't interpret that -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630585 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: Ibda7b9a96d26ee05d11f54907c420f2581b99830 Gerrit-Change-Number: 630585 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

1 0

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

28 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/630611 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I523249168e6d73597a407bbef9626bd7ce9ad715 --- M catall/tr.json M category_redirect/vi.json M unusedfiles/ku.json 3 files changed, 8 insertions(+), 2 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/catall/tr.json b/catall/tr.json index 839c960..b2a567d 100644 --- a/catall/tr.json +++ b/catall/tr.json @@ -2,7 +2,8 @@ "@metadata": { "authors": [ "Grkn gll", - "Incelemeelemani" + "Incelemeelemani", + "Stonecy" ] }, "catall-changing": "Bot: Kategoriler değiştiriliyor" diff --git a/category_redirect/vi.json b/category_redirect/vi.json index e0184ac..b32e442 100644 --- a/category_redirect/vi.json +++ b/category_redirect/vi.json @@ -16,7 +16,11 @@ "category_redirect-log-add-failed": "* Thất bại khi xếp [[%(ns)s%(template)s]] vào %(oldcat)s", "category_redirect-log-double": "%(oldcat)s* Đã sửa đổi hướng kép: %(oldcat)s → %(newcat)s → %(targetcat)s", "category_redirect-log-failed": "** Không thành công: %(error)s", + "category_redirect-log-false-positive": "* Trang không đổi hướng không ngờ: %(oldcat)s", "category_redirect-log-ignoring": "* Đã bỏ qua %(oldcat)s", "category_redirect-log-loop": "* Vòng đổi hướng từ %(oldcat)s", + "category_redirect-log-move-error": "* %(oldcat)s: lỗi ở move_contents", + "category_redirect-log-new": "Các đổi hướng mới từ báo cáo cuối:", + "category_redirect-log-not-loaded": "* Không thể tải %(oldcat)s; bỏ qua", "category_redirect-older-logs": "'''[%(oldlogs)s Nhật trình cũ hơn]'''" } diff --git a/unusedfiles/ku.json b/unusedfiles/ku.json index 84cad3b..27f33af 100644 --- a/unusedfiles/ku.json +++ b/unusedfiles/ku.json @@ -1,8 +1,9 @@ { "@metadata": { "authors": [ + "Bikarhêner", "Ghybu" ] }, - "unusedfiles-comment": "Bot: qirandina wêneyan" + "unusedfiles-comment": "Bot: etîketkirina dosyeyê wek nehewce" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/630611 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: I523249168e6d73597a407bbef9626bd7ce9ad715 Gerrit-Change-Number: 630611 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Update language_groups
by jenkins-bot (Code Review) 28 Sep '20

28 Sep '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630415 ) Change subject: Update language_groups ...................................................................... Update language_groups * Add Moroccan Arabic (ary) * Update comments (fix letter case) Change-Id: If7322fff9df0d86b8c1a40fd68e39b75af0dd5b9 --- M pywikibot/family.py 1 file changed, 11 insertions(+), 11 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/family.py b/pywikibot/family.py index 8df90ce..58e2c92 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -560,33 +560,33 @@ # Some languages belong to a group where the possibility is high that # equivalent articles have identical titles among the group. language_groups = { - # languages using the arabic script (incomplete) + # languages using the Arabic script (incomplete) 'arab': [ - 'ar', 'arz', 'ps', 'sd', 'ur', 'bjn', 'ckb', - # languages using multiple scripts, including arabic + 'ar', 'ary', 'arz', 'ps', 'sd', 'ur', 'bjn', 'ckb', + # languages using multiple scripts, including Arabic 'kk', 'ku', 'tt', 'ug', 'pnb' ], - # languages that use chinese symbols + # languages that use Chinese symbols 'chinese': [ 'wuu', 'zh', 'zh-classical', 'zh-yue', 'gan', 'ii', - # languages using multiple/mixed scripts, including chinese + # languages using multiple/mixed scripts, including Chinese 'ja', 'za' ], - # languages that use the cyrillic alphabet + # languages that use the Cyrillic alphabet 'cyril': [ 'ab', 'av', 'ba', 'be', 'be-tarask', 'bg', 'bxr', 'ce', 'cu', 'cv', 'kbd', 'koi', 'kv', 'ky', 'mk', 'lbe', 'mdf', 'mn', 'mo', 'myv', 'mhr', 'mrj', 'os', 'ru', 'rue', 'sah', 'tg', 'tk', 'udm', 'uk', 'xal', - # languages using multiple scripts, including cyrillic + # languages using multiple scripts, including Cyrillic 'ha', 'kk', 'sh', 'sr', 'tt' ], - # languages that use a greek script + # languages that use a Greek script 'grec': [ 'el', 'grc', 'pnt' - # languages using multiple scripts, including greek + # languages using multiple scripts, including Greek ], - # languages that use the latin alphabet + # languages that use the Latin alphabet 'latin': [ 'aa', 'ace', 'af', 'ak', 'als', 'an', 'ang', 'ast', 'ay', 'bar', 'bat-smg', 'bcl', 'bi', 'bm', 'br', 'bs', 'ca', 'cbk-zam', 'cdo', @@ -607,7 +607,7 @@ 'tn', 'to', 'tpi', 'tr', 'ts', 'tum', 'tw', 'ty', 'uz', 've', 'vec', 'vi', 'vls', 'vo', 'wa', 'war', 'wo', 'xh', 'yo', 'zea', 'zh-min-nan', 'zu', - # languages using multiple scripts, including latin + # languages using multiple scripts, including Latin 'az', 'chr', 'ckb', 'ha', 'iu', 'kk', 'ku', 'rmy', 'sh', 'sr', 'tt', 'ug', 'za' ], -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630415 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: If7322fff9df0d86b8c1a40fd68e39b75af0dd5b9 Gerrit-Change-Number: 630415 Gerrit-PatchSet: 2 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: SonarQube Bot <kharlan+sonarqubebot(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2020