Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

13500 discussions

[Gerrit] ...core[master]: [IMPR] Improvements for dataextend.py
by jenkins-bot (Code Review) 06 Sep '22

06 Sep '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/830187 ) Change subject: [IMPR] Improvements for dataextend.py ...................................................................... [IMPR] Improvements for dataextend.py - add typing hints for html parameter - add typing hints for findnames method - always return a list with findnames - update funcnames list in __getattr__ Change-Id: Ie9e84caac4c036ced97a42c9bf6b2139b34f496a --- M scripts/dataextend.py 1 file changed, 2,668 insertions(+), 2,583 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/830187 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: Ie9e84caac4c036ced97a42c9bf6b2139b34f496a Gerrit-Change-Number: 830187 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Shorten dataextend.py
by jenkins-bot (Code Review) 05 Sep '22

05 Sep '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/829744 ) Change subject: [IMPR] Shorten dataextend.py ...................................................................... [IMPR] Shorten dataextend.py Use __getattr__ within Analyzer to return None if a function is not defined in subclass Change-Id: I181b713c09882d560c50f38da32ff5054f152de5 --- M scripts/dataextend.py 1 file changed, 42 insertions(+), 467 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/dataextend.py b/scripts/dataextend.py index d518996..f014c3d 100644 --- a/scripts/dataextend.py +++ b/scripts/dataextend.py @@ -1676,18 +1676,9 @@ result = result.replace('\n\n', '\n') return result.strip() - def findlongtext(self, html): - return None - def finddescriptions(self, html): return [self.finddescription(html)] - def findlanguagedescriptions(self, html): - return None - - def finddescription(self, html): - return None - def getlanguage(self, code): if not code: return self.language @@ -1720,464 +1711,48 @@ for (language, term) in self.findlanguagenames(self.html) or [] if term and term.strip()] \ + self.findwikipedianames(self.html) - def findnames(self, html): - return None - - def findlanguagenames(self, html): - return None - - def findinstanceof(self, html): - return None - - def findgender(self, html): - return None - - def findfather(self, html): - return None - - def findmother(self, html): - return None - - def findspouses(self, html): - return None - - def findpartners(self, html): - return None - - def findreligion(self, html): - return None - - def findreligions(self, html): - return None - - def findchildren(self, html): - return None - - def findsiblings(self, html): - return None - - def findkins(self, html): - return None - - def findcountry(self, html): - return None - - def findcountries(self, html): - return None - - def findorigcountry(self, html): - return None - - def findadminloc(self, html): - return None - - def findlocation(self, html): - return None - - def findformationlocation(self, html): - return None - - def findbirthplace(self, html): - return None - - def finddeathplace(self, html): - return None - - def findburialplace(self, html): - return None - - def findmannerdeath(self, html): - return None - - def findcausedeath(self, html): - return None - - def findchoriginplace(self, html): - return None - - def findchoriginplaces(self, html): - return None - - def findworkplaces(self, html): - return None - - def findresidences(self, html): - return None - - def findnationality(self, html): - return None - - def findethnicity(self, html): - return None - - def findethnicities(self, html): - return None - - def findorientation(self, html): - return None - - def findnationalities(self, html): - return None - - def findsportcountries(self, html): - return None - - def findfirstname(self, html): - return None - - def findlastname(self, html): - return None - - def findfirstnames(self, html): - return None - - def findlastnames(self, html): - return None - - def findaddress(self, html): - return None - - def findhaircolor(self, html): - return None - - def findcoords(self, html): - return None - - def findbirthdate(self, html): - return None - - def finddeathdate(self, html): - return None - - def findbaptismdate(self, html): - return None - - def findburialdate(self, html): - return None - - def findinception(self, html): - return None - - def findpremiere(self, html): - return None - - def finddissolution(self, html): - return None - - def findpubdate(self, html): - return None - - def findpubdates(self, html): - return None - - def findfloruit(self, html): - return None - - def findfloruitstart(self, html): - return None - - def findfloruitend(self, html): - return None - - def findheights(self, html): - return [self.findheight(html)] - - def findheight(self, html): - return None - - def findweights(self, html): - return [self.findweight(html)] - - def findweight(self, html): - return None - - def findoccupations(self, html): - return None - - def findworkfields(self, html): - return None - - def findpositions(self, html): - return None - - def findtitles(self, html): - return None - - def findemployers(self, html): - return None - - def findranks(self, html): - return None - - def findschools(self, html): - return None - - def findcrimes(self, html): - return None - - def findmoviedirectors(self, html): - return None - - def findartdirectors(self, html): - return None - - def findscreenwriters(self, html): - return None - - def findproducers(self, html): - return None - - def finddirectorsphotography(self, html): - return None - - def findmovieeditors(self, html): - return None - - def findproductiondesigners(self, html): - return None - - def findsounddesigners(self, html): - return None - - def findcostumedesigners(self, html): - return None - - def findmakeupartists(self, html): - return None - - def findcomposers(self, html): - return None - - def findarchitects(self, html): - return None - - def findgenres(self, html): - return None - - def findengines(self, html): - return None - - def findgamemodes(self, html): - return None - - def findcast(self, html): - return None - - def findmaterials(self, html): - return None - - def finddevelopers(self, html): - return None - - def findpublishers(self, html): - return None - - def findprodcoms(self, html): - return None - - def finddistcoms(self, html): - return None - - def findoriglanguages(self, html): - return None - - def finddurations(self, html): - return None - - def findprominences(self, html): - return None - - def findisolations(self, html): - return None - - def findlanguagesspoken(self, html): - return None - - def findlanguages(self, html): - return None - - def findnativelanguages(self, html): - return None - - def findcolors(self, html): - return None - - def finduse(self, html): - return None - - def findfloorsabove(self, html): - return None - - def findfloorsbelow(self, html): - return None - - def findelevations(self, html): - return None - - def findmountainrange(self, html): - return None - - def findrelorder(self, html): - return None - - def findwebsite(self, html): - return None - - def findwebpages(self, html): - return None - - def findsources(self, html): - return None - - def findvoice(self, html): - return None - - def findvoices(self, html): - return None - - def findfamily(self, html): - return None - - def findgens(self, html): - return None - - def findpseudonyms(self, html): - return None - - def findparts(self, html): - return None - - def findpartofs(self, html): - return None - - def findinstruments(self, html): - return None - - def findlabels(self, html): - return None - - def findsports(self, html): - return None - - def findawards(self, html): - return None - - def findnominations(self, html): - return None - - def findmemberships(self, html): - return None - - def findsportteams(self, html): - return None - - def findparties(self, html): - return None - - def findbranches(self, html): - return None - - def findconflicts(self, html): - return None - - def findteampositions(self, html): - return None - - def findpolitical(self, html): - return None - - def findstudents(self, html): - return None - - def finddocstudents(self, html): - return None - - def findteachers(self, html): - return None - - def findadvisors(self, html): - return None - - def findinfluences(self, html): - return None - - def finddegrees(self, html): - return None - - def findmajors(self, html): - return None - - def findparticipations(self, html): - return None - - def findviaf(self, html): - return None - - def findisni(self, html): - return None - - def findtwitter(self, html): - return None - - def findfacebook(self, html): - return None - - def findfacebookpage(self, html): - return None - - def findincollections(self, html): - return None - - def findinworks(self, html): - return None - - def findmovements(self, html): - return None - - def findorigcountries(self, html): - return None - - def findchesstitle(self, html): - return None - - def findfeastday(self, html): - return None - - def findbloodtype(self, html): - return None - - def findeyecolor(self, html): - return None - - def findpatronof(self, html): - return None - - def findnotableworks(self, html): - return None - - def findparticipantins(self, html): - return None - - def findplatforms(self, html): - return None - - def findfranchises(self, html): - return None - - def findimage(self, html): - return None - - def findcoatarms(self, html): - return None - - def findsignature(self, html): - return None - - def findlogo(self, html): - return None - - def findmixedrefs(self, html): - return None + def __getattr__(self, name): + """Return None if the function is not defined in subclass.""" + prefix = 'find' + funcnames = { + 'address', 'adminloc', 'advisors', 'architects', 'artdirectors', + 'awards', 'baptismdate', 'birthdate', 'birthplace', 'bloodtype', + 'branches', 'burialdate', 'burialplace', 'cast', 'causedeath', + 'chesstitle', 'children', 'choriginplace', 'choriginplaces', + 'coatarms', 'colors', 'composers', 'conflicts', 'coords', + 'costumedesigners', 'countries', 'country', 'crimes', 'deathdate', + 'deathplace', 'degrees', 'developers', 'directorsphotography', + 'dissolution', 'distcoms', 'docstudents', 'durations', + 'elevations', 'employers', 'engines', 'ethnicities', 'ethnicity', + 'eyecolor', 'facebook', 'facebookpage', 'family', 'father', + 'feastday', 'firstname', 'firstnames', 'floorsabove', + 'floorsbelow', 'floruit', 'floruitend', 'floruitstart', + 'formationlocation', 'franchises', 'gamemodes', 'gender', + 'genres', 'gens', 'haircolor', 'height', 'heights', 'image', + 'inception', 'incollections', 'influences', 'instanceof', + 'instruments', 'inworks', 'isni', 'isolations', 'kins', 'labels', + 'languages', 'languagesspoken', 'lastname', 'lastnames', + 'location', 'logo', 'majors', 'makeupartists', 'mannerdeath', + 'materials', 'memberships', 'mixedrefs', 'mother', 'mountainrange', + 'movements', 'moviedirectors', 'movieeditors', 'nationalities', + 'nationality', 'nativelanguages', 'nominations', 'notableworks', + 'occupations', 'orientation', 'origcountries', 'origcountry', + 'origlanguages', 'participantins', 'participations', 'parties', + 'partners', 'partofs', 'parts', 'patronof', 'platforms', + 'political', 'positions', 'premiere', 'prodcoms', 'producers', + 'productiondesigners', 'prominences', 'pseudonyms', 'pubdate', + 'pubdates', 'publishers', 'ranks', 'religion', 'religions', + 'relorder', 'residences', 'schools', 'screenwriters', 'siblings', + 'signature', 'sounddesigners', 'sources', 'sportcountries', + 'sports', 'sportteams', 'spouses', 'students', 'teachers', + 'teampositions', 'titles', 'twitter', 'use', 'viaf', 'voice', + 'voices', 'webpages', 'website', 'weight', 'weights', 'workfields', + 'workplaces', + } + pre, sep, post = name.partition(prefix) + if not pre and sep == prefix and post in funcnames: + return lambda html: None + return super().__getattribute__(name) def finddefaultmixedrefs(self, html, includesocial=True): defaultmixedrefs = [ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/829744 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: I181b713c09882d560c50f38da32ff5054f152de5 Gerrit-Change-Number: 829744 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [L10N] Update interwiki sorting order
by jenkins-bot (Code Review) 02 Sep '22

