Pywikibot-commits July 2020

pywikibot-commits@lists.wikimedia.org

1 participants
180 discussions

[Gerrit] ...core[master]: [4.0] remove Python 2 code parts of date.py
by jenkins-bot (Code Review) 19 Jul '20

19 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612606 ) Change subject: [4.0] remove Python 2 code parts of date.py ...................................................................... [4.0] remove Python 2 code parts of date.py Change-Id: I5c54e99ee8718336bd1d6ab1b630274326cff27b --- M pywikibot/date.py 1 file changed, 29 insertions(+), 36 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/date.py b/pywikibot/date.py index 9c97756..c01700f 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -5,17 +5,17 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import calendar -from collections import defaultdict import datetime import re + +from collections import defaultdict +from contextlib import suppress from string import digits as _decimalDigits # noqa: N812 from pywikibot import Site from pywikibot.textlib import NON_LATIN_DIGITS -from pywikibot.tools import first_lower, first_upper, deprecated, UnicodeType +from pywikibot.tools import first_lower, first_upper, deprecated # # Different collections of well known formats @@ -54,7 +54,7 @@ When the 2nd function evaluates to true, the 1st function is used. """ - if isinstance(value, UnicodeType): + if isinstance(value, str): # Try all functions, and test result against predicates for func, pred in tuplst: try: @@ -209,10 +209,7 @@ formats['MonthName']['en']('anything else') => raise ValueError """ - if isinstance(value, UnicodeType): - return lst.index(value) + 1 - else: - return lst[value - 1] + return lst.index(value) + 1 if isinstance(value, str) else lst[value - 1] def dh_singVal(value, match): @@ -226,7 +223,7 @@ formats['CurrEvents']['en'](ind) => 'Current Events' formats['CurrEvents']['en']('Current Events') => ind """ - if isinstance(value, UnicodeType): + if isinstance(value, str): if value == match: return ind elif value == ind: @@ -254,33 +251,33 @@ # Helper for KN: digits representation _knDigits = NON_LATIN_DIGITS['kn'] -_knDigitsToLocal = {ord(UnicodeType(i)): _knDigits[i] for i in range(10)} -_knLocalToDigits = {ord(_knDigits[i]): UnicodeType(i) for i in range(10)} +_knDigitsToLocal = {ord(str(i)): _knDigits[i] for i in range(10)} +_knLocalToDigits = {ord(_knDigits[i]): str(i) for i in range(10)} # Helper for Urdu/Persian languages _faDigits = NON_LATIN_DIGITS['fa'] -_faDigitsToLocal = {ord(UnicodeType(i)): _faDigits[i] for i in range(10)} -_faLocalToDigits = {ord(_faDigits[i]): UnicodeType(i) for i in range(10)} +_faDigitsToLocal = {ord(str(i)): _faDigits[i] for i in range(10)} +_faLocalToDigits = {ord(_faDigits[i]): str(i) for i in range(10)} # Helper for HI:, MR: _hiDigits = NON_LATIN_DIGITS['hi'] -_hiDigitsToLocal = {ord(UnicodeType(i)): _hiDigits[i] for i in range(10)} -_hiLocalToDigits = {ord(_hiDigits[i]): UnicodeType(i) for i in range(10)} +_hiDigitsToLocal = {ord(str(i)): _hiDigits[i] for i in range(10)} +_hiLocalToDigits = {ord(_hiDigits[i]): str(i) for i in range(10)} # Helper for BN: _bnDigits = NON_LATIN_DIGITS['bn'] -_bnDigitsToLocal = {ord(UnicodeType(i)): _bnDigits[i] for i in range(10)} -_bnLocalToDigits = {ord(_bnDigits[i]): UnicodeType(i) for i in range(10)} +_bnDigitsToLocal = {ord(str(i)): _bnDigits[i] for i in range(10)} +_bnLocalToDigits = {ord(_bnDigits[i]): str(i) for i in range(10)} # Helper for GU: _guDigits = NON_LATIN_DIGITS['gu'] -_guDigitsToLocal = {ord(UnicodeType(i)): _guDigits[i] for i in range(10)} -_guLocalToDigits = {ord(_guDigits[i]): UnicodeType(i) for i in range(10)} +_guDigitsToLocal = {ord(str(i)): _guDigits[i] for i in range(10)} +_guLocalToDigits = {ord(_guDigits[i]): str(i) for i in range(10)} def intToLocalDigitsStr(value, digitsToLocalDict): """Encode an integer value into a textual form.""" - return UnicodeType(value).translate(digitsToLocalDict) + return str(value).translate(digitsToLocalDict) def localDigitsStrToInt(value, digitsToLocalDict, localToDigitsDict): @@ -318,7 +315,7 @@ # %% is a % '%': '%', # %d is a decimal - 'd': (_decimalDigits, UnicodeType, int), + 'd': (_decimalDigits, str, int), # %R is a roman numeral. This allows for only the simplest linear # conversions based on a list of numbers 'R': ('IVX', intToRomanNum, romanNumToInt), @@ -343,7 +340,7 @@ lambda v: localDigitsStrToInt(v, _guDigitsToLocal, _guLocalToDigits)), # %T is a year in TH: -- all years are shifted: 2005 => 'พ.ศ. 2548' - 'T': (_decimalDigits, lambda v: UnicodeType(v + 543), + 'T': (_decimalDigits, lambda v: str(v + 543), lambda v: int(v) - 543), } @@ -375,7 +372,7 @@ and (len(s) == 2 or s[1] in _decimalDigits)): # Must match a "%2d" or "%d" style dec = _digitDecoders[s[-1]] - if isinstance(dec, UnicodeType): + if isinstance(dec, str): # Special case for strings that are replaced instead of # decoded assert len(s) < 3, ( @@ -436,7 +433,7 @@ """ compPattern, strPattern, decoders = escapePattern2(pattern) - if isinstance(value, UnicodeType): + if isinstance(value, str): m = compPattern.match(value) if m: # decode each found value using provided decoder @@ -444,7 +441,7 @@ for i, decoder in enumerate(decoders)] decValue = decf(values) - assert not isinstance(decValue, UnicodeType), \ + assert not isinstance(decValue, str), \ 'Decoder must not return a string!' # recursive call to re-encode and see if we get the original @@ -2187,29 +2184,25 @@ @return: dictName ('YearBC', 'December', ...) and value (a year, date, ...) @rtype: tuple """ - for dictName, dict in formats.items(): - try: - year = dict[lang](title) - return dictName, year - except Exception: - pass + for dict_name, dictionary in formats.items(): + with suppress(Exception): + year = dictionary[lang](title) + return dict_name, year # sometimes the title may begin with an upper case while its listed as # lower case, or the other way around # change case of the first character to the opposite, and try again if ignoreFirstLetterCase: - try: + with suppress(Exception): if title[0].isupper(): title = first_lower(title) else: title = first_upper(title) return getAutoFormat(lang, title, ignoreFirstLetterCase=False) - except Exception: - pass return None, None @deprecated('date.format_date', since='20190526') -class FormatDate(object): +class FormatDate: """DEPRECATED. Format a date.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612606 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: I5c54e99ee8718336bd1d6ab1b630274326cff27b Gerrit-Change-Number: 612606 Gerrit-PatchSet: 3 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: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] There are more splitlines boundaries than just "\n"
by jenkins-bot (Code Review) 19 Jul '20

19 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/596481 ) Change subject: [bugfix] There are more splitlines boundaries than just "\n" ...................................................................... [bugfix] There are more splitlines boundaries than just "\n" - test for all boundaries used by splitlines - also remove Python 2 related code parts Change-Id: I65b2a3df0f59c91ad3be38aefc816a5fca057dcf --- M pywikibot/diff.py 1 file changed, 11 insertions(+), 25 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/diff.py b/pywikibot/diff.py index 1bc9a20..150e5c5 100644 --- a/pywikibot/diff.py +++ b/pywikibot/diff.py @@ -5,28 +5,19 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import difflib import math -try: - from collections.abc import Sequence -except ImportError: # Python 2.7 - from collections import Sequence +from collections.abc import Sequence from difflib import _format_range_unified as format_range_unified +from itertools import zip_longest import pywikibot -from pywikibot.tools import chars, deprecated_args, PY2 +from pywikibot.tools import chars, deprecated_args from pywikibot.tools.formatter import color_format -if not PY2: - from itertools import zip_longest -else: - from itertools import izip_longest as zip_longest - -class Hunk(object): +class Hunk: """One change hunk between a and b. @@ -154,16 +145,14 @@ fmt = fmt if fmt else None yield self.color_line(line2, fmt) - def color_line(self, line, line_ref=None): + def color_line(self, line: str, line_ref=None): """Color line characters. If line_ref is None, the whole line is colored. If line_ref[i] is not blank, line[i] is colored. Color depends if line starts with +/-. - line: string line_ref: string. - """ color = line[0] @@ -246,7 +235,7 @@ hunk.reviewed = reviewed -class PatchManager(object): +class PatchManager: """Apply patches to text_a to obtain a new text. @@ -254,14 +243,12 @@ """ @deprecated_args(n='context') - def __init__(self, text_a, text_b, context=0, by_letter=False, - replace_invisible=False): + def __init__(self, text_a: str, text_b: str, context=0, by_letter=False, + replace_invisible=False) -> None: """Initializer. @param text_a: base text - @type text_a: basestring @param text_b: target text - @type text_b: basestring @param context: number of lines which are context @type context: int @param by_letter: if text_a and text_b are single lines, comparison can @@ -271,10 +258,9 @@ the charnumber in brackets (e.g. <200e>). @type replace_invisible: bool """ - if '\n' in text_a or '\n' in text_b or not by_letter: - self.a = text_a.splitlines(1) - self.b = text_b.splitlines(1) - else: + self.a = text_a.splitlines(True) + self.b = text_b.splitlines(True) + if by_letter and len(self.a) <= 1 and len(self.b) <= 1: self.a = text_a self.b = text_b -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/596481 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: I65b2a3df0f59c91ad3be38aefc816a5fca057dcf Gerrit-Change-Number: 596481 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-CC: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [FIX] Use named groupsize parameter for preloadpages
by jenkins-bot (Code Review) 19 Jul '20

19 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/614217 ) Change subject: [FIX] Use named groupsize parameter for preloadpages ...................................................................... [FIX] Use named groupsize parameter for preloadpages Bug: T258329 Change-Id: I5e208e5b8262969b38aa092078157fc431513e2c --- M pywikibot/pagegenerators.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index b6eeed8..ecd7a61 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -2207,11 +2207,11 @@ if len(sites[site]) >= groupsize: # if this site is at the groupsize, process it group = sites.pop(site) - yield from site.preloadpages(group, groupsize) + yield from site.preloadpages(group, groupsize=groupsize) for site, pages in sites.items(): # process any leftover sites that never reached the groupsize - yield from site.preloadpages(pages, groupsize) + yield from site.preloadpages(pages, groupsize=groupsize) @deprecated_args(step='groupsize') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/614217 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: I5e208e5b8262969b38aa092078157fc431513e2c Gerrit-Change-Number: 614217 Gerrit-PatchSet: 1 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [4.0] remove Python 2 related code in site/__init__.py
by jenkins-bot (Code Review) 18 Jul '20