02 Sep '22

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

1 0

[Gerrit] ...core[master]: [doc] Add documentation for recently added create_isbn_edition script
by Xqt (Code Review) 02 Sep '22

02 Sep '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/829123 ) Change subject: [doc] Add documentation for recently added create_isbn_edition script ...................................................................... [doc] Add documentation for recently added create_isbn_edition script Change-Id: Id8c49c3bc00e7892ac9b32926748df3b6edf6864 --- M docs/conf.py M docs/scripts/wikibase.rst M docs/scripts_ref/scripts.rst M scripts/create_isbn_edition.py 4 files changed, 100 insertions(+), 113 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/docs/conf.py b/docs/conf.py index 7a3375a..3efa97a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -365,6 +365,8 @@ numfig = True # Other settings +show_authors = True +todo_include_todos = True autodoc_typehints = 'description' diff --git a/docs/scripts/wikibase.rst b/docs/scripts/wikibase.rst index c604030..59e5da8 100644 --- a/docs/scripts/wikibase.rst +++ b/docs/scripts/wikibase.rst @@ -7,6 +7,12 @@ .. automodule:: scripts.claimit :no-members: +create\_isbn\_edition script description +---------------------------------------- + +.. automodule:: scripts.create_isbn_edition + :no-members: + dataextend script description ----------------------------- diff --git a/docs/scripts_ref/scripts.rst b/docs/scripts_ref/scripts.rst index 0bda098..2254477 100644 --- a/docs/scripts_ref/scripts.rst +++ b/docs/scripts_ref/scripts.rst @@ -82,6 +82,11 @@ .. automodule:: scripts.cosmetic_changes +create\_isbn\_edition script +---------------------------- + +.. automodule:: scripts.create_isbn_edition + dataextend script ----------------- diff --git a/scripts/create_isbn_edition.py b/scripts/create_isbn_edition.py index 2f9dbdc..99d45ee 100644 --- a/scripts/create_isbn_edition.py +++ b/scripts/create_isbn_edition.py @@ -42,8 +42,7 @@ Free text (e.g. Wikipedia references list, or publication list) is accepted. Identification is done via an ISBN regex expression. -Functionality: - +**Functionality:** * The ISBN number is used as a primary key (P212 where no duplicates are allowed. The item update is not performed when there is no unique match @@ -53,39 +52,29 @@ (ambiguous items are skipped) * Book title and subtitle are separated with '.', ':', or '-' * This script can be run incrementally with the same parameters - Caveat: Take into account the Wikidata Query database - replication delay. Wait for minimum 5 minutes to avoid creating - duplicate objects. + Caveat: Take into account the Wikidata Query database + replication delay. Wait for minimum 5 minutes to avoid creating + duplicate objects. -Data quality: - +**Data quality:** * Use https://query.wikidata.org/querybuilder/ to identify P212 - duplicates. Merge duplicate items before running the script - again. + duplicates. Merge duplicate items before running the script + again. * The following properties should only be used for written works - P5331: OCLC work ID (editions should only have P243) - P8383: Goodreads-identificatiecode for work (editions should - only have P2969) + P5331: OCLC work ID (editions should only have P243) + P8383: Goodreads-identificatiecode for work (editions should + only have P2969) Examples: - # Default library (Google Books), language (LANG), no additional - statements + Default library (Google Books), language (LANG), no additional + statements: - ./create_isbn_edition.py - 9789042925564 + pwb create_isbn_edition.py 9789042925564 - # Wikimedia, language Dutch, main subject: database management + Wikimedia, language Dutch, main subject: database management: - ./create_isbn_edition.py wiki en P921 Q107643461 - 978-0-596-10089-6 - -Return status: - - The following status codes are returned to the shell: - - 3 Invalid or missing parameter - 12 Item does not exist + pwb create_isbn_edition.py wiki en P921 Q107643461 978-0-596-10089-6 Standard ISBN properties: @@ -125,40 +114,38 @@ P8383: Goodreads-identificatiecode for work (editions should only have P2969) -Author: +**Author:** + Geert Van Pamel, 2022-08-04, + GNU General Public License v3.0, User:Geertivp - Geert Van Pamel, 2022-08-04, GNU General Public License v3.0, User:Geertivp +**Documentation:** + * https://en.wikipedia.org/wiki/ISBN + * https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes + * https://www.geeksforgeeks.org/searching-books-with-python/ + * https://www.freecodecamp.org/news/python-json-how-to-convert-a-string-to-js… + * https://pypi.org/project/isbnlib/ + * https://buildmedia.readthedocs.org/media/pdf/isbnlib/v3.4.5/isbnlib.pdf + * https://isbntools.readthedocs.io/en/latest/info.html + * https://www.wikidata.org/wiki/Property:P212 + * https://www.wikidata.org/wiki/Wikidata:WikiProject_Books + * WikiProject Books: https://www.wikidata.org/wiki/Q21831105 + * https://www.wikidata.org/wiki/Wikidata:List_of_properties/work + * https://www.wikidata.org/wiki/Template:Book_properties + * https://www.wikidata.org/wiki/Template:Bibliographic_properties + * http://classify.oclc.org/classify2/ClassifyDemo + * https://www.wikidata.org/wiki/Wikidata:WikiProject_Source_MetaData + * https://www.wikidata.org/wiki/Help:Sources + * https://www.wikidata.org/wiki/Q22696135 + * https://meta.wikimedia.org/wiki/Community_Wishlist_Survey_2021/Wikidata/Bib… + * https://doc.wikimedia.org/pywikibot/master/api_ref/pywikibot.html + * https://doc.wikimedia.org/pywikibot/master/ + * https://docs.python.org/3/howto/logging.html + * https://wikitech.wikimedia.org/wiki/Portal:Toolforge + * http://www.isbn.org/standards/home/isbn/international/hyphenation-instructi… + * https://www.wikidata.org/wiki/Wikidata:Pywikibot\_-_Python_3_Tutorial/Setti… + * https://www.wikidata.org/wiki/Wikidata:Pywikibot\_-_Python_3_Tutorial/Setti… -Documentation: - - https://en.wikipedia.org/wiki/ISBN - https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes - https://www.geeksforgeeks.org/searching-books-with-python/ - https://www.freecodecamp.org/news/python-json-how-to-convert-a-string-to-js… - https://pypi.org/project/isbnlib/ - https://buildmedia.readthedocs.org/media/pdf/isbnlib/v3.4.5/isbnlib.pdf - https://isbntools.readthedocs.io/en/latest/info.html - https://www.wikidata.org/wiki/Property:P212 - https://www.wikidata.org/wiki/Wikidata:WikiProject_Books - WikiProject Books: https://www.wikidata.org/wiki/Q21831105 - https://www.wikidata.org/wiki/Wikidata:List_of_properties/work - https://www.wikidata.org/wiki/Template:Book_properties - https://www.wikidata.org/wiki/Template:Bibliographic_properties - http://classify.oclc.org/classify2/ClassifyDemo - https://www.wikidata.org/wiki/Wikidata:WikiProject_Source_MetaData - https://www.wikidata.org/wiki/Help:Sources - https://www.wikidata.org/wiki/Q22696135 - https://meta.wikimedia.org/wiki/Community_Wishlist_Survey_2021/Wikidata/Bib… - https://doc.wikimedia.org/pywikibot/master/api_ref/pywikibot.html - https://doc.wikimedia.org/pywikibot/master/ - https://docs.python.org/3/howto/logging.html - https://wikitech.wikimedia.org/wiki/Portal:Toolforge - http://www.isbn.org/standards/home/isbn/international/hyphenation-instructi… - https://www.wikidata.org/wiki/Wikidata:Pywikibot_-_Python_3_Tutorial/Settin… - https://www.wikidata.org/wiki/Wikidata:Pywikibot_-_Python_3_Tutorial/Settin… - -Prerequisites: - +**Prerequisites:** pywikibot Install the following ISBN lib packages: @@ -175,22 +162,20 @@ pip install isbnlib-worldcat2 etc. -Restrictions: - +**Restrictions:** * Better use the ISO 639-1 language code parameter as a default The language code is not always available from the digital library. * SPARQL queries run on a replicated database Possible important replication delay; wait 5 minutes before retry -- otherwise risk for creating duplicates. -Known problems: - +**Known problems:** * Unknown ISBN, e.g. 9789400012820 * No ISBN data available for an edition either causes no output - (goob = Google Books), or an error message (wiki, openl) - The script is taking care of both + (goob = Google Books), or an error message (wiki, openl) + The script is taking care of both * Only 6 ISBN attributes are listed by the webservice(s) - missing are e.g.: place of publication, number of pages + missing are e.g.: place of publication, number of pages * Not all ISBN atttributes have data (authos, publisher, date of publication, language) * The script uses multiple webservice calls (script might take time, @@ -201,25 +186,23 @@ * Does the KBR has a public ISBN service (Koninklijke Bibliotheek van België)? * Filter for work properties -- need to amend Q47461344 (written - work) instance and P629 (edition of) + P747 (has edition) - statements https://www.wikidata.org/wiki/Q63413107 - ['9781282557246', '9786612557248', '9781847196057', '9781847196040'] - P8383: Goodreads-identificatiecode voor work 13957943 (should - have P2969) - P5331: OCLC-identificatiecode voor work 793965595 (should have P243) + work) instance and P629 (edition of) + P747 (has edition) + statements https://www.wikidata.org/wiki/Q63413107 + ['9781282557246', '9786612557248', '9781847196057', '9781847196040'] + P8383: Goodreads-identificatiecode voor work 13957943 (should + have P2969) + P5331: OCLC-identificatiecode voor work 793965595 (should have P243) -To do: +.. todo:: + * Add source reference (digital library instance) - * Add source reference (digital library instance) - -Algorithm: - - Get parameters - Validate parameters - Get ISBN data - Convert ISBN data - Get additional data - Register ISBN data into Wikidata (create or amend items or claims) +**Algorithm:** + # Get parameters + # Validate parameters + # Get ISBN data + # Convert ISBN data + # Get additional data + # Register ISBN data into Wikidata (create or amend items or claims) Environment: @@ -232,9 +215,6 @@ LANG: ISO 639-1 language code -Source code: - - https://github.com/geertivp/Pywikibot/blob/main/create_isbn_edition.py Applications: @@ -249,32 +229,27 @@ https://phabricator.wikimedia.org/tag/wikicite/ https://meta.wikimedia.org/wiki/WikiCite/Shared_Citations -Wikidata Query: +**Wikidata Query:** + * List of editions about musicians: https://w.wiki/5aaz + * List of editions having ISBN number: https://w.wiki/5akq - List of editions about musicians: https://w.wiki/5aaz - List of editions having ISBN number: https://w.wiki/5akq +**Related projects:** + * :phab:`T314942` (this script) + * :phab:`T282719` + * :phab:`T214802` + * :phab:`T208134` + * :phab:`T138911` + * :phab:`T20814` + * https://en.wikipedia.org/wiki/User:Citation_bot + * https://meta.wikimedia.org/wiki/Community_Wishlist_Survey_2021/Wikidata/Bib… + * https://zenodo.org/record/55004#.YvwO4hTP1D8 -Related projects: - - https://phabricator.wikimedia.org/T314942 (this script) - - (other projects) - https://phabricator.wikimedia.org/T282719 - https://phabricator.wikimedia.org/T214802 - https://phabricator.wikimedia.org/T208134 - https://phabricator.wikimedia.org/T138911 - https://phabricator.wikimedia.org/T20814 - https://en.wikipedia.org/wiki/User:Citation_bot - https://meta.wikimedia.org/wiki/Community_Wishlist_Survey_2021/Wikidata/Bib… - https://zenodo.org/record/55004#.YvwO4hTP1D8 - -Other systems: - - https://en.wikipedia.org/wiki/bibliographic_database - https://www.titelbank.nl/pls/ttb/f?p=103:4012:::NO::P4012_TTEL_ID:3496019&c… +**Other systems:** + * https://en.wikipedia.org/wiki/bibliographic_database + * https://www.titelbank.nl/pls/ttb/f?p=103:4012:::NO::P4012_TTEL_ID:3496019&c… .. versionadded:: 7.7 -""" +""" # noqa E501, W605 # # (C) Pywikibot team, 2022 # @@ -338,11 +313,11 @@ return any(seq.getTarget().getID() in checklist for seq in statement_list) -def get_item_list(item_name, instance_id): +def get_item_list(item_name: str, instance_id): """Get list of items by name, belonging to an instance (list). - :param item_name: Item name (string; case sensitive) - :param instance_id: Instance ID (string, set, or list) + :param item_name: Item name (case sensitive) + :param instance_id: Instance ID (string, set, or list) :Returns: Set of items (Q-numbers) """ item_list = set() # Empty set @@ -378,14 +353,13 @@ return item_list -def amend_isbn_edition(isbn_number): # noqa: C901 +def amend_isbn_edition(isbn_number: str): # noqa: C901 """Amend ISBN registration. Amend Wikidata, by registering the ISBN-13 data via P212, depending on the data obtained from the digital library. - :param isbn_number: ISBN number (string; 10 or 13 digits with - optional hyphens) + :param isbn_number: ISBN number (10 or 13 digits with optional hyphens) """ global proptyx global targetx -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/829123 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: Id8c49c3bc00e7892ac9b32926748df3b6edf6864 Gerrit-Change-Number: 829123 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Add WikiBlame support to Pywikibot
by jenkins-bot (Code Review) 02 Sep '22

02 Sep '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/699536 ) Change subject: [IMPR] Add WikiBlame support to Pywikibot ...................................................................... [IMPR] Add WikiBlame support to Pywikibot - add main_authors() method to BasePage class which gives the 5 topmost editors based on the current blamed text - provide some tests Change-Id: I25f1b23cfaa88f02c1721a7032da4938da1777b7 --- M docs/api_ref/pywikibot.page.rst M pywikibot/CONTENT.rst M pywikibot/page/_pages.py A pywikibot/page/_toolforge.py M tests/__init__.py A tests/wikiblame_tests.py 6 files changed, 157 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/api_ref/pywikibot.page.rst b/docs/api_ref/pywikibot.page.rst index 18e7eb7..f145976 100644 --- a/docs/api_ref/pywikibot.page.rst +++ b/docs/api_ref/pywikibot.page.rst @@ -24,3 +24,9 @@ .. automodule:: page._revision :synopsis: Object representing page revision + +:mod:`page.\_toolforge` module +--------------------------------- + +.. automodule:: page._toolforge + :synopsis: Object representing interface to toolforge tools \ No newline at end of file diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index 88fb524..096ce26 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -130,6 +130,8 @@ +----------------------------+------------------------------------------------------+ | _revision.py | Object representing page revision | +----------------------------+------------------------------------------------------+ + | _toolforge.py | BasePage interface to toolforge tools | + +----------------------------+------------------------------------------------------+ | _user.py | Object representing a wiki user | +----------------------------+------------------------------------------------------+ | _wikibase.py | Objects representing wikibase structures | diff --git a/pywikibot/page/_pages.py b/pywikibot/page/_pages.py index 1ead289..cc11304 100644 --- a/pywikibot/page/_pages.py +++ b/pywikibot/page/_pages.py @@ -49,6 +49,7 @@ ) from pywikibot.page._decorators import allow_asynchronous from pywikibot.page._links import BaseLink, Link +from pywikibot.page._toolforge import WikiBlameMixin from pywikibot.site import Namespace, NamespaceArgType from pywikibot.tools import ( ComparableMixin, @@ -2149,7 +2150,7 @@ return link -class Page(BasePage): +class Page(BasePage, WikiBlameMixin): """Page: A MediaWiki page.""" diff --git a/pywikibot/page/_toolforge.py b/pywikibot/page/_toolforge.py new file mode 100644 index 0000000..4dccfdb --- /dev/null +++ b/pywikibot/page/_toolforge.py @@ -0,0 +1,110 @@ +"""Object representing interface to toolforge tools. + +.. versionadded:: 7.7 +""" +# +# (C) Pywikibot team, 2022 +# +# Distributed under the terms of the MIT license. +# +import collections +import re + +from typing import Optional + +import pywikibot + +from pywikibot import config + + +class WikiBlameMixin: + + """Page mixin for main authorship. + + .. versionadded:: 7.7 + """ + + #: Supported wikipedia site codes + WIKIBLAME_CODES = 'als', 'bar', 'de', 'en', 'it', 'nds', 'sco' + + def _check_wh_supported(self): + """Check if WikiHistory is supported.""" + if self.site.family.name != 'wikipedia': + raise NotImplementedError( + 'main_authors method is implemented for wikipedia family only') + + if self.site.code not in self.WIKIBLAME_CODES: + raise NotImplementedError( + 'main_authors method is not implemented for wikipedia:{}' + .format(self.site.code)) + + if self.namespace() != pywikibot.site.Namespace.MAIN: + raise NotImplementedError( + 'main_authors method is implemented for main namespace only') + + if not self.exists(): + raise pywikibot.exceptions.NoPageError(self) + + def main_authors(self, *, + onlynew: Optional[bool] = None) -> collections.Counter: + """Retrieve the 5 topmost main authors of an article. + + This method uses WikiHistory to retrieve the text based main + authorship. + + Sample: + + >>> import pywikibot + >>> site = pywikibot.Site('wikipedia:nds') + >>> page = pywikibot.Page(site, 'Python (Programmeerspraak)') + >>> auth = page.main_authors(onlynew=False) + >>> auth + Counter({'RebeccaBreu': 99, 'Slomox': 1}) + + .. note:: Only implemented for main namespace pages. + .. note:: Only wikipedias of :attr:`WIKIBLAME_CODES` are supported. + .. seealso:: + - https://wikihistory.toolforge.org + - https://de.wikipedia.org/wiki/Wikipedia:Technik/Cloud/wikihistory + + :param onlynew: If False, use the cached values. If True, + calculate the Counter data which can take some time; it may + fail with TimeoutError after ``config.max_retries``. If None + it calculates new data like for True but uses data from + cache if new data cannot be calculated in meantime. + :return: Number of edits for each username + :raise NotImplementedError: unsupported site or unsupported namespace + :raise pywikibot.exceptions.NoPageError: The page does not exist + :raise pywikibot.exceptions.TimeoutError: Maximum retries exceeded + """ + baseurl = 'https://wikihistory.toolforge.org' + pattern = (r'><bdi>(?P<author>.+?)</bdi></a>\s' + r'\((?P<percent>\d{1,3})&') + + self._check_wh_supported() + + url = baseurl + '/wiki/getauthors.php?wiki={}wiki&page_id={}'.format( + self.site.code, self.pageid) + if onlynew: + url += '&onlynew=1' + + for current_retries in range(config.max_retries): + r = pywikibot.comms.http.fetch(url) + if r.status_code != 200: + r.raise_for_status() + + if 'Timeout' not in r.text: # window.setTimeout in result + return collections.Counter( + {user: int(cnt) + for user, cnt in re.findall(pattern, r.text)}) + + delay = pywikibot.config.retry_wait * 2 ** current_retries + pywikibot.warning('WikiHistory timeout.\n' + 'Waiting {:.1f} seconds before retrying.' + .format(delay)) + pywikibot.sleep(delay) + if onlynew is None and current_retries >= config.max_retries - 2: + url += '&onlynew=1' + + raise pywikibot.exceptions.TimeoutError( + 'Maximum retries attempted without success.') diff --git a/tests/__init__.py b/tests/__init__.py index 82303c3..ccac997 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -133,6 +133,7 @@ 'user', 'wikibase', 'wikibase_edit', + 'wikiblame', 'wikistats', 'xmlreader' } diff --git a/tests/wikiblame_tests.py b/tests/wikiblame_tests.py new file mode 100644 index 0000000..06f59b2 --- /dev/null +++ b/tests/wikiblame_tests.py @@ -0,0 +1,36 @@ +"""Tests for the WikiHistoryMixin.""" +# +# (C) Pywikibot team, 2022 +# +# Distributed under the terms of the MIT license. +# +import unittest + +from contextlib import suppress + +import pywikibot + +from tests.aspects import TestCase + + +class TestWikiBlameMixin(TestCase): + + """Test WikiBlameMixin using nds wiki.""" + + family = 'wikipedia' + code = 'nds' + + def test_main_authors(self): + """Test main_authors() method.""" + page = pywikibot.Page(self.site, 'Python (Programmeerspraak)') + auth = page.main_authors(onlynew=False) + self.assertLessEqual(len(auth), 5) + self.assertLessEqual(sum(auth.values()), 100) + user, value = auth.most_common(1)[0] + self.assertEqual(user, 'RebeccaBreu') + self.assertGreater(value, 0) + + +if __name__ == '__main__': # pragma: no cover + with suppress(SystemExit): + unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/699536 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: I25f1b23cfaa88f02c1721a7032da4938da1777b7 Gerrit-Change-Number: 699536 Gerrit-PatchSet: 21 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Wurgl <heisewurgl(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: DannyS712 <dannys712.wiki(a)gmail.com> Gerrit-CC: Meno25 <meno25mail(a)gmail.com> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Update ROADMAP.rst and CHANGELOG.rst
by Xqt (Code Review) 02 Sep '22