18 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611308 ) Change subject: [4.0] remove Python 2 related code in site/__init__.py ...................................................................... [4.0] remove Python 2 related code in site/__init__.py - reorder imports - remove UnicodeMixin - remove __unicode__ redefinition which never worked with Python 3 - prevent positional usage of keyboard arguments for several methods Change-Id: I7e5672aed3d614f191290838f87335e0f54efa1d --- M pywikibot/site/__init__.py 1 file changed, 127 insertions(+), 175 deletions(-) Approvals: Zhuyifei1999: Looks good to me, but someone else must approve Matěj Suchánek: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index bef6a1f..2a3319b 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -10,8 +10,6 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import copy import datetime import functools @@ -21,17 +19,18 @@ import mimetypes import os import re -from textwrap import fill import threading import time +import typing import uuid -try: - from collections.abc import Iterable, Container, Mapping -except ImportError: # Python 2.7 - from collections import Iterable, Container, Mapping from collections import defaultdict, namedtuple +from collections.abc import Iterable, Container, Mapping +from contextlib import suppress from enum import IntEnum +from itertools import zip_longest +from textwrap import fill +from urllib.parse import urlencode, urlparse from warnings import warn import pywikibot @@ -73,26 +72,15 @@ from pywikibot.throttle import Throttle from pywikibot.tools import ( compute_file_hash, - itergroup, UnicodeMixin, ComparableMixin, SelfCallMixin, SelfCallString, + itergroup, ComparableMixin, SelfCallMixin, SelfCallString, deprecated, deprecate_arg, deprecated_args, remove_last_args, redirect_func, issue_deprecation_warning, manage_wrapping, MediaWikiVersion, first_upper, normalize_username, merge_unique_dicts, - PY2, filter_unique, - UnicodeType ) from pywikibot.tools import is_IP -if not PY2: - from itertools import zip_longest - from urllib.parse import urlencode, urlparse -else: - from future_builtins import zip - from itertools import izip_longest as zip_longest - from urllib import urlencode - from urlparse import urlparse - _logger = 'wiki.site' @@ -137,7 +125,7 @@ since='20141001') -class Namespace(Iterable, ComparableMixin, UnicodeMixin): +class Namespace(Iterable, ComparableMixin): """ Namespace site data object. @@ -210,7 +198,7 @@ @param canonical_name: Canonical name @type canonical_name: str @param aliases: Aliases - @type aliases: list of unicode + @type aliases: list of str """ self.id = id canonical_name = canonical_name or self.canonical_namespaces.get(id) @@ -284,13 +272,9 @@ if self.custom_name != self.canonical_name: if index == 0: return self.custom_name - else: - index -= 1 + index -= 1 - if index == 0: - return self.canonical_name - else: - return self.aliases[index - 1] + return self.canonical_name if index == 0 else self.aliases[index - 1] @staticmethod def _colons(id, name): @@ -307,10 +291,6 @@ """Return the canonical string representation.""" return self.canonical_prefix() - def __unicode__(self): - """Return the custom string representation.""" - return self.custom_prefix() - def canonical_prefix(self): """Return the canonical name with required colons.""" return Namespace._colons(self.id, self.canonical_name) @@ -339,7 +319,7 @@ if isinstance(other, Namespace): return self.id == other.id - if isinstance(other, UnicodeType): + if isinstance(other, str): return other in self return False @@ -488,7 +468,7 @@ def __init__(self, namespaces): """Create new dict using the given namespaces.""" - super(NamespacesDict, self).__init__() + super().__init__() self._namespaces = namespaces self._namespace_names = {} for namespace in self._namespaces.values(): @@ -514,7 +494,7 @@ if namespace: return namespace - return super(NamespacesDict, self).__getitem__(key) + return super().__getitem__(key) def __getattr__(self, attr): """ @@ -601,7 +581,7 @@ # Temporary until Namespace.resolve can be removed @staticmethod def _resolve(identifiers, namespaces): - if isinstance(identifiers, (UnicodeType, Namespace)): + if isinstance(identifiers, (str, Namespace)): identifiers = [identifiers] else: # convert non-iterators to single item list @@ -614,7 +594,7 @@ # int(None) raises TypeError; however, bool needs special handling. result = [NotImplemented if isinstance(ns, bool) else NamespacesDict._lookup_name(ns, namespaces) - if isinstance(ns, UnicodeType) + if isinstance(ns, str) and not ns.lstrip('-').isdigit() else namespaces[int(ns)] if int(ns) in namespaces else None @@ -627,14 +607,15 @@ # Namespace.lookup_name returns None if the name is not recognised if None in result: raise KeyError( - 'Namespace identifier(s) not recognised: %s' - % ','.join(str(identifier) for identifier, ns in zip( - identifiers, result) if ns is None)) + 'Namespace identifier(s) not recognised: {}' + .format(','.join(str(identifier) + for identifier, ns in zip(identifiers, result) + if ns is None))) return result -class _IWEntry(object): +class _IWEntry: """An entry of the _InterwikiMap with a lazy loading site.""" @@ -653,7 +634,7 @@ return self._site -class _InterwikiMap(object): +class _InterwikiMap: """A representation of the interwiki map of a site.""" @@ -664,7 +645,7 @@ @param site: Given site for which interwiki map is to be created @type site: pywikibot.site.APISite """ - super(_InterwikiMap, self).__init__() + super().__init__() self._site = site self._map = None @@ -719,7 +700,7 @@ """Site methods that are independent of the communication interface.""" @remove_last_args(['sysop']) - def __init__(self, code, fam=None, user=None): + def __init__(self, code: str, fam=None, user=None) -> None: """ Initializer. @@ -733,13 +714,14 @@ if code.lower() != code: # Note the Site function in __init__ also emits a UserWarning # for this condition, showing the callers file and line no. - pywikibot.log('BaseSite: code "%s" converted to lowercase' % code) + pywikibot.log('BaseSite: code "{}" converted to lowercase' + .format(code)) code = code.lower() - if not all(x in pywikibot.family.CODE_CHARACTERS for x in str(code)): - pywikibot.log('BaseSite: code "%s" contains invalid characters' - % code) + if not all(x in pywikibot.family.CODE_CHARACTERS for x in code): + pywikibot.log('BaseSite: code "{}" contains invalid characters' + .format(code)) self.__code = code - if isinstance(fam, UnicodeType) or fam is None: + if isinstance(fam, str) or fam is None: self.__family = pywikibot.family.Family.load(fam) else: self.__family = fam @@ -1129,9 +1111,8 @@ # A redirect starts with hash (#), followed by a keyword, then # arbitrary stuff, then a wikilink. The wikilink may contain # a label, although this is not useful. - return re.compile(r'\s*#%(pattern)s\s*:?\s*\[\[(.+?)(?:\|.*?)?\]\]' - % {'pattern': pattern}, - re.IGNORECASE | re.UNICODE | re.DOTALL) + return re.compile(r'\s*#{pattern}\s*:?\s*\[\[(.+?)(?:\|.*?)?\]\]' + .format(pattern=pattern), re.IGNORECASE | re.DOTALL) def sametitle(self, title1, title2): """ @@ -1241,7 +1222,7 @@ """ from pywikibot.comms import http if data: - if not isinstance(data, UnicodeType): + if not isinstance(data, str): data = urlencode(data) return http.request(self, path, method='PUT', body=data) else: @@ -1511,7 +1492,7 @@ else: return False - if isinstance(prop, UnicodeType): + if isinstance(prop, str): props = [prop] else: props = prop @@ -1730,7 +1711,7 @@ return self._cache -class TokenWallet(object): +class TokenWallet: """Container for tokens.""" @@ -1818,7 +1799,7 @@ @remove_last_args(['sysop']) def __init__(self, code, fam, user=None): """Initializer.""" - super(RemovedSite, self).__init__(code, fam, user) + super().__init__(code, fam, user) _mw_msg_cache = defaultdict(dict) @@ -1845,14 +1826,14 @@ def __getstate__(self): """Remove TokenWallet before pickling, for security reasons.""" - new = super(APISite, self).__getstate__() + new = super().__getstate__() del new['tokens'] del new['_interwikimap'] return new def __setstate__(self, attrs): """Restore things removed in __getstate__.""" - super(APISite, self).__setstate__(attrs) + super().__setstate__(attrs) self._interwikimap = _InterwikiMap(self) self.tokens = TokenWallet(self) @@ -2089,10 +2070,8 @@ pywikibot.warning('Using OAuth suppresses logout function') req_params = {'action': 'logout'} # csrf token introduced in MW 1.24 - try: + with suppress(Error): req_params['token'] = self.tokens['csrf'] - except Error: - pass uirequest = self._simple_request(**req_params) uirequest.submit() self._loginstatus = LoginStatus.NOT_LOGGED_IN @@ -2385,15 +2364,13 @@ return {_key: _mw_msg_cache[amlang][_key] for _key in keys} @deprecated_args(forceReload=None) - def mediawiki_message(self, key, lang=None): + def mediawiki_message(self, key, lang=None) -> str: """Fetch the text for a MediaWiki message. @param key: name of MediaWiki message @type key: str @param lang: a language code, default is self.lang @type lang: str or None - - @rtype unicode """ return self.mediawiki_messages([key], lang=lang)[key] @@ -2453,7 +2430,7 @@ return self._months_names - def list_to_text(self, args): + def list_to_text(self, args: typing.Iterable[str]) -> str: """Convert a list of strings into human-readable text. The MediaWiki messages 'and' and 'word-separator' are used as separator @@ -2462,18 +2439,11 @@ joined using MediaWiki message 'comma-separator'. @param args: text to be expanded - @type args: typing.Iterable[unicode] - - @rtype: str """ needed_mw_messages = ('and', 'comma-separator', 'word-separator') if not args: return '' - if PY2 and any(isinstance(arg, str) for arg in args): - issue_deprecation_warning('arg of type str', 'type unicode', - since='20151014') - args = [UnicodeType(e) for e in args] try: msgs = self.mediawiki_messages(needed_mw_messages) except KeyError: @@ -2488,12 +2458,13 @@ else: msgs[key] = pywikibot.html2UnicodeType(value) + args = list(args) concat = msgs['and'] + msgs['word-separator'] return msgs['comma-separator'].join( args[:-2] + [concat.join(args[-2:])]) @deprecated_args(string='text') - def expand_text(self, text, title=None, includecomments=None): + def expand_text(self, text: str, title=None, includecomments=None) -> str: """Parse the given text for preprocessing and rendering. e.g expand templates and strip comments if includecomments @@ -2507,9 +2478,8 @@ @type title: str @param includecomments: if True do not strip comments @type includecomments: bool - @rtype: str """ - if not isinstance(text, UnicodeType): + if not isinstance(text, str): raise ValueError('text must be a string') if not text: return '' @@ -3284,7 +3254,7 @@ """ if not pageids: return - if isinstance(pageids, UnicodeType): + if isinstance(pageids, str): pageids = pageids.replace('|', ',') pageids = pageids.split(',') pageids = [p.strip() for p in pageids] @@ -3329,7 +3299,7 @@ priority, page = heapq.heappop(prio_queue) yield page - def preloadpages(self, pagelist, groupsize=50, templates=False, + def preloadpages(self, pagelist, *, groupsize=50, templates=False, langlinks=False, pageprops=False): """Return a generator to a list of preloaded pages. @@ -3528,7 +3498,7 @@ query.request._warning_handler = warn_handler for item in query: - pywikibot.debug(UnicodeType(item), _logger) + pywikibot.debug(str(item), _logger) for tokentype in valid_tokens: if (tokentype + 'token') in item: user_tokens[tokentype] = item[tokentype + 'token'] @@ -3551,7 +3521,7 @@ data = data['query'] if 'recentchanges' in data: item = data['recentchanges'][0] - pywikibot.debug(UnicodeType(item), _logger) + pywikibot.debug(str(item), _logger) if 'patroltoken' in item: user_tokens['patrol'] = item['patroltoken'] else: @@ -3625,10 +3595,9 @@ @deprecated_args( followRedirects='follow_redirects', filterRedirects='filter_redirects') - def pagebacklinks( - self, page, follow_redirects=False, filter_redirects=None, - namespaces=None, total=None, content=False - ): + def pagebacklinks(self, page, *, follow_redirects=False, + filter_redirects=None, namespaces=None, total=None, + content=False): """Iterate all pages that link to the given page. @see: U{https://www.mediawiki.org/wiki/API:Backlinks} @@ -3690,7 +3659,7 @@ return blgen @deprecated_args(step=None, filterRedirects='filter_redirects') - def page_embeddedin(self, page, filter_redirects=None, namespaces=None, + def page_embeddedin(self, page, *, filter_redirects=None, namespaces=None, total=None, content=False): """Iterate all pages that embedded the given page as a template. @@ -3726,11 +3695,10 @@ filterRedirects='filter_redirects', onlyTemplateInclusion='only_template_inclusion', withTemplateInclusion='with_template_inclusion') - def pagereferences( - self, page, follow_redirects=False, filter_redirects=None, - with_template_inclusion=True, only_template_inclusion=False, - namespaces=None, total=None, content=False - ): + def pagereferences(self, page, *, follow_redirects=False, + filter_redirects=None, with_template_inclusion=True, + only_template_inclusion=False, namespaces=None, + total=None, content=False): """ Convenience method combining pagebacklinks and page_embeddedin. @@ -3761,7 +3729,7 @@ ), total) @deprecated_args(step=None) - def pagelinks(self, page, namespaces=None, follow_redirects=False, + def pagelinks(self, page, *, namespaces=None, follow_redirects=False, total=None, content=False): """Iterate internal wikilinks contained (or transcluded) on page. @@ -3793,7 +3761,7 @@ # Sortkey doesn't work with generator @deprecated_args(withSortKey=None, step=None) - def pagecategories(self, page, total=None, content=False): + def pagecategories(self, page, *, total=None, content=False): """Iterate categories to which page belongs. @see: U{https://www.mediawiki.org/wiki/API:Categories} @@ -3813,7 +3781,7 @@ g_content=content, **clargs) @deprecated_args(step=None) - def pageimages(self, page, total=None, content=False): + def pageimages(self, page, *, total=None, content=False): """Iterate images used (not just linked) on the page. @see: U{https://www.mediawiki.org/wiki/API:Images} @@ -3829,7 +3797,8 @@ g_content=content) @deprecated_args(step=None) - def pagetemplates(self, page, namespaces=None, total=None, content=False): + def pagetemplates(self, page, *, namespaces=None, total=None, + content=False): """Iterate templates transcluded (not just linked) on the page. @see: U{https://www.mediawiki.org/wiki/API:Templates} @@ -3851,12 +3820,11 @@ total=total, g_content=content) @deprecated_args(step=None) - def categorymembers(self, category, namespaces=None, sortby=None, + def categorymembers(self, category, *, namespaces=None, sortby=None, reverse=False, starttime=None, endtime=None, startsort=None, endsort=None, total=None, content=False, member_type=None, - startprefix=None, endprefix=None, - ): + startprefix=None, endprefix=None): """Iterate members of specified category. @see: U{https://www.mediawiki.org/wiki/API:Categorymembers} @@ -3904,7 +3872,6 @@ results to only pages in the first 50 namespaces. @type member_type: str or iterable of str; values: page, subcat, file - @rtype: typing.Iterable[pywikibot.Page] @raises KeyError: a namespace identifier was not resolved @raises NotImplementedError: startprefix or endprefix parameters are @@ -3935,7 +3902,7 @@ raise ValueError( 'categorymembers: startsort must be less than endsort') - if isinstance(member_type, UnicodeType): + if isinstance(member_type, str): member_type = {member_type} if member_type and sortby == 'timestamp': @@ -4024,7 +3991,7 @@ @deprecated_args(getText='content', sysop=None) @remove_last_args(['rollback']) - def loadrevisions(self, page, content=False, revids=None, + def loadrevisions(self, page, *, content=False, revids=None, startid=None, endid=None, starttime=None, endtime=None, rvdir=None, user=None, excludeuser=None, section=None, step=None, total=None): @@ -4106,15 +4073,15 @@ if content: rvargs['rvprop'].append('content') if section is not None: - rvargs['rvsection'] = UnicodeType(section) + rvargs['rvsection'] = str(section) if revids is None: rvtitle = page.title(with_section=False).encode(self.encoding()) rvargs['titles'] = rvtitle else: - if isinstance(revids, (int, UnicodeType)): - ids = UnicodeType(revids) + if isinstance(revids, (int, str)): + ids = str(revids) else: - ids = '|'.join(UnicodeType(r) for r in revids) + ids = '|'.join(str(r) for r in revids) rvargs['revids'] = ids if rvdir: @@ -4164,7 +4131,7 @@ return parsed_text @deprecated_args(step=None) - def pagelanglinks(self, page, total=None, include_obsolete=False): + def pagelanglinks(self, page, *, total=None, include_obsolete=False): """Iterate all interlanguage links on page, yielding Link objects. @see: U{https://www.mediawiki.org/wiki/API:Langlinks} @@ -4188,11 +4155,11 @@ source=self) if link.site.obsolete and not include_obsolete: continue - else: - yield link + + yield link @deprecated_args(step=None) - def page_extlinks(self, page, total=None): + def page_extlinks(self, page, *, total=None): """Iterate all external links on page, yielding URL strings. @see: U{https://www.mediawiki.org/wiki/API:Extlinks} @@ -4297,9 +4264,9 @@ apgen.request['gapminsize'] = str(minsize) if isinstance(maxsize, int): apgen.request['gapmaxsize'] = str(maxsize) - if isinstance(protect_type, UnicodeType): + if isinstance(protect_type, str): apgen.request['gapprtype'] = protect_type - if isinstance(protect_level, UnicodeType): + if isinstance(protect_level, str): apgen.request['gapprlevel'] = protect_level if reverse: apgen.request['gapdir'] = 'descending' @@ -4383,8 +4350,7 @@ Iterated values are dicts containing 'name', 'userid', 'editcount', 'registration', and 'groups' keys. 'groups' will be present only if the user is a member of at least 1 group, and will be a list of - unicodes; all the other values are unicodes and should always be - present. + str; all the other values are str and should always be present. """ if not hasattr(self, '_bots'): self._bots = {} @@ -4393,8 +4359,7 @@ for item in self.allusers(group='bot', total=total): self._bots.setdefault(item['name'], item) - for value in self._bots.values(): - yield value + yield from self._bots.values() @deprecated_args(step=None) def allusers(self, start='!', prefix='', group=None, total=None): @@ -4402,8 +4367,8 @@ Iterated values are dicts containing 'name', 'editcount', 'registration', and (sometimes) 'groups' keys. 'groups' will be - present only if the user is a member of at least 1 group, and will - be a list of unicodes; all the other values are unicodes and should + present only if the user is a member of at least 1 group, and + will be a list of str; all the other values are str and should always be present. @see: U{https://www.mediawiki.org/wiki/API:Allusers} @@ -4544,7 +4509,7 @@ if blockids: bkgen.request['bkids'] = blockids if users: - if isinstance(users, UnicodeType): + if isinstance(users, str): users = users.split('|') # actual IPv6 addresses (anonymous users) are uppercase, but they # have never a :: in the username (so those are registered users) @@ -4646,7 +4611,7 @@ @param user: only iterate entries that match this user name @type user: basestring @param page: only iterate entries affecting this page - @type page: pywikibot.page.Page or basestring + @type page: pywikibot.Page or str @param namespace: namespace(s) to retrieve logevents from @type namespace: int or Namespace or an iterable of them @note: due to an API limitation, if namespace param contains multiple @@ -5031,7 +4996,7 @@ """ def handle_props(props): """Translate deletedrev props to deletedrevisions props.""" - if isinstance(props, UnicodeType): + if isinstance(props, str): props = props.split('|') if self.mw_version >= '1.25': return props @@ -5042,9 +5007,7 @@ old_props += ['revid', 'parentid'] elif item == 'flags': old_props.append('minor') - elif item == 'timestamp': - pass - else: + elif item != 'timestamp': old_props.append(item) if item == 'content' and self.mw_version < '1.24': old_props.append('token') @@ -5105,17 +5068,13 @@ gen.request[pre + 'dir'] = 'newer' if self.mw_version < '1.25': - # yield from gen - for data in gen: - yield data + yield from gen + else: # The dict result is different for both generators for data in gen: - try: + with suppress(KeyError): data['revisions'] = data.pop('deletedrevisions') - except KeyError: - pass - else: yield data def users(self, usernames): @@ -5124,7 +5083,7 @@ @see: U{https://www.mediawiki.org/wiki/API:Users} @param usernames: a list of user names - @type usernames: list, or other iterable, of unicodes + @type usernames: list, or other iterable, of str """ usprop = ['blockinfo', 'groups', 'editcount', 'registration', 'emailable'] @@ -5360,7 +5319,7 @@ _logger) if err.code in self._ep_errors: exception = self._ep_errors[err.code] - if isinstance(exception, UnicodeType): + if isinstance(exception, str): errdata = { 'site': self, 'title': page.title(with_section=False), @@ -5370,11 +5329,7 @@ raise Error(exception % errdata) elif issubclass(exception, SpamblacklistError): urls = ', '.join(err.other[err.code]['matches']) - exec_string = ('raise exception(page, url="{}")' - .format(urls)) - if not PY2: - exec_string += ' from None' - exec(exec_string) + raise exception(page, url=urls) from None else: raise exception(page) pywikibot.debug( @@ -5760,9 +5715,9 @@ @see: U{https://www.mediawiki.org/wiki/API:Delete} @param page: Page to be deleted. - @type page: pywikibot.page.Page + @type page: pywikibot.Page @param reason: Deletion reason. - @type reason: basestring + @type reason: str """ token = self.tokens['delete'] @@ -5847,7 +5802,7 @@ Return the protection types available on this site. @return: protection types available - @rtype: set of unicode instances + @rtype: set of str instances @see: L{Siteinfo._get_default()} """ return set(self.siteinfo.get('restrictions')['types']) @@ -5857,7 +5812,7 @@ Return the protection levels available on this site. @return: protection types available - @rtype: set of unicode instances + @rtype: set of str instances @see: L{Siteinfo._get_default()} """ # implemented in b73b5883d486db0e9278ef16733551f28d9e096d @@ -5968,9 +5923,9 @@ if all(_ is None for _ in [rcid, revid, revision]): raise Error('No rcid, revid or revision provided.') - if isinstance(rcid, (int, UnicodeType)): + if isinstance(rcid, (int, str)): rcid = {rcid} - if isinstance(revid, (int, UnicodeType)): + if isinstance(revid, (int, str)): revid = {revid} if isinstance(revision, pywikibot.page.Revision): revision = {revision} @@ -6674,8 +6629,8 @@ When true, it yields a tuple composed of a Page object and a dict of attributes. When false, it yields a tuple composed of the Page object, - timestamp (unicode), length (int), an empty unicode string, username - or IP address (str), comment (unicode). + timestamp (str), length (int), an empty string, username or IP + address (str), comment (str). @param namespaces: only iterate pages in these namespaces @type namespaces: iterable of basestring or Namespace key, @@ -6714,7 +6669,7 @@ DEPRECATED: Use logevents(logtype='upload') instead. - Yields a tuple of FilePage, Timestamp, user(unicode), comment(unicode). + Yields a tuple of FilePage, Timestamp, user(str), comment(str). N.B. the API does not provide direct access to Special:Newimages, so this is derived from the "upload" log events instead. @@ -7015,7 +6970,7 @@ return self._property_names @need_version('1.21') - def pages_with_property(self, propname, total=None): + def pages_with_property(self, propname, *, total=None): """Yield Page objects from Special:PagesWithProp. @see: U{https://www.mediawiki.org/wiki/API:Pageswithprop} @@ -7051,7 +7006,7 @@ """ # check old and diff types def get_param(item): - if isinstance(item, UnicodeType): + if isinstance(item, str): return 'title', item elif isinstance(item, pywikibot.Page): return 'title', item.title() @@ -7105,20 +7060,19 @@ @return: pages with Linter errors. @rtype: typing.Iterable[pywikibot.Page] - """ query = self._generator(api.ListGenerator, type_arg='linterrors', total=total, # Will set lntlimit namespaces=namespaces) if lint_categories: - if isinstance(lint_categories, UnicodeType): + if isinstance(lint_categories, str): lint_categories = lint_categories.split('|') lint_categories = [p.strip() for p in lint_categories] query.request['lntcategories'] = '|'.join(lint_categories) if pageids: - if isinstance(pageids, UnicodeType): + if isinstance(pageids, str): pageids = pageids.split('|') pageids = [p.strip() for p in pageids] # Validate pageids. @@ -7561,7 +7515,7 @@ @remove_last_args(['sysop']) def __init__(self, code, fam, user=None): """Initializer.""" - super(ClosedSite, self).__init__(code, fam, user) + super().__init__(code, fam, user) def _closed_error(self, notice=''): """An error instead of pointless API call.""" @@ -7609,7 +7563,7 @@ def __init__(self, *args, **kwargs): """Initializer.""" - super(DataSite, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self._item_namespace = None self._property_namespace = None self._type_to_class = { @@ -7771,7 +7725,7 @@ f.__doc__ = method.__doc__ return f - return super(APISite, self).__getattr__(attr) + return super().__getattr__(attr) def _get_propertyitem(self, props, source, **params): """Generic method to get the data for multiple Wikibase items.""" @@ -7797,28 +7751,28 @@ assert set(params) <= {'props'}, \ 'Only "props" is a valid kwarg, not {0}'.format(set(params) - {'props'}) - if isinstance(source, int) or \ - isinstance(source, UnicodeType) and source.isdigit(): - ids = 'q' + str(source) - params = merge_unique_dicts(params, action='wbgetentities', - ids=ids) - wbrequest = self._simple_request(**params) - wbdata = wbrequest.submit() - assert 'success' in wbdata, \ - "API wbgetentities response lacks 'success' key" - assert wbdata['success'] == 1, "API 'success' key is not 1" - assert 'entities' in wbdata, \ - "API wbgetentities response lacks 'entities' key" - - if ids.upper() in wbdata['entities']: - ids = ids.upper() - - assert ids in wbdata['entities'], \ - 'API wbgetentities response lacks %s key' % ids - - return wbdata['entities'][ids] - else: + try: + source = int(source) + except ValueError: raise NotImplementedError + ids = 'q' + str(source) + params = merge_unique_dicts(params, action='wbgetentities', + ids=ids) + wbrequest = self._simple_request(**params) + wbdata = wbrequest.submit() + assert 'success' in wbdata, \ + "API wbgetentities response lacks 'success' key" + assert wbdata['success'] == 1, "API 'success' key is not 1" + assert 'entities' in wbdata, \ + "API wbgetentities response lacks 'entities' key" + + if ids.upper() in wbdata['entities']: + ids = ids.upper() + + assert ids in wbdata['entities'], \ + 'API wbgetentities response lacks %s key' % ids + + return wbdata['entities'][ids] def data_repository(self): """ @@ -7913,10 +7867,8 @@ page = cls(self, entity) # No api call is made because item._content is given page._content = data['entities'][entity] - try: + with suppress(pywikibot.IsRedirectPage): page.get() # cannot provide get_redirect=True (T145971) - except pywikibot.IsRedirectPage: - pass yield page @deprecated('DataSite.preload_entities', since='20170314') -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611308 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: I7e5672aed3d614f191290838f87335e0f54efa1d Gerrit-Change-Number: 611308 Gerrit-PatchSet: 9 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] move _first_upper_exception to tools/_unidata.py
by jenkins-bot (Code Review) 17 Jul '20