02 Sep '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/829109 ) Change subject: [doc] Update ROADMAP.rst and CHANGELOG.rst ...................................................................... [doc] Update ROADMAP.rst and CHANGELOG.rst Change-Id: I7b9e50e94711a0cacc97ef384fcad9fe99dba9ea --- M ROADMAP.rst M scripts/CHANGELOG.rst 2 files changed, 26 insertions(+), 6 deletions(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/ROADMAP.rst b/ROADMAP.rst index 2a9c1b8..717f301 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,7 +1,8 @@ Current release 7.7.0 ^^^^^^^^^^^^^^^^^^^^^ -*(no changes yet)* +* Raise KeyError instead of AttributeError if :class:`page.FileInfo` is used as Mapping +* L10N updates Deprecations diff --git a/scripts/CHANGELOG.rst b/scripts/CHANGELOG.rst index 165f1a1..87d02b6 100644 --- a/scripts/CHANGELOG.rst +++ b/scripts/CHANGELOG.rst @@ -1,16 +1,35 @@ Scripts Changelog ================= -7.6.0 +7.7.0 ----- -*current release* - archivebot ~~~~~~~~~~ -* use ``User:MiszaBot/config`` as default template -* raise MalformedConfigError if 'maxarchivesize' is 0 (:phab:`T313886`) +* Add -sort option to sort archives by (latest) timestamp +* Archive unsigned threads using timestamp of the next thread (:phab:`T69663`, :phab:`T182685`) + +create_isbn_edition +~~~~~~~~~~~~~~~~~~~ + +* New script to load ISBN related data into Wikidata (:phab:`T314942`) + +watchlist +~~~~~~~~~ + +* Enable watchlist.refresh_all for API generator access (:phab:`T316359`) + +7.6.0 +----- + +*21 August 2022* + +archivebot +~~~~~~~~~~ + +* Use ``User:MiszaBot/config`` as default template +* Raise MalformedConfigError if 'maxarchivesize' is 0 (:phab:`T313886`) * Preserve thread order in archive even if threads are archived later (:phab:`T312773`, :phab:`T314560`) * Skip the page if it does not exist * Fix for DiscussionPage.size() (:phab:`T313886`) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/829109 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: I7b9e50e94711a0cacc97ef384fcad9fe99dba9ea Gerrit-Change-Number: 829109 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [bugfix] Enable watchlist.refresh_all for API generator access
by jenkins-bot (Code Review) 02 Sep '22