17 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611931 ) Change subject: [IMPR] move _first_upper_exception to tools/_unidata.py ...................................................................... [IMPR] move _first_upper_exception to tools/_unidata.py Change-Id: I83f81708bba5f2c590c0dd5583388a3286b46879 --- M pywikibot/tools/__init__.py A pywikibot/tools/_unidata.py 2 files changed, 269 insertions(+), 258 deletions(-) Approvals: Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 96b5a8e..5df0576 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -34,6 +34,7 @@ from warnings import catch_warnings, showwarning, warn from pywikibot.logging import debug +from pywikibot.tools._unidata import _first_upper_exception PYTHON_VERSION = sys.version_info[:3] PY2 = (PYTHON_VERSION[0] == 2) @@ -98,264 +99,6 @@ _logger = 'tools' -# A mapping of characters to their MediaWiki title-cased forms. Python, -# depending on version, handles these characters differently, which causes -# errors in normalizing titles. (T200357) This dict was created using -# Python 3.7 (Unicode version 11.0.0) and should be updated at least with every -# new release of Python with an updated unicodedata.unidata_version. -_first_upper_exception = { - '\xdf': '\xdf', '\u0149': '\u0149', '\u0180': '\u0180', '\u019a': '\u019a', - '\u01c5': '\u01c5', '\u01c6': '\u01c5', '\u01c8': '\u01c8', '\u01c9': - '\u01c8', '\u01cb': '\u01cb', '\u01cc': '\u01cb', '\u01f0': '\u01f0', - '\u01f2': '\u01f2', '\u01f3': '\u01f2', '\u023c': '\u023c', '\u023f': - '\u023f', '\u0240': '\u0240', '\u0242': '\u0242', '\u0247': '\u0247', - '\u0249': '\u0249', '\u024b': '\u024b', '\u024d': '\u024d', '\u024f': - '\u024f', '\u0250': '\u0250', '\u0251': '\u0251', '\u0252': '\u0252', - '\u025c': '\u025c', '\u0261': '\u0261', '\u0265': '\u0265', '\u0266': - '\u0266', '\u026a': '\u026a', '\u026b': '\u026b', '\u026c': '\u026c', - '\u0271': '\u0271', '\u027d': '\u027d', '\u0287': '\u0287', '\u0289': - '\u0289', '\u028c': '\u028c', '\u029d': '\u029d', '\u029e': '\u029e', - '\u0345': '\u0345', '\u0371': '\u0371', '\u0373': '\u0373', '\u0377': - '\u0377', '\u037b': '\u037b', '\u037c': '\u037c', '\u037d': '\u037d', - '\u0390': '\u0390', '\u03b0': '\u03b0', '\u03d7': '\u03d7', '\u03f2': - '\u03a3', '\u03f3': '\u03f3', '\u03f8': '\u03f8', '\u03fb': '\u03fb', - '\u04cf': '\u04cf', '\u04f7': '\u04f7', '\u04fb': '\u04fb', '\u04fd': - '\u04fd', '\u04ff': '\u04ff', '\u0511': '\u0511', '\u0513': '\u0513', - '\u0515': '\u0515', '\u0517': '\u0517', '\u0519': '\u0519', '\u051b': - '\u051b', '\u051d': '\u051d', '\u051f': '\u051f', '\u0521': '\u0521', - '\u0523': '\u0523', '\u0525': '\u0525', '\u0527': '\u0527', '\u0529': - '\u0529', '\u052b': '\u052b', '\u052d': '\u052d', '\u052f': '\u052f', - '\u0587': '\u0587', '\u10d0': '\u10d0', '\u10d1': '\u10d1', '\u10d2': - '\u10d2', '\u10d3': '\u10d3', '\u10d4': '\u10d4', '\u10d5': '\u10d5', - '\u10d6': '\u10d6', '\u10d7': '\u10d7', '\u10d8': '\u10d8', '\u10d9': - '\u10d9', '\u10da': '\u10da', '\u10db': '\u10db', '\u10dc': '\u10dc', - '\u10dd': '\u10dd', '\u10de': '\u10de', '\u10df': '\u10df', '\u10e0': - '\u10e0', '\u10e1': '\u10e1', '\u10e2': '\u10e2', '\u10e3': '\u10e3', - '\u10e4': '\u10e4', '\u10e5': '\u10e5', '\u10e6': '\u10e6', '\u10e7': - '\u10e7', '\u10e8': '\u10e8', '\u10e9': '\u10e9', '\u10ea': '\u10ea', - '\u10eb': '\u10eb', '\u10ec': '\u10ec', '\u10ed': '\u10ed', '\u10ee': - '\u10ee', '\u10ef': '\u10ef', '\u10f0': '\u10f0', '\u10f1': '\u10f1', - '\u10f2': '\u10f2', '\u10f3': '\u10f3', '\u10f4': '\u10f4', '\u10f5': - '\u10f5', '\u10f6': '\u10f6', '\u10f7': '\u10f7', '\u10f8': '\u10f8', - '\u10f9': '\u10f9', '\u10fa': '\u10fa', '\u10fd': '\u10fd', '\u10fe': - '\u10fe', '\u10ff': '\u10ff', '\u13f8': '\u13f8', '\u13f9': '\u13f9', - '\u13fa': '\u13fa', '\u13fb': '\u13fb', '\u13fc': '\u13fc', '\u13fd': - '\u13fd', '\u1c80': '\u1c80', '\u1c81': '\u1c81', '\u1c82': '\u1c82', - '\u1c83': '\u1c83', '\u1c84': '\u1c84', '\u1c85': '\u1c85', '\u1c86': - '\u1c86', '\u1c87': '\u1c87', '\u1c88': '\u1c88', '\u1d79': '\u1d79', - '\u1d7d': '\u1d7d', '\u1e96': '\u1e96', '\u1e97': '\u1e97', '\u1e98': - '\u1e98', '\u1e99': '\u1e99', '\u1e9a': '\u1e9a', '\u1efb': '\u1efb', - '\u1efd': '\u1efd', '\u1eff': '\u1eff', '\u1f50': '\u1f50', '\u1f52': - '\u1f52', '\u1f54': '\u1f54', '\u1f56': '\u1f56', '\u1f71': '\u0386', - '\u1f73': '\u0388', '\u1f75': '\u0389', '\u1f77': '\u038a', '\u1f79': - '\u038c', '\u1f7b': '\u038e', '\u1f7d': '\u038f', '\u1f80': '\u1f88', - '\u1f81': '\u1f89', '\u1f82': '\u1f8a', '\u1f83': '\u1f8b', '\u1f84': - '\u1f8c', '\u1f85': '\u1f8d', '\u1f86': '\u1f8e', '\u1f87': '\u1f8f', - '\u1f88': '\u1f88', '\u1f89': '\u1f89', '\u1f8a': '\u1f8a', '\u1f8b': - '\u1f8b', '\u1f8c': '\u1f8c', '\u1f8d': '\u1f8d', '\u1f8e': '\u1f8e', - '\u1f8f': '\u1f8f', '\u1f90': '\u1f98', '\u1f91': '\u1f99', '\u1f92': - '\u1f9a', '\u1f93': '\u1f9b', '\u1f94': '\u1f9c', '\u1f95': '\u1f9d', - '\u1f96': '\u1f9e', '\u1f97': '\u1f9f', '\u1f98': '\u1f98', '\u1f99': - '\u1f99', '\u1f9a': '\u1f9a', '\u1f9b': '\u1f9b', '\u1f9c': '\u1f9c', - '\u1f9d': '\u1f9d', '\u1f9e': '\u1f9e', '\u1f9f': '\u1f9f', '\u1fa0': - '\u1fa8', '\u1fa1': '\u1fa9', '\u1fa2': '\u1faa', '\u1fa3': '\u1fab', - '\u1fa4': '\u1fac', '\u1fa5': '\u1fad', '\u1fa6': '\u1fae', '\u1fa7': - '\u1faf', '\u1fa8': '\u1fa8', '\u1fa9': '\u1fa9', '\u1faa': '\u1faa', - '\u1fab': '\u1fab', '\u1fac': '\u1fac', '\u1fad': '\u1fad', '\u1fae': - '\u1fae', '\u1faf': '\u1faf', '\u1fb2': '\u1fb2', '\u1fb3': '\u1fbc', - '\u1fb4': '\u1fb4', '\u1fb6': '\u1fb6', '\u1fb7': '\u1fb7', '\u1fbc': - '\u1fbc', '\u1fc2': '\u1fc2', '\u1fc3': '\u1fcc', '\u1fc4': '\u1fc4', - '\u1fc6': '\u1fc6', '\u1fc7': '\u1fc7', '\u1fcc': '\u1fcc', '\u1fd2': - '\u1fd2', '\u1fd3': '\u0390', '\u1fd6': '\u1fd6', '\u1fd7': '\u1fd7', - '\u1fe2': '\u1fe2', '\u1fe3': '\u03b0', '\u1fe4': '\u1fe4', '\u1fe6': - '\u1fe6', '\u1fe7': '\u1fe7', '\u1ff2': '\u1ff2', '\u1ff3': '\u1ffc', - '\u1ff4': '\u1ff4', '\u1ff6': '\u1ff6', '\u1ff7': '\u1ff7', '\u1ffc': - '\u1ffc', '\u214e': '\u214e', '\u2170': '\u2170', '\u2171': '\u2171', - '\u2172': '\u2172', '\u2173': '\u2173', '\u2174': '\u2174', '\u2175': - '\u2175', '\u2176': '\u2176', '\u2177': '\u2177', '\u2178': '\u2178', - '\u2179': '\u2179', '\u217a': '\u217a', '\u217b': '\u217b', '\u217c': - '\u217c', '\u217d': '\u217d', '\u217e': '\u217e', '\u217f': '\u217f', - '\u2184': '\u2184', '\u24d0': '\u24d0', '\u24d1': '\u24d1', '\u24d2': - '\u24d2', '\u24d3': '\u24d3', '\u24d4': '\u24d4', '\u24d5': '\u24d5', - '\u24d6': '\u24d6', '\u24d7': '\u24d7', '\u24d8': '\u24d8', '\u24d9': - '\u24d9', '\u24da': '\u24da', '\u24db': '\u24db', '\u24dc': '\u24dc', - '\u24dd': '\u24dd', '\u24de': '\u24de', '\u24df': '\u24df', '\u24e0': - '\u24e0', '\u24e1': '\u24e1', '\u24e2': '\u24e2', '\u24e3': '\u24e3', - '\u24e4': '\u24e4', '\u24e5': '\u24e5', '\u24e6': '\u24e6', '\u24e7': - '\u24e7', '\u24e8': '\u24e8', '\u24e9': '\u24e9', '\u2c30': '\u2c30', - '\u2c31': '\u2c31', '\u2c32': '\u2c32', '\u2c33': '\u2c33', '\u2c34': - '\u2c34', '\u2c35': '\u2c35', '\u2c36': '\u2c36', '\u2c37': '\u2c37', - '\u2c38': '\u2c38', '\u2c39': '\u2c39', '\u2c3a': '\u2c3a', '\u2c3b': - '\u2c3b', '\u2c3c': '\u2c3c', '\u2c3d': '\u2c3d', '\u2c3e': '\u2c3e', - '\u2c3f': '\u2c3f', '\u2c40': '\u2c40', '\u2c41': '\u2c41', '\u2c42': - '\u2c42', '\u2c43': '\u2c43', '\u2c44': '\u2c44', '\u2c45': '\u2c45', - '\u2c46': '\u2c46', '\u2c47': '\u2c47', '\u2c48': '\u2c48', '\u2c49': - '\u2c49', '\u2c4a': '\u2c4a', '\u2c4b': '\u2c4b', '\u2c4c': '\u2c4c', - '\u2c4d': '\u2c4d', '\u2c4e': '\u2c4e', '\u2c4f': '\u2c4f', '\u2c50': - '\u2c50', '\u2c51': '\u2c51', '\u2c52': '\u2c52', '\u2c53': '\u2c53', - '\u2c54': '\u2c54', '\u2c55': '\u2c55', '\u2c56': '\u2c56', '\u2c57': - '\u2c57', '\u2c58': '\u2c58', '\u2c59': '\u2c59', '\u2c5a': '\u2c5a', - '\u2c5b': '\u2c5b', '\u2c5c': '\u2c5c', '\u2c5d': '\u2c5d', '\u2c5e': - '\u2c5e', '\u2c61': '\u2c61', '\u2c65': '\u2c65', '\u2c66': '\u2c66', - '\u2c68': '\u2c68', '\u2c6a': '\u2c6a', '\u2c6c': '\u2c6c', '\u2c73': - '\u2c73', '\u2c76': '\u2c76', '\u2c81': '\u2c81', '\u2c83': '\u2c83', - '\u2c85': '\u2c85', '\u2c87': '\u2c87', '\u2c89': '\u2c89', '\u2c8b': - '\u2c8b', '\u2c8d': '\u2c8d', '\u2c8f': '\u2c8f', '\u2c91': '\u2c91', - '\u2c93': '\u2c93', '\u2c95': '\u2c95', '\u2c97': '\u2c97', '\u2c99': - '\u2c99', '\u2c9b': '\u2c9b', '\u2c9d': '\u2c9d', '\u2c9f': '\u2c9f', - '\u2ca1': '\u2ca1', '\u2ca3': '\u2ca3', '\u2ca5': '\u2ca5', '\u2ca7': - '\u2ca7', '\u2ca9': '\u2ca9', '\u2cab': '\u2cab', '\u2cad': '\u2cad', - '\u2caf': '\u2caf', '\u2cb1': '\u2cb1', '\u2cb3': '\u2cb3', '\u2cb5': - '\u2cb5', '\u2cb7': '\u2cb7', '\u2cb9': '\u2cb9', '\u2cbb': '\u2cbb', - '\u2cbd': '\u2cbd', '\u2cbf': '\u2cbf', '\u2cc1': '\u2cc1', '\u2cc3': - '\u2cc3', '\u2cc5': '\u2cc5', '\u2cc7': '\u2cc7', '\u2cc9': '\u2cc9', - '\u2ccb': '\u2ccb', '\u2ccd': '\u2ccd', '\u2ccf': '\u2ccf', '\u2cd1': - '\u2cd1', '\u2cd3': '\u2cd3', '\u2cd5': '\u2cd5', '\u2cd7': '\u2cd7', - '\u2cd9': '\u2cd9', '\u2cdb': '\u2cdb', '\u2cdd': '\u2cdd', '\u2cdf': - '\u2cdf', '\u2ce1': '\u2ce1', '\u2ce3': '\u2ce3', '\u2cec': '\u2cec', - '\u2cee': '\u2cee', '\u2cf3': '\u2cf3', '\u2d00': '\u2d00', '\u2d01': - '\u2d01', '\u2d02': '\u2d02', '\u2d03': '\u2d03', '\u2d04': '\u2d04', - '\u2d05': '\u2d05', '\u2d06': '\u2d06', '\u2d07': '\u2d07', '\u2d08': - '\u2d08', '\u2d09': '\u2d09', '\u2d0a': '\u2d0a', '\u2d0b': '\u2d0b', - '\u2d0c': '\u2d0c', '\u2d0d': '\u2d0d', '\u2d0e': '\u2d0e', '\u2d0f': - '\u2d0f', '\u2d10': '\u2d10', '\u2d11': '\u2d11', '\u2d12': '\u2d12', - '\u2d13': '\u2d13', '\u2d14': '\u2d14', '\u2d15': '\u2d15', '\u2d16': - '\u2d16', '\u2d17': '\u2d17', '\u2d18': '\u2d18', '\u2d19': '\u2d19', - '\u2d1a': '\u2d1a', '\u2d1b': '\u2d1b', '\u2d1c': '\u2d1c', '\u2d1d': - '\u2d1d', '\u2d1e': '\u2d1e', '\u2d1f': '\u2d1f', '\u2d20': '\u2d20', - '\u2d21': '\u2d21', '\u2d22': '\u2d22', '\u2d23': '\u2d23', '\u2d24': - '\u2d24', '\u2d25': '\u2d25', '\u2d27': '\u2d27', '\u2d2d': '\u2d2d', - '\ua641': '\ua641', '\ua643': '\ua643', '\ua645': '\ua645', '\ua647': - '\ua647', '\ua649': '\ua649', '\ua64b': '\ua64b', '\ua64d': '\ua64d', - '\ua64f': '\ua64f', '\ua651': '\ua651', '\ua653': '\ua653', '\ua655': - '\ua655', '\ua657': '\ua657', '\ua659': '\ua659', '\ua65b': '\ua65b', - '\ua65d': '\ua65d', '\ua65f': '\ua65f', '\ua661': '\ua661', '\ua663': - '\ua663', '\ua665': '\ua665', '\ua667': '\ua667', '\ua669': '\ua669', - '\ua66b': '\ua66b', '\ua66d': '\ua66d', '\ua681': '\ua681', '\ua683': - '\ua683', '\ua685': '\ua685', '\ua687': '\ua687', '\ua689': '\ua689', - '\ua68b': '\ua68b', '\ua68d': '\ua68d', '\ua68f': '\ua68f', '\ua691': - '\ua691', '\ua693': '\ua693', '\ua695': '\ua695', '\ua697': '\ua697', - '\ua699': '\ua699', '\ua69b': '\ua69b', '\ua723': '\ua723', '\ua725': - '\ua725', '\ua727': '\ua727', '\ua729': '\ua729', '\ua72b': '\ua72b', - '\ua72d': '\ua72d', '\ua72f': '\ua72f', '\ua733': '\ua733', '\ua735': - '\ua735', '\ua737': '\ua737', '\ua739': '\ua739', '\ua73b': '\ua73b', - '\ua73d': '\ua73d', '\ua73f': '\ua73f', '\ua741': '\ua741', '\ua743': - '\ua743', '\ua745': '\ua745', '\ua747': '\ua747', '\ua749': '\ua749', - '\ua74b': '\ua74b', '\ua74d': '\ua74d', '\ua74f': '\ua74f', '\ua751': - '\ua751', '\ua753': '\ua753', '\ua755': '\ua755', '\ua757': '\ua757', - '\ua759': '\ua759', '\ua75b': '\ua75b', '\ua75d': '\ua75d', '\ua75f': - '\ua75f', '\ua761': '\ua761', '\ua763': '\ua763', '\ua765': '\ua765', - '\ua767': '\ua767', '\ua769': '\ua769', '\ua76b': '\ua76b', '\ua76d': - '\ua76d', '\ua76f': '\ua76f', '\ua77a': '\ua77a', '\ua77c': '\ua77c', - '\ua77f': '\ua77f', '\ua781': '\ua781', '\ua783': '\ua783', '\ua785': - '\ua785', '\ua787': '\ua787', '\ua78c': '\ua78c', '\ua791': '\ua791', - '\ua793': '\ua793', '\ua797': '\ua797', '\ua799': '\ua799', '\ua79b': - '\ua79b', '\ua79d': '\ua79d', '\ua79f': '\ua79f', '\ua7a1': '\ua7a1', - '\ua7a3': '\ua7a3', '\ua7a5': '\ua7a5', '\ua7a7': '\ua7a7', '\ua7a9': - '\ua7a9', '\ua7b5': '\ua7b5', '\ua7b7': '\ua7b7', '\ua7b9': '\ua7b9', - '\uab53': '\uab53', '\uab70': '\uab70', '\uab71': '\uab71', '\uab72': - '\uab72', '\uab73': '\uab73', '\uab74': '\uab74', '\uab75': '\uab75', - '\uab76': '\uab76', '\uab77': '\uab77', '\uab78': '\uab78', '\uab79': - '\uab79', '\uab7a': '\uab7a', '\uab7b': '\uab7b', '\uab7c': '\uab7c', - '\uab7d': '\uab7d', '\uab7e': '\uab7e', '\uab7f': '\uab7f', '\uab80': - '\uab80', '\uab81': '\uab81', '\uab82': '\uab82', '\uab83': '\uab83', - '\uab84': '\uab84', '\uab85': '\uab85', '\uab86': '\uab86', '\uab87': - '\uab87', '\uab88': '\uab88', '\uab89': '\uab89', '\uab8a': '\uab8a', - '\uab8b': '\uab8b', '\uab8c': '\uab8c', '\uab8d': '\uab8d', '\uab8e': - '\uab8e', '\uab8f': '\uab8f', '\uab90': '\uab90', '\uab91': '\uab91', - '\uab92': '\uab92', '\uab93': '\uab93', '\uab94': '\uab94', '\uab95': - '\uab95', '\uab96': '\uab96', '\uab97': '\uab97', '\uab98': '\uab98', - '\uab99': '\uab99', '\uab9a': '\uab9a', '\uab9b': '\uab9b', '\uab9c': - '\uab9c', '\uab9d': '\uab9d', '\uab9e': '\uab9e', '\uab9f': '\uab9f', - '\uaba0': '\uaba0', '\uaba1': '\uaba1', '\uaba2': '\uaba2', '\uaba3': - '\uaba3', '\uaba4': '\uaba4', '\uaba5': '\uaba5', '\uaba6': '\uaba6', - '\uaba7': '\uaba7', '\uaba8': '\uaba8', '\uaba9': '\uaba9', '\uabaa': - '\uabaa', '\uabab': '\uabab', '\uabac': '\uabac', '\uabad': '\uabad', - '\uabae': '\uabae', '\uabaf': '\uabaf', '\uabb0': '\uabb0', '\uabb1': - '\uabb1', '\uabb2': '\uabb2', '\uabb3': '\uabb3', '\uabb4': '\uabb4', - '\uabb5': '\uabb5', '\uabb6': '\uabb6', '\uabb7': '\uabb7', '\uabb8': - '\uabb8', '\uabb9': '\uabb9', '\uabba': '\uabba', '\uabbb': '\uabbb', - '\uabbc': '\uabbc', '\uabbd': '\uabbd', '\uabbe': '\uabbe', '\uabbf': - '\uabbf', '\ufb00': '\ufb00', '\ufb01': '\ufb01', '\ufb02': '\ufb02', - '\ufb03': '\ufb03', '\ufb04': '\ufb04', '\ufb05': '\ufb05', '\ufb06': - '\ufb06', '\ufb13': '\ufb13', '\ufb14': '\ufb14', '\ufb15': '\ufb15', - '\ufb16': '\ufb16', '\ufb17': '\ufb17', '\U0001044e': '\U0001044e', - '\U0001044f': '\U0001044f', '\U000104d8': '\U000104d8', '\U000104d9': - '\U000104d9', '\U000104da': '\U000104da', '\U000104db': '\U000104db', - '\U000104dc': '\U000104dc', '\U000104dd': '\U000104dd', '\U000104de': - '\U000104de', '\U000104df': '\U000104df', '\U000104e0': '\U000104e0', - '\U000104e1': '\U000104e1', '\U000104e2': '\U000104e2', '\U000104e3': - '\U000104e3', '\U000104e4': '\U000104e4', '\U000104e5': '\U000104e5', - '\U000104e6': '\U000104e6', '\U000104e7': '\U000104e7', '\U000104e8': - '\U000104e8', '\U000104e9': '\U000104e9', '\U000104ea': '\U000104ea', - '\U000104eb': '\U000104eb', '\U000104ec': '\U000104ec', '\U000104ed': - '\U000104ed', '\U000104ee': '\U000104ee', '\U000104ef': '\U000104ef', - '\U000104f0': '\U000104f0', '\U000104f1': '\U000104f1', '\U000104f2': - '\U000104f2', '\U000104f3': '\U000104f3', '\U000104f4': '\U000104f4', - '\U000104f5': '\U000104f5', '\U000104f6': '\U000104f6', '\U000104f7': - '\U000104f7', '\U000104f8': '\U000104f8', '\U000104f9': '\U000104f9', - '\U000104fa': '\U000104fa', '\U000104fb': '\U000104fb', '\U00010cc0': - '\U00010cc0', '\U00010cc1': '\U00010cc1', '\U00010cc2': '\U00010cc2', - '\U00010cc3': '\U00010cc3', '\U00010cc4': '\U00010cc4', '\U00010cc5': - '\U00010cc5', '\U00010cc6': '\U00010cc6', '\U00010cc7': '\U00010cc7', - '\U00010cc8': '\U00010cc8', '\U00010cc9': '\U00010cc9', '\U00010cca': - '\U00010cca', '\U00010ccb': '\U00010ccb', '\U00010ccc': '\U00010ccc', - '\U00010ccd': '\U00010ccd', '\U00010cce': '\U00010cce', '\U00010ccf': - '\U00010ccf', '\U00010cd0': '\U00010cd0', '\U00010cd1': '\U00010cd1', - '\U00010cd2': '\U00010cd2', '\U00010cd3': '\U00010cd3', '\U00010cd4': - '\U00010cd4', '\U00010cd5': '\U00010cd5', '\U00010cd6': '\U00010cd6', - '\U00010cd7': '\U00010cd7', '\U00010cd8': '\U00010cd8', '\U00010cd9': - '\U00010cd9', '\U00010cda': '\U00010cda', '\U00010cdb': '\U00010cdb', - '\U00010cdc': '\U00010cdc', '\U00010cdd': '\U00010cdd', '\U00010cde': - '\U00010cde', '\U00010cdf': '\U00010cdf', '\U00010ce0': '\U00010ce0', - '\U00010ce1': '\U00010ce1', '\U00010ce2': '\U00010ce2', '\U00010ce3': - '\U00010ce3', '\U00010ce4': '\U00010ce4', '\U00010ce5': '\U00010ce5', - '\U00010ce6': '\U00010ce6', '\U00010ce7': '\U00010ce7', '\U00010ce8': - '\U00010ce8', '\U00010ce9': '\U00010ce9', '\U00010cea': '\U00010cea', - '\U00010ceb': '\U00010ceb', '\U00010cec': '\U00010cec', '\U00010ced': - '\U00010ced', '\U00010cee': '\U00010cee', '\U00010cef': '\U00010cef', - '\U00010cf0': '\U00010cf0', '\U00010cf1': '\U00010cf1', '\U00010cf2': - '\U00010cf2', '\U000118c0': '\U000118c0', '\U000118c1': '\U000118c1', - '\U000118c2': '\U000118c2', '\U000118c3': '\U000118c3', '\U000118c4': - '\U000118c4', '\U000118c5': '\U000118c5', '\U000118c6': '\U000118c6', - '\U000118c7': '\U000118c7', '\U000118c8': '\U000118c8', '\U000118c9': - '\U000118c9', '\U000118ca': '\U000118ca', '\U000118cb': '\U000118cb', - '\U000118cc': '\U000118cc', '\U000118cd': '\U000118cd', '\U000118ce': - '\U000118ce', '\U000118cf': '\U000118cf', '\U000118d0': '\U000118d0', - '\U000118d1': '\U000118d1', '\U000118d2': '\U000118d2', '\U000118d3': - '\U000118d3', '\U000118d4': '\U000118d4', '\U000118d5': '\U000118d5', - '\U000118d6': '\U000118d6', '\U000118d7': '\U000118d7', '\U000118d8': - '\U000118d8', '\U000118d9': '\U000118d9', '\U000118da': '\U000118da', - '\U000118db': '\U000118db', '\U000118dc': '\U000118dc', '\U000118dd': - '\U000118dd', '\U000118de': '\U000118de', '\U000118df': '\U000118df', - '\U00016e60': '\U00016e60', '\U00016e61': '\U00016e61', '\U00016e62': - '\U00016e62', '\U00016e63': '\U00016e63', '\U00016e64': '\U00016e64', - '\U00016e65': '\U00016e65', '\U00016e66': '\U00016e66', '\U00016e67': - '\U00016e67', '\U00016e68': '\U00016e68', '\U00016e69': '\U00016e69', - '\U00016e6a': '\U00016e6a', '\U00016e6b': '\U00016e6b', '\U00016e6c': - '\U00016e6c', '\U00016e6d': '\U00016e6d', '\U00016e6e': '\U00016e6e', - '\U00016e6f': '\U00016e6f', '\U00016e70': '\U00016e70', '\U00016e71': - '\U00016e71', '\U00016e72': '\U00016e72', '\U00016e73': '\U00016e73', - '\U00016e74': '\U00016e74', '\U00016e75': '\U00016e75', '\U00016e76': - '\U00016e76', '\U00016e77': '\U00016e77', '\U00016e78': '\U00016e78', - '\U00016e79': '\U00016e79', '\U00016e7a': '\U00016e7a', '\U00016e7b': - '\U00016e7b', '\U00016e7c': '\U00016e7c', '\U00016e7d': '\U00016e7d', - '\U00016e7e': '\U00016e7e', '\U00016e7f': '\U00016e7f', '\U0001e922': - '\U0001e922', '\U0001e923': '\U0001e923', '\U0001e924': '\U0001e924', - '\U0001e925': '\U0001e925', '\U0001e926': '\U0001e926', '\U0001e927': - '\U0001e927', '\U0001e928': '\U0001e928', '\U0001e929': '\U0001e929', - '\U0001e92a': '\U0001e92a', '\U0001e92b': '\U0001e92b', '\U0001e92c': - '\U0001e92c', '\U0001e92d': '\U0001e92d', '\U0001e92e': '\U0001e92e', - '\U0001e92f': '\U0001e92f', '\U0001e930': '\U0001e930', '\U0001e931': - '\U0001e931', '\U0001e932': '\U0001e932', '\U0001e933': '\U0001e933', - '\U0001e934': '\U0001e934', '\U0001e935': '\U0001e935', '\U0001e936': - '\U0001e936', '\U0001e937': '\U0001e937', '\U0001e938': '\U0001e938', - '\U0001e939': '\U0001e939', '\U0001e93a': '\U0001e93a', '\U0001e93b': - '\U0001e93b', '\U0001e93c': '\U0001e93c', '\U0001e93d': '\U0001e93d', - '\U0001e93e': '\U0001e93e', '\U0001e93f': '\U0001e93f', '\U0001e940': - '\U0001e940', '\U0001e941': '\U0001e941', '\U0001e942': '\U0001e942', -}.get - class _NotImplementedWarning(RuntimeWarning): diff --git a/pywikibot/tools/_unidata.py b/pywikibot/tools/_unidata.py new file mode 100644 index 0000000..f23ae25 --- /dev/null +++ b/pywikibot/tools/_unidata.py @@ -0,0 +1,268 @@ +# -*- coding: utf-8 -*- +"""Helper function fo MediaWiki title-cased forms.""" +# +# (C) Pywikibot team, 2018-2020 +# +# Distributed under the terms of the MIT license. +# + +# A mapping of characters to their MediaWiki title-cased forms. Python, +# depending on version, handles these characters differently, which causes +# errors in normalizing titles. (T200357) This dict was created using +# Python 3.7 (Unicode version 11.0.0) and should be updated at least with every +# new release of Python with an updated unicodedata.unidata_version. +_first_upper_exception_dict = { + '\xdf': '\xdf', '\u0149': '\u0149', '\u0180': '\u0180', '\u019a': '\u019a', + '\u01c5': '\u01c5', '\u01c6': '\u01c5', '\u01c8': '\u01c8', '\u01c9': + '\u01c8', '\u01cb': '\u01cb', '\u01cc': '\u01cb', '\u01f0': '\u01f0', + '\u01f2': '\u01f2', '\u01f3': '\u01f2', '\u023c': '\u023c', '\u023f': + '\u023f', '\u0240': '\u0240', '\u0242': '\u0242', '\u0247': '\u0247', + '\u0249': '\u0249', '\u024b': '\u024b', '\u024d': '\u024d', '\u024f': + '\u024f', '\u0250': '\u0250', '\u0251': '\u0251', '\u0252': '\u0252', + '\u025c': '\u025c', '\u0261': '\u0261', '\u0265': '\u0265', '\u0266': + '\u0266', '\u026a': '\u026a', '\u026b': '\u026b', '\u026c': '\u026c', + '\u0271': '\u0271', '\u027d': '\u027d', '\u0287': '\u0287', '\u0289': + '\u0289', '\u028c': '\u028c', '\u029d': '\u029d', '\u029e': '\u029e', + '\u0345': '\u0345', '\u0371': '\u0371', '\u0373': '\u0373', '\u0377': + '\u0377', '\u037b': '\u037b', '\u037c': '\u037c', '\u037d': '\u037d', + '\u0390': '\u0390', '\u03b0': '\u03b0', '\u03d7': '\u03d7', '\u03f2': + '\u03a3', '\u03f3': '\u03f3', '\u03f8': '\u03f8', '\u03fb': '\u03fb', + '\u04cf': '\u04cf', '\u04f7': '\u04f7', '\u04fb': '\u04fb', '\u04fd': + '\u04fd', '\u04ff': '\u04ff', '\u0511': '\u0511', '\u0513': '\u0513', + '\u0515': '\u0515', '\u0517': '\u0517', '\u0519': '\u0519', '\u051b': + '\u051b', '\u051d': '\u051d', '\u051f': '\u051f', '\u0521': '\u0521', + '\u0523': '\u0523', '\u0525': '\u0525', '\u0527': '\u0527', '\u0529': + '\u0529', '\u052b': '\u052b', '\u052d': '\u052d', '\u052f': '\u052f', + '\u0587': '\u0587', '\u10d0': '\u10d0', '\u10d1': '\u10d1', '\u10d2': + '\u10d2', '\u10d3': '\u10d3', '\u10d4': '\u10d4', '\u10d5': '\u10d5', + '\u10d6': '\u10d6', '\u10d7': '\u10d7', '\u10d8': '\u10d8', '\u10d9': + '\u10d9', '\u10da': '\u10da', '\u10db': '\u10db', '\u10dc': '\u10dc', + '\u10dd': '\u10dd', '\u10de': '\u10de', '\u10df': '\u10df', '\u10e0': + '\u10e0', '\u10e1': '\u10e1', '\u10e2': '\u10e2', '\u10e3': '\u10e3', + '\u10e4': '\u10e4', '\u10e5': '\u10e5', '\u10e6': '\u10e6', '\u10e7': + '\u10e7', '\u10e8': '\u10e8', '\u10e9': '\u10e9', '\u10ea': '\u10ea', + '\u10eb': '\u10eb', '\u10ec': '\u10ec', '\u10ed': '\u10ed', '\u10ee': + '\u10ee', '\u10ef': '\u10ef', '\u10f0': '\u10f0', '\u10f1': '\u10f1', + '\u10f2': '\u10f2', '\u10f3': '\u10f3', '\u10f4': '\u10f4', '\u10f5': + '\u10f5', '\u10f6': '\u10f6', '\u10f7': '\u10f7', '\u10f8': '\u10f8', + '\u10f9': '\u10f9', '\u10fa': '\u10fa', '\u10fd': '\u10fd', '\u10fe': + '\u10fe', '\u10ff': '\u10ff', '\u13f8': '\u13f8', '\u13f9': '\u13f9', + '\u13fa': '\u13fa', '\u13fb': '\u13fb', '\u13fc': '\u13fc', '\u13fd': + '\u13fd', '\u1c80': '\u1c80', '\u1c81': '\u1c81', '\u1c82': '\u1c82', + '\u1c83': '\u1c83', '\u1c84': '\u1c84', '\u1c85': '\u1c85', '\u1c86': + '\u1c86', '\u1c87': '\u1c87', '\u1c88': '\u1c88', '\u1d79': '\u1d79', + '\u1d7d': '\u1d7d', '\u1e96': '\u1e96', '\u1e97': '\u1e97', '\u1e98': + '\u1e98', '\u1e99': '\u1e99', '\u1e9a': '\u1e9a', '\u1efb': '\u1efb', + '\u1efd': '\u1efd', '\u1eff': '\u1eff', '\u1f50': '\u1f50', '\u1f52': + '\u1f52', '\u1f54': '\u1f54', '\u1f56': '\u1f56', '\u1f71': '\u0386', + '\u1f73': '\u0388', '\u1f75': '\u0389', '\u1f77': '\u038a', '\u1f79': + '\u038c', '\u1f7b': '\u038e', '\u1f7d': '\u038f', '\u1f80': '\u1f88', + '\u1f81': '\u1f89', '\u1f82': '\u1f8a', '\u1f83': '\u1f8b', '\u1f84': + '\u1f8c', '\u1f85': '\u1f8d', '\u1f86': '\u1f8e', '\u1f87': '\u1f8f', + '\u1f88': '\u1f88', '\u1f89': '\u1f89', '\u1f8a': '\u1f8a', '\u1f8b': + '\u1f8b', '\u1f8c': '\u1f8c', '\u1f8d': '\u1f8d', '\u1f8e': '\u1f8e', + '\u1f8f': '\u1f8f', '\u1f90': '\u1f98', '\u1f91': '\u1f99', '\u1f92': + '\u1f9a', '\u1f93': '\u1f9b', '\u1f94': '\u1f9c', '\u1f95': '\u1f9d', + '\u1f96': '\u1f9e', '\u1f97': '\u1f9f', '\u1f98': '\u1f98', '\u1f99': + '\u1f99', '\u1f9a': '\u1f9a', '\u1f9b': '\u1f9b', '\u1f9c': '\u1f9c', + '\u1f9d': '\u1f9d', '\u1f9e': '\u1f9e', '\u1f9f': '\u1f9f', '\u1fa0': + '\u1fa8', '\u1fa1': '\u1fa9', '\u1fa2': '\u1faa', '\u1fa3': '\u1fab', + '\u1fa4': '\u1fac', '\u1fa5': '\u1fad', '\u1fa6': '\u1fae', '\u1fa7': + '\u1faf', '\u1fa8': '\u1fa8', '\u1fa9': '\u1fa9', '\u1faa': '\u1faa', + '\u1fab': '\u1fab', '\u1fac': '\u1fac', '\u1fad': '\u1fad', '\u1fae': + '\u1fae', '\u1faf': '\u1faf', '\u1fb2': '\u1fb2', '\u1fb3': '\u1fbc', + '\u1fb4': '\u1fb4', '\u1fb6': '\u1fb6', '\u1fb7': '\u1fb7', '\u1fbc': + '\u1fbc', '\u1fc2': '\u1fc2', '\u1fc3': '\u1fcc', '\u1fc4': '\u1fc4', + '\u1fc6': '\u1fc6', '\u1fc7': '\u1fc7', '\u1fcc': '\u1fcc', '\u1fd2': + '\u1fd2', '\u1fd3': '\u0390', '\u1fd6': '\u1fd6', '\u1fd7': '\u1fd7', + '\u1fe2': '\u1fe2', '\u1fe3': '\u03b0', '\u1fe4': '\u1fe4', '\u1fe6': + '\u1fe6', '\u1fe7': '\u1fe7', '\u1ff2': '\u1ff2', '\u1ff3': '\u1ffc', + '\u1ff4': '\u1ff4', '\u1ff6': '\u1ff6', '\u1ff7': '\u1ff7', '\u1ffc': + '\u1ffc', '\u214e': '\u214e', '\u2170': '\u2170', '\u2171': '\u2171', + '\u2172': '\u2172', '\u2173': '\u2173', '\u2174': '\u2174', '\u2175': + '\u2175', '\u2176': '\u2176', '\u2177': '\u2177', '\u2178': '\u2178', + '\u2179': '\u2179', '\u217a': '\u217a', '\u217b': '\u217b', '\u217c': + '\u217c', '\u217d': '\u217d', '\u217e': '\u217e', '\u217f': '\u217f', + '\u2184': '\u2184', '\u24d0': '\u24d0', '\u24d1': '\u24d1', '\u24d2': + '\u24d2', '\u24d3': '\u24d3', '\u24d4': '\u24d4', '\u24d5': '\u24d5', + '\u24d6': '\u24d6', '\u24d7': '\u24d7', '\u24d8': '\u24d8', '\u24d9': + '\u24d9', '\u24da': '\u24da', '\u24db': '\u24db', '\u24dc': '\u24dc', + '\u24dd': '\u24dd', '\u24de': '\u24de', '\u24df': '\u24df', '\u24e0': + '\u24e0', '\u24e1': '\u24e1', '\u24e2': '\u24e2', '\u24e3': '\u24e3', + '\u24e4': '\u24e4', '\u24e5': '\u24e5', '\u24e6': '\u24e6', '\u24e7': + '\u24e7', '\u24e8': '\u24e8', '\u24e9': '\u24e9', '\u2c30': '\u2c30', + '\u2c31': '\u2c31', '\u2c32': '\u2c32', '\u2c33': '\u2c33', '\u2c34': + '\u2c34', '\u2c35': '\u2c35', '\u2c36': '\u2c36', '\u2c37': '\u2c37', + '\u2c38': '\u2c38', '\u2c39': '\u2c39', '\u2c3a': '\u2c3a', '\u2c3b': + '\u2c3b', '\u2c3c': '\u2c3c', '\u2c3d': '\u2c3d', '\u2c3e': '\u2c3e', + '\u2c3f': '\u2c3f', '\u2c40': '\u2c40', '\u2c41': '\u2c41', '\u2c42': + '\u2c42', '\u2c43': '\u2c43', '\u2c44': '\u2c44', '\u2c45': '\u2c45', + '\u2c46': '\u2c46', '\u2c47': '\u2c47', '\u2c48': '\u2c48', '\u2c49': + '\u2c49', '\u2c4a': '\u2c4a', '\u2c4b': '\u2c4b', '\u2c4c': '\u2c4c', + '\u2c4d': '\u2c4d', '\u2c4e': '\u2c4e', '\u2c4f': '\u2c4f', '\u2c50': + '\u2c50', '\u2c51': '\u2c51', '\u2c52': '\u2c52', '\u2c53': '\u2c53', + '\u2c54': '\u2c54', '\u2c55': '\u2c55', '\u2c56': '\u2c56', '\u2c57': + '\u2c57', '\u2c58': '\u2c58', '\u2c59': '\u2c59', '\u2c5a': '\u2c5a', + '\u2c5b': '\u2c5b', '\u2c5c': '\u2c5c', '\u2c5d': '\u2c5d', '\u2c5e': + '\u2c5e', '\u2c61': '\u2c61', '\u2c65': '\u2c65', '\u2c66': '\u2c66', + '\u2c68': '\u2c68', '\u2c6a': '\u2c6a', '\u2c6c': '\u2c6c', '\u2c73': + '\u2c73', '\u2c76': '\u2c76', '\u2c81': '\u2c81', '\u2c83': '\u2c83', + '\u2c85': '\u2c85', '\u2c87': '\u2c87', '\u2c89': '\u2c89', '\u2c8b': + '\u2c8b', '\u2c8d': '\u2c8d', '\u2c8f': '\u2c8f', '\u2c91': '\u2c91', + '\u2c93': '\u2c93', '\u2c95': '\u2c95', '\u2c97': '\u2c97', '\u2c99': + '\u2c99', '\u2c9b': '\u2c9b', '\u2c9d': '\u2c9d', '\u2c9f': '\u2c9f', + '\u2ca1': '\u2ca1', '\u2ca3': '\u2ca3', '\u2ca5': '\u2ca5', '\u2ca7': + '\u2ca7', '\u2ca9': '\u2ca9', '\u2cab': '\u2cab', '\u2cad': '\u2cad', + '\u2caf': '\u2caf', '\u2cb1': '\u2cb1', '\u2cb3': '\u2cb3', '\u2cb5': + '\u2cb5', '\u2cb7': '\u2cb7', '\u2cb9': '\u2cb9', '\u2cbb': '\u2cbb', + '\u2cbd': '\u2cbd', '\u2cbf': '\u2cbf', '\u2cc1': '\u2cc1', '\u2cc3': + '\u2cc3', '\u2cc5': '\u2cc5', '\u2cc7': '\u2cc7', '\u2cc9': '\u2cc9', + '\u2ccb': '\u2ccb', '\u2ccd': '\u2ccd', '\u2ccf': '\u2ccf', '\u2cd1': + '\u2cd1', '\u2cd3': '\u2cd3', '\u2cd5': '\u2cd5', '\u2cd7': '\u2cd7', + '\u2cd9': '\u2cd9', '\u2cdb': '\u2cdb', '\u2cdd': '\u2cdd', '\u2cdf': + '\u2cdf', '\u2ce1': '\u2ce1', '\u2ce3': '\u2ce3', '\u2cec': '\u2cec', + '\u2cee': '\u2cee', '\u2cf3': '\u2cf3', '\u2d00': '\u2d00', '\u2d01': + '\u2d01', '\u2d02': '\u2d02', '\u2d03': '\u2d03', '\u2d04': '\u2d04', + '\u2d05': '\u2d05', '\u2d06': '\u2d06', '\u2d07': '\u2d07', '\u2d08': + '\u2d08', '\u2d09': '\u2d09', '\u2d0a': '\u2d0a', '\u2d0b': '\u2d0b', + '\u2d0c': '\u2d0c', '\u2d0d': '\u2d0d', '\u2d0e': '\u2d0e', '\u2d0f': + '\u2d0f', '\u2d10': '\u2d10', '\u2d11': '\u2d11', '\u2d12': '\u2d12', + '\u2d13': '\u2d13', '\u2d14': '\u2d14', '\u2d15': '\u2d15', '\u2d16': + '\u2d16', '\u2d17': '\u2d17', '\u2d18': '\u2d18', '\u2d19': '\u2d19', + '\u2d1a': '\u2d1a', '\u2d1b': '\u2d1b', '\u2d1c': '\u2d1c', '\u2d1d': + '\u2d1d', '\u2d1e': '\u2d1e', '\u2d1f': '\u2d1f', '\u2d20': '\u2d20', + '\u2d21': '\u2d21', '\u2d22': '\u2d22', '\u2d23': '\u2d23', '\u2d24': + '\u2d24', '\u2d25': '\u2d25', '\u2d27': '\u2d27', '\u2d2d': '\u2d2d', + '\ua641': '\ua641', '\ua643': '\ua643', '\ua645': '\ua645', '\ua647': + '\ua647', '\ua649': '\ua649', '\ua64b': '\ua64b', '\ua64d': '\ua64d', + '\ua64f': '\ua64f', '\ua651': '\ua651', '\ua653': '\ua653', '\ua655': + '\ua655', '\ua657': '\ua657', '\ua659': '\ua659', '\ua65b': '\ua65b', + '\ua65d': '\ua65d', '\ua65f': '\ua65f', '\ua661': '\ua661', '\ua663': + '\ua663', '\ua665': '\ua665', '\ua667': '\ua667', '\ua669': '\ua669', + '\ua66b': '\ua66b', '\ua66d': '\ua66d', '\ua681': '\ua681', '\ua683': + '\ua683', '\ua685': '\ua685', '\ua687': '\ua687', '\ua689': '\ua689', + '\ua68b': '\ua68b', '\ua68d': '\ua68d', '\ua68f': '\ua68f', '\ua691': + '\ua691', '\ua693': '\ua693', '\ua695': '\ua695', '\ua697': '\ua697', + '\ua699': '\ua699', '\ua69b': '\ua69b', '\ua723': '\ua723', '\ua725': + '\ua725', '\ua727': '\ua727', '\ua729': '\ua729', '\ua72b': '\ua72b', + '\ua72d': '\ua72d', '\ua72f': '\ua72f', '\ua733': '\ua733', '\ua735': + '\ua735', '\ua737': '\ua737', '\ua739': '\ua739', '\ua73b': '\ua73b', + '\ua73d': '\ua73d', '\ua73f': '\ua73f', '\ua741': '\ua741', '\ua743': + '\ua743', '\ua745': '\ua745', '\ua747': '\ua747', '\ua749': '\ua749', + '\ua74b': '\ua74b', '\ua74d': '\ua74d', '\ua74f': '\ua74f', '\ua751': + '\ua751', '\ua753': '\ua753', '\ua755': '\ua755', '\ua757': '\ua757', + '\ua759': '\ua759', '\ua75b': '\ua75b', '\ua75d': '\ua75d', '\ua75f': + '\ua75f', '\ua761': '\ua761', '\ua763': '\ua763', '\ua765': '\ua765', + '\ua767': '\ua767', '\ua769': '\ua769', '\ua76b': '\ua76b', '\ua76d': + '\ua76d', '\ua76f': '\ua76f', '\ua77a': '\ua77a', '\ua77c': '\ua77c', + '\ua77f': '\ua77f', '\ua781': '\ua781', '\ua783': '\ua783', '\ua785': + '\ua785', '\ua787': '\ua787', '\ua78c': '\ua78c', '\ua791': '\ua791', + '\ua793': '\ua793', '\ua797': '\ua797', '\ua799': '\ua799', '\ua79b': + '\ua79b', '\ua79d': '\ua79d', '\ua79f': '\ua79f', '\ua7a1': '\ua7a1', + '\ua7a3': '\ua7a3', '\ua7a5': '\ua7a5', '\ua7a7': '\ua7a7', '\ua7a9': + '\ua7a9', '\ua7b5': '\ua7b5', '\ua7b7': '\ua7b7', '\ua7b9': '\ua7b9', + '\uab53': '\uab53', '\uab70': '\uab70', '\uab71': '\uab71', '\uab72': + '\uab72', '\uab73': '\uab73', '\uab74': '\uab74', '\uab75': '\uab75', + '\uab76': '\uab76', '\uab77': '\uab77', '\uab78': '\uab78', '\uab79': + '\uab79', '\uab7a': '\uab7a', '\uab7b': '\uab7b', '\uab7c': '\uab7c', + '\uab7d': '\uab7d', '\uab7e': '\uab7e', '\uab7f': '\uab7f', '\uab80': + '\uab80', '\uab81': '\uab81', '\uab82': '\uab82', '\uab83': '\uab83', + '\uab84': '\uab84', '\uab85': '\uab85', '\uab86': '\uab86', '\uab87': + '\uab87', '\uab88': '\uab88', '\uab89': '\uab89', '\uab8a': '\uab8a', + '\uab8b': '\uab8b', '\uab8c': '\uab8c', '\uab8d': '\uab8d', '\uab8e': + '\uab8e', '\uab8f': '\uab8f', '\uab90': '\uab90', '\uab91': '\uab91', + '\uab92': '\uab92', '\uab93': '\uab93', '\uab94': '\uab94', '\uab95': + '\uab95', '\uab96': '\uab96', '\uab97': '\uab97', '\uab98': '\uab98', + '\uab99': '\uab99', '\uab9a': '\uab9a', '\uab9b': '\uab9b', '\uab9c': + '\uab9c', '\uab9d': '\uab9d', '\uab9e': '\uab9e', '\uab9f': '\uab9f', + '\uaba0': '\uaba0', '\uaba1': '\uaba1', '\uaba2': '\uaba2', '\uaba3': + '\uaba3', '\uaba4': '\uaba4', '\uaba5': '\uaba5', '\uaba6': '\uaba6', + '\uaba7': '\uaba7', '\uaba8': '\uaba8', '\uaba9': '\uaba9', '\uabaa': + '\uabaa', '\uabab': '\uabab', '\uabac': '\uabac', '\uabad': '\uabad', + '\uabae': '\uabae', '\uabaf': '\uabaf', '\uabb0': '\uabb0', '\uabb1': + '\uabb1', '\uabb2': '\uabb2', '\uabb3': '\uabb3', '\uabb4': '\uabb4', + '\uabb5': '\uabb5', '\uabb6': '\uabb6', '\uabb7': '\uabb7', '\uabb8': + '\uabb8', '\uabb9': '\uabb9', '\uabba': '\uabba', '\uabbb': '\uabbb', + '\uabbc': '\uabbc', '\uabbd': '\uabbd', '\uabbe': '\uabbe', '\uabbf': + '\uabbf', '\ufb00': '\ufb00', '\ufb01': '\ufb01', '\ufb02': '\ufb02', + '\ufb03': '\ufb03', '\ufb04': '\ufb04', '\ufb05': '\ufb05', '\ufb06': + '\ufb06', '\ufb13': '\ufb13', '\ufb14': '\ufb14', '\ufb15': '\ufb15', + '\ufb16': '\ufb16', '\ufb17': '\ufb17', '\U0001044e': '\U0001044e', + '\U0001044f': '\U0001044f', '\U000104d8': '\U000104d8', '\U000104d9': + '\U000104d9', '\U000104da': '\U000104da', '\U000104db': '\U000104db', + '\U000104dc': '\U000104dc', '\U000104dd': '\U000104dd', '\U000104de': + '\U000104de', '\U000104df': '\U000104df', '\U000104e0': '\U000104e0', + '\U000104e1': '\U000104e1', '\U000104e2': '\U000104e2', '\U000104e3': + '\U000104e3', '\U000104e4': '\U000104e4', '\U000104e5': '\U000104e5', + '\U000104e6': '\U000104e6', '\U000104e7': '\U000104e7', '\U000104e8': + '\U000104e8', '\U000104e9': '\U000104e9', '\U000104ea': '\U000104ea', + '\U000104eb': '\U000104eb', '\U000104ec': '\U000104ec', '\U000104ed': + '\U000104ed', '\U000104ee': '\U000104ee', '\U000104ef': '\U000104ef', + '\U000104f0': '\U000104f0', '\U000104f1': '\U000104f1', '\U000104f2': + '\U000104f2', '\U000104f3': '\U000104f3', '\U000104f4': '\U000104f4', + '\U000104f5': '\U000104f5', '\U000104f6': '\U000104f6', '\U000104f7': + '\U000104f7', '\U000104f8': '\U000104f8', '\U000104f9': '\U000104f9', + '\U000104fa': '\U000104fa', '\U000104fb': '\U000104fb', '\U00010cc0': + '\U00010cc0', '\U00010cc1': '\U00010cc1', '\U00010cc2': '\U00010cc2', + '\U00010cc3': '\U00010cc3', '\U00010cc4': '\U00010cc4', '\U00010cc5': + '\U00010cc5', '\U00010cc6': '\U00010cc6', '\U00010cc7': '\U00010cc7', + '\U00010cc8': '\U00010cc8', '\U00010cc9': '\U00010cc9', '\U00010cca': + '\U00010cca', '\U00010ccb': '\U00010ccb', '\U00010ccc': '\U00010ccc', + '\U00010ccd': '\U00010ccd', '\U00010cce': '\U00010cce', '\U00010ccf': + '\U00010ccf', '\U00010cd0': '\U00010cd0', '\U00010cd1': '\U00010cd1', + '\U00010cd2': '\U00010cd2', '\U00010cd3': '\U00010cd3', '\U00010cd4': + '\U00010cd4', '\U00010cd5': '\U00010cd5', '\U00010cd6': '\U00010cd6', + '\U00010cd7': '\U00010cd7', '\U00010cd8': '\U00010cd8', '\U00010cd9': + '\U00010cd9', '\U00010cda': '\U00010cda', '\U00010cdb': '\U00010cdb', + '\U00010cdc': '\U00010cdc', '\U00010cdd': '\U00010cdd', '\U00010cde': + '\U00010cde', '\U00010cdf': '\U00010cdf', '\U00010ce0': '\U00010ce0', + '\U00010ce1': '\U00010ce1', '\U00010ce2': '\U00010ce2', '\U00010ce3': + '\U00010ce3', '\U00010ce4': '\U00010ce4', '\U00010ce5': '\U00010ce5', + '\U00010ce6': '\U00010ce6', '\U00010ce7': '\U00010ce7', '\U00010ce8': + '\U00010ce8', '\U00010ce9': '\U00010ce9', '\U00010cea': '\U00010cea', + '\U00010ceb': '\U00010ceb', '\U00010cec': '\U00010cec', '\U00010ced': + '\U00010ced', '\U00010cee': '\U00010cee', '\U00010cef': '\U00010cef', + '\U00010cf0': '\U00010cf0', '\U00010cf1': '\U00010cf1', '\U00010cf2': + '\U00010cf2', '\U000118c0': '\U000118c0', '\U000118c1': '\U000118c1', + '\U000118c2': '\U000118c2', '\U000118c3': '\U000118c3', '\U000118c4': + '\U000118c4', '\U000118c5': '\U000118c5', '\U000118c6': '\U000118c6', + '\U000118c7': '\U000118c7', '\U000118c8': '\U000118c8', '\U000118c9': + '\U000118c9', '\U000118ca': '\U000118ca', '\U000118cb': '\U000118cb', + '\U000118cc': '\U000118cc', '\U000118cd': '\U000118cd', '\U000118ce': + '\U000118ce', '\U000118cf': '\U000118cf', '\U000118d0': '\U000118d0', + '\U000118d1': '\U000118d1', '\U000118d2': '\U000118d2', '\U000118d3': + '\U000118d3', '\U000118d4': '\U000118d4', '\U000118d5': '\U000118d5', + '\U000118d6': '\U000118d6', '\U000118d7': '\U000118d7', '\U000118d8': + '\U000118d8', '\U000118d9': '\U000118d9', '\U000118da': '\U000118da', + '\U000118db': '\U000118db', '\U000118dc': '\U000118dc', '\U000118dd': + '\U000118dd', '\U000118de': '\U000118de', '\U000118df': '\U000118df', + '\U00016e60': '\U00016e60', '\U00016e61': '\U00016e61', '\U00016e62': + '\U00016e62', '\U00016e63': '\U00016e63', '\U00016e64': '\U00016e64', + '\U00016e65': '\U00016e65', '\U00016e66': '\U00016e66', '\U00016e67': + '\U00016e67', '\U00016e68': '\U00016e68', '\U00016e69': '\U00016e69', + '\U00016e6a': '\U00016e6a', '\U00016e6b': '\U00016e6b', '\U00016e6c': + '\U00016e6c', '\U00016e6d': '\U00016e6d', '\U00016e6e': '\U00016e6e', + '\U00016e6f': '\U00016e6f', '\U00016e70': '\U00016e70', '\U00016e71': + '\U00016e71', '\U00016e72': '\U00016e72', '\U00016e73': '\U00016e73', + '\U00016e74': '\U00016e74', '\U00016e75': '\U00016e75', '\U00016e76': + '\U00016e76', '\U00016e77': '\U00016e77', '\U00016e78': '\U00016e78', + '\U00016e79': '\U00016e79', '\U00016e7a': '\U00016e7a', '\U00016e7b': + '\U00016e7b', '\U00016e7c': '\U00016e7c', '\U00016e7d': '\U00016e7d', + '\U00016e7e': '\U00016e7e', '\U00016e7f': '\U00016e7f', '\U0001e922': + '\U0001e922', '\U0001e923': '\U0001e923', '\U0001e924': '\U0001e924', + '\U0001e925': '\U0001e925', '\U0001e926': '\U0001e926', '\U0001e927': + '\U0001e927', '\U0001e928': '\U0001e928', '\U0001e929': '\U0001e929', + '\U0001e92a': '\U0001e92a', '\U0001e92b': '\U0001e92b', '\U0001e92c': + '\U0001e92c', '\U0001e92d': '\U0001e92d', '\U0001e92e': '\U0001e92e', + '\U0001e92f': '\U0001e92f', '\U0001e930': '\U0001e930', '\U0001e931': + '\U0001e931', '\U0001e932': '\U0001e932', '\U0001e933': '\U0001e933', + '\U0001e934': '\U0001e934', '\U0001e935': '\U0001e935', '\U0001e936': + '\U0001e936', '\U0001e937': '\U0001e937', '\U0001e938': '\U0001e938', + '\U0001e939': '\U0001e939', '\U0001e93a': '\U0001e93a', '\U0001e93b': + '\U0001e93b', '\U0001e93c': '\U0001e93c', '\U0001e93d': '\U0001e93d', + '\U0001e93e': '\U0001e93e', '\U0001e93f': '\U0001e93f', '\U0001e940': + '\U0001e940', '\U0001e941': '\U0001e941', '\U0001e942': '\U0001e942', +} + + +_first_upper_exception = _first_upper_exception_dict.get -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611931 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: I83f81708bba5f2c590c0dd5583388a3286b46879 Gerrit-Change-Number: 611931 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [tests] Additional tests for UploadRobot
by jenkins-bot (Code Review) 15 Jul '20

15 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612838 ) Change subject: [tests] Additional tests for UploadRobot ...................................................................... [tests] Additional tests for UploadRobot - code coverage of UploadRobot is 10% only Provide some additional dry tests for methods and attributes - move target_site.login() from Initializer to run method to enable dry tests Bug: T60941 Change-Id: Ia9de151ea80b923c7038a0465a2d4797cd28be32 --- M pywikibot/specialbots/_upload.py M tests/uploadbot_tests.py 2 files changed, 26 insertions(+), 5 deletions(-) Approvals: Huji: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/specialbots/_upload.py b/pywikibot/specialbots/_upload.py index b4bef7d..56ff407 100644 --- a/pywikibot/specialbots/_upload.py +++ b/pywikibot/specialbots/_upload.py @@ -115,7 +115,6 @@ 'commons') else: self.target_site = target_site or pywikibot.Site() - self.target_site.login() def read_file_content(self, file_url=None): """Return name of temp file in which remote file is saved.""" @@ -454,6 +453,7 @@ return # early check that user has proper rights to upload + self.target_site.login() if not self.target_site.has_right('upload'): pywikibot.error( "User '%s' does not have upload rights on site %s." diff --git a/tests/uploadbot_tests.py b/tests/uploadbot_tests.py index bded553..29f29a3 100644 --- a/tests/uploadbot_tests.py +++ b/tests/uploadbot_tests.py @@ -5,18 +5,16 @@ These tests write to the wiki. """ # -# (C) Pywikibot team, 2014-2019 +# (C) Pywikibot team, 2014-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import os from pywikibot.specialbots import UploadRobot from tests import join_images_path -from tests.aspects import unittest, TestCase +from tests.aspects import unittest, TestCase, DefaultSiteTestCase class TestUploadbot(TestCase): @@ -61,6 +59,29 @@ bot.run() +class TestDryUploadbot(DefaultSiteTestCase): + + """Dry tests UploadRobot.""" + + net = False + + params = dict( # noqa: C408 + description='pywikibot upload.py script test', + keep_filename=True, + aborts=set(), + ignore_warning=True, + ) + + def test_png_file(self): + """Test UploadRobot attributes and methods.""" + bot = UploadRobot(url=['test.png'], target_site=self.site, + **self.params) + self.assertEqual(bot.description, self.params['description']) + self.assertTrue(bot._handle_warning('any warning')) # ignore_warning + self.assertTrue(bot.ignore_on_warn('any warning')) # ignore_warning + self.assertFalse(bot.abort_on_warn('any warning')) # aborts + + if __name__ == '__main__': # pragma: no cover try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612838 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: Ia9de151ea80b923c7038a0465a2d4797cd28be32 Gerrit-Change-Number: 612838 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Solve TypeError of RepeatingGenerator
by jenkins-bot (Code Review) 15 Jul '20