02 Sep '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/826891 ) Change subject: [bugfix] Enable watchlist.refresh_all for API generator access ...................................................................... [bugfix] Enable watchlist.refresh_all for API generator access Bug: T316359 Change-Id: I2b8ab1b3fd5eb75e7a466b569aa5ba5d004b9885 --- M scripts/watchlist.py 1 file changed, 8 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/watchlist.py b/scripts/watchlist.py index 1b94bd4..d5135d9 100755 --- a/scripts/watchlist.py +++ b/scripts/watchlist.py @@ -84,7 +84,14 @@ entry._load_cache() entry.parse_key() entry._rebuild() - if entry.site not in seen and 'watchlistraw' in entry._data: + if entry.site in seen: + continue + + # for generator API usage we have to check the modules + modules = entry._params.get('modules', []) + modules_found = any(mod.endswith('watchlistraw') for mod in modules) + # for list API usage 'watchlistraw' is directly found + if modules_found or 'watchlistraw' in entry._data: refresh(entry.site) seen.add(entry.site) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/826891 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: I2b8ab1b3fd5eb75e7a466b569aa5ba5d004b9885 Gerrit-Change-Number: 826891 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

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

01 Sep '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/828889 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: If780121b6fcce2176bd2f3aa509973dfbcbb64d3 --- M redirect/bs.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/redirect/bs.json b/redirect/bs.json index f36f217..cd5f298 100644 --- a/redirect/bs.json +++ b/redirect/bs.json @@ -10,6 +10,6 @@ "redirect-fix-broken-moved": "Bot: Neispravno preusmjerenje prema premještenoj stranici %(to)s", "redirect-fix-double": "Bot: Popravlja dvostruka preusmjerenja na %(to)s", "redirect-fix-loop": "Robot: Popravlja petlje preusmjerenja na %(to)s", - "redirect-remove-broken": " [[WP:CSD#G8|G8]]: [[Wikipedia:Redirect|Preusmjerenje]] na obrisanu ili nepostojeću stranicu", - "redirect-remove-loop": " [[WP:CSD#G8|G8]]: [[Wikipedia:Redirect|Preusmjerenje]] pravi petlju na samo sebe" + "redirect-remove-broken": "[[WP:CSD#G8|G8]]: [[Wikipedia:Redirect|Preusmjerenje]] na obrisanu ili nepostojeću stranicu", + "redirect-remove-loop": "Bot: Preusmjerenje pravi petlju na samo sebe" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/828889 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: If780121b6fcce2176bd2f3aa509973dfbcbb64d3 Gerrit-Change-Number: 828889 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 29 Aug '22