15 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612841 ) Change subject: [bugfix] Solve TypeError of RepeatingGenerator ...................................................................... [bugfix] Solve TypeError of RepeatingGenerator A generator is not reversible. Change-Id: Ic33cbba2db5db62d97318c0812bf51147facdfb1 --- M pywikibot/pagegenerators.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Matěj Suchánek: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index f0f84c2..b6eeed8 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -2185,7 +2185,7 @@ break pywikibot.sleep(sleep_duration) - yield from reversed(filtered_generator()) + yield from reversed(list(filtered_generator())) @deprecated_args(pageNumber='groupsize', step='groupsize', lookahead=None) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612841 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: Ic33cbba2db5db62d97318c0812bf51147facdfb1 Gerrit-Change-Number: 612841 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] import svn_utils later in version.py
by jenkins-bot (Code Review) 15 Jul '20

15 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612271 ) Change subject: [bugfix] import svn_utils later in version.py ...................................................................... [bugfix] import svn_utils later in version.py - with setuptools 49.2.0 it is discouraged to import distutils before Setuptools. Therefore import svn_utils when needed - also remove Python 2 related code in version.py Bug: T257772 Change-Id: I5b4bd3e45cbd6055b808fd279e3c2c671dc28b5a --- M pywikibot/version.py 1 file changed, 19 insertions(+), 37 deletions(-) Approvals: Zhuyifei1999: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/version.py b/pywikibot/version.py index 0c6423e..db22ac2 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -5,43 +5,28 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import codecs import datetime -from importlib import import_module import json import os +import pathlib import socket import subprocess import sys import time import xml.dom.minidom -from contextlib import closing +from contextlib import closing, suppress from distutils import log from distutils.sysconfig import get_python_lib +from importlib import import_module from io import BytesIO from warnings import warn -try: - from setuptools import svn_utils -except ImportError: - try: - from setuptools_svn import svn_utils - except ImportError as e: - svn_utils = e - -try: - import pathlib -except ImportError: - import pathlib2 as pathlib # Python 2 - - import pywikibot from pywikibot import config2 as config -from pywikibot.tools import deprecated, PY2, UnicodeType +from pywikibot.tools import deprecated cache = None _logger = 'version' @@ -79,17 +64,15 @@ data['cmp_ver'] = 'n/a' if online: - try: + with suppress(Exception): hsh3 = getversion_onlinerepo('tags/stable') hsh2 = getversion_onlinerepo() hsh1 = data['hsh'] data['cmp_ver'] = 'UNKNOWN' if not hsh1 else ( 'OUTDATED' if hsh1 not in (hsh2, hsh3) else 'ok') - except Exception: - pass data['hsh'] = data['hsh'][:7] # make short hash from full hash - return '%(tag)s (%(hsh)s, %(rev)s, %(date)s, %(cmp_ver)s)' % data + return '{tag} ({hsh}, {rev}, {date}, {cmp_ver})'.format(**data) def getversiondict(): @@ -135,7 +118,7 @@ pywikibot.debug('version algorithm exceptions:\n%r' % exceptions, _logger) - if isinstance(date, UnicodeType): + if isinstance(date, str): datestring = date elif isinstance(date, time.struct_time): datestring = time.strftime('%Y/%m/%d, %H:%M:%S', date) @@ -166,14 +149,14 @@ with open(filename) as entries: version = entries.readline().strip() if version != '12': - for i in range(3): + for _ in range(3): entries.readline() tag = entries.readline().strip() t = tag.split('://', 1) t[1] = t[1].replace('svn.wikimedia.org/svnroot/pywikipedia/', '') tag = '[{0}] {1}'.format(*t) - for i in range(4): + for _ in range(4): entries.readline() date = time.strptime(entries.readline()[:19], '%Y-%m-%dT%H:%M:%S') @@ -233,8 +216,11 @@ - hash (git hash for the Subversion revision) @rtype: C{tuple} of three C{str} and a C{time.struct_time} """ - if isinstance(svn_utils, Exception): - raise svn_utils + try: + from setuptools import svn_utils + except ImportError: + from setuptools_svn import svn_utils + tag = 'pywikibot-core' _program_dir = path or _get_program_dir() svninfo = svn_utils.SvnInfo(_program_dir) @@ -417,10 +403,8 @@ with codecs.open(fn, 'r', 'utf-8') as f: for line in f.readlines(): if line.find('__version__') == 0: - try: + with suppress(Exception): exec(line) - except Exception: - pass break stat = os.stat(fn) mtime = datetime.datetime.fromtimestamp(stat.st_mtime).isoformat(' ') @@ -442,6 +426,7 @@ """ if hasattr(module, '__version__'): return module.__version__[5:-1] + return None def get_module_filename(module): @@ -459,13 +444,12 @@ """ if hasattr(module, '__file__') and os.path.exists(module.__file__): filename = module.__file__ - if PY2: - filename = os.path.abspath(filename) if filename[-4:-1] == '.py' and os.path.exists(filename[:-1]): filename = filename[:-1] program_dir = _get_program_dir() if filename[:len(program_dir)] == program_dir: return filename + return None def get_module_mtime(module): @@ -480,6 +464,7 @@ filename = get_module_filename(module) if filename: return datetime.datetime.fromtimestamp(os.stat(filename).st_mtime) + return None def package_versions(modules=None, builtins=False, standard_lib=None): @@ -508,7 +493,7 @@ # Improve performance by removing builtins from the list if possible. if builtins is False: - root_packages = list(root_packages - builtin_packages) + root_packages = root_packages - builtin_packages std_lib_packages = [] @@ -541,9 +526,6 @@ if '__init__.py' in path: path = path[0:path.index('__init__.py')] - if PY2: - path = path.decode(sys.getfilesystemencoding()) - info['path'] = path assert path not in paths, 'Path of the package is in defined paths' paths[path] = name -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612271 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: I5b4bd3e45cbd6055b808fd279e3c2c671dc28b5a Gerrit-Change-Number: 612271 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [4.0] Follow up on Ib0db465bfcc6a38335379
by jenkins-bot (Code Review) 15 Jul '20

15 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612727 ) Change subject: [4.0] Follow up on Ib0db465bfcc6a38335379 ...................................................................... [4.0] Follow up on Ib0db465bfcc6a38335379 PWB doesn't also support Python 3.4. Support starts from 3.5 and above. Change-Id: I849289e44f0f19b5962eced5b8bf588625153252 --- M docs/index.rst 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Lokal Profil: Looks good to me, approved JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/index.rst b/docs/index.rst index cc22a5a..3607626 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -13,7 +13,7 @@ Pywikibot is a Python library and collection of scripts that automate work on `MediaWiki <https://mediawiki.org>`_ sites. -Pywikibot supports Python 3.4+. +Pywikibot supports Python 3.5+. Pywikibot and this documentation are licensed under the :ref:`MIT license <licenses-MIT>`; manual pages on mediawiki.org are licensed under the `CC-BY-SA 3.0`_ license. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612727 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: I849289e44f0f19b5962eced5b8bf588625153252 Gerrit-Change-Number: 612727 Gerrit-PatchSet: 1 Gerrit-Owner: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [4.0] Remove py2 mention from documentation
by jenkins-bot (Code Review) 15 Jul '20

15 Jul '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612704 ) Change subject: [4.0] Remove py2 mention from documentation ...................................................................... [4.0] Remove py2 mention from documentation Bug: T213287 Change-Id: Ib0db465bfcc6a383353794a141a84c96053adc1e --- M docs/index.rst 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: D3r1ck01: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/index.rst b/docs/index.rst index b9c0d80..cc22a5a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -13,7 +13,7 @@ Pywikibot is a Python library and collection of scripts that automate work on `MediaWiki <https://mediawiki.org>`_ sites. -Pywikibot supports Python 2.7.4+ and 3.4+. +Pywikibot supports Python 3.4+. Pywikibot and this documentation are licensed under the :ref:`MIT license <licenses-MIT>`; manual pages on mediawiki.org are licensed under the `CC-BY-SA 3.0`_ license. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/612704 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: Ib0db465bfcc6a383353794a141a84c96053adc1e Gerrit-Change-Number: 612704 Gerrit-PatchSet: 1 Gerrit-Owner: Lokal Profil <andre.costa(a)wikimedia.se> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits July 2020