29 Aug '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/827472 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Ie779d365629d405e877bb0d156e89103f7eda1c2 --- A category_redirect/sms.json A welcome/sms.json 2 files changed, 16 insertions(+), 0 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category_redirect/sms.json b/category_redirect/sms.json new file mode 100644 index 0000000..9101f7a --- /dev/null +++ b/category_redirect/sms.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Yupik" + ] + }, + "category_redirect-log-failed": "**Ij oʹnnstam: %(error)s" +} diff --git a/welcome/sms.json b/welcome/sms.json new file mode 100644 index 0000000..c750852 --- /dev/null +++ b/welcome/sms.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Yupik" + ] + }, + "welcome-welcome": "Tiõrvpueʹttem!" +} -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/827472 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: Ie779d365629d405e877bb0d156e89103f7eda1c2 Gerrit-Change-Number: 827472 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] raise KeyError instead of AttributeError if FileInfo is used a...
by jenkins-bot (Code Review) 28 Aug '22

28 Aug '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/825392 ) Change subject: [IMPR] raise KeyError instead of AttributeError if FileInfo is used as Mapping ...................................................................... [IMPR] raise KeyError instead of AttributeError if FileInfo is used as Mapping For mapping types, if key is missing, KeyError should be raised, see https://docs.python.org/3/reference/datamodel.html?highlight=__getitem__#ob… Change-Id: I84aef0a0b7033318c2f1d4ab850c65cb283a9210 --- M pywikibot/page/_filepage.py 1 file changed, 11 insertions(+), 3 deletions(-) Approvals: Matěj Suchánek: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/_filepage.py b/pywikibot/page/_filepage.py index 1616bb7..bd627e4 100644 --- a/pywikibot/page/_filepage.py +++ b/pywikibot/page/_filepage.py @@ -360,21 +360,29 @@ <pywikibot.site._apisite.APISite.loadimageinfo>` for details. .. note:: timestamp will be casted to :func:`pywikibot.Timestamp`. + + .. versionchanged:: 7.7 + raises KeyError instead of AttributeError if FileInfo is used as + Mapping. """ def __init__(self, file_revision) -> None: - """Initiate the class using the dict from `APISite.loadimageinfo`.""" + """Initiate the class using the dict from ``APISite.loadimageinfo``.""" self.__dict__.update(file_revision) self.timestamp = pywikibot.Timestamp.fromISOformat(self.timestamp) def __getitem__(self, key): """Give access to class values by key.""" - return getattr(self, key) + try: + result = getattr(self, key) + except AttributeError as e: + raise KeyError(str(e).replace('attribute', 'key')) from None + return result def __repr__(self) -> str: """Return a more complete string representation.""" return repr(self.__dict__) def __eq__(self, other) -> bool: - """Test if two File_info objects are equal.""" + """Test if two FileInfo objects are equal.""" return self.__dict__ == other.__dict__ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/825392 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: I84aef0a0b7033318c2f1d4ab850c65cb283a9210 Gerrit-Change-Number: 825392 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-MessageType: merged

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits