Pywikibot-commits July 2014

pywikibot-commits@lists.wikimedia.org

1 participants
116 discussions

[Gerrit] standardize create_categories.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: standardize create_categories.py ...................................................................... standardize create_categories.py - CreateCategoriesBot extends pywikibot.Bot and uses self.userPut() with built-in 'always' option - call pywikibot.showHelp() in case of insufficient arguments Change-Id: I1417cbc85c8c5d0e9105d23a577d1d79b6074802 --- M scripts/create_categories.py 1 file changed, 46 insertions(+), 39 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/create_categories.py b/scripts/create_categories.py index 1baaf1d..d57cfd8 100755 --- a/scripts/create_categories.py +++ b/scripts/create_categories.py @@ -7,7 +7,7 @@ The following command line parameters are supported: --always (not implemented yet) Don't ask, just do the edit. +-always Don't ask, just do the edit. -overwrite (not implemented yet). @@ -28,50 +28,57 @@ # # (C) Multichill, 2011 # (C) xqt, 2011-2014 +# (c) Pywikibot team, 2014 # -# Distributed under the terms of the MIT license. -# +# Distributed under the terms of the MIT license. # import pywikibot -from pywikibot import pagegenerators +from pywikibot import pagegenerators, Bot -def createCategory(page, parent, basename): - title = page.title(withNamespace=False) +class CreateCategoriesBot(Bot): + def __init__(self, generator, parent, basename, **kwargs): + super(CreateCategoriesBot, self).__init__(**kwargs) + self.generator = generator + self.parent = parent + self.basename = basename + self.comment = u'Creating new category' - newpage = pywikibot.Page(pywikibot.Site(u'commons', u'commons'), - u'Category:' + basename + u' ' + title) - newtext = u'' - newtext += u'[[Category:' + parent + u'|' + title + u']]\n' - newtext += u'[[Category:' + title + u']]\n' + def create_category(self, page): + title = page.title(withNamespace=False) - if not newpage.exists(): - #FIXME: Add user prompting and -always option - pywikibot.output(newpage.title()) - pywikibot.showDiff(u'', newtext) + newpage = pywikibot.Category(pywikibot.Site('commons', 'commons'), + '%s %s' % (self.basename, title)) + newtext = (u'[[Category:%(parent)s|%(title)s]]\n' + u'[[Category:%(title)s]]\n' + % {'parent': self.parent, 'title': title}) - comment = u'Creating new category' - try: - newpage.put(newtext, comment) - except pywikibot.EditConflict: - pywikibot.output(u'Skipping %s due to edit conflict' % newpage.title()) - except pywikibot.ServerError: - pywikibot.output(u'Skipping %s due to server error' % newpage.title()) - except pywikibot.PageNotSaved as error: - pywikibot.output(u'Error putting page: %s' % error.args) - else: - #FIXME: Add overwrite option - pywikibot.output(u'%s already exists, skipping' % newpage.title()) + if not newpage.exists(): + pywikibot.output(newpage.title()) + try: + self.userPut(newpage, '', newtext, comment=self.comment) + except pywikibot.EditConflict: + pywikibot.output(u'Skipping %s due to edit conflict' % newpage.title()) + except pywikibot.ServerError: + pywikibot.output(u'Skipping %s due to server error' % newpage.title()) + except pywikibot.PageNotSaved as error: + pywikibot.output(u'Error putting page: %s' % error.args) + else: + # FIXME: Add overwrite option + pywikibot.output(u'%s already exists, skipping' % newpage.title()) + + def run(self): + for page in self.generator: + self.create_category(page) def main(): - ''' + """ Main loop. Get a generator and options. - ''' - generator = None - parent = u'' - basename = u'' - always = False + """ + parent = None + basename = None + options = {} # Process global args and prepare generator args parser local_args = pywikibot.handleArgs() @@ -79,7 +86,7 @@ for arg in local_args: if arg == '-always': - always = True + options['always'] = True elif arg.startswith('-parent:'): parent = arg[len('-parent:'):].strip() elif arg.startswith('-basename'): @@ -88,13 +95,13 @@ genFactory.handleArg(arg) generator = genFactory.getCombinedGenerator() - if generator: - for page in generator: - createCategory(page, parent, basename) + if generator and parent and basename: + bot = CreateCategoriesBot(generator, parent, basename, **options) + bot.run() + pywikibot.output(u'All done') else: pywikibot.output(u'No pages to work on') - - pywikibot.output(u'All done') + pywikibot.showHelp() if __name__ == "__main__": main() -- To view, visit https://gerrit.wikimedia.org/r/148932 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1417cbc85c8c5d0e9105d23a577d1d79b6074802 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

[Gerrit] Fix Site() properly - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix Site() properly ...................................................................... Fix Site() properly If767d6fd5367d0e52ccacf7f2229112ed1c0933d caused a build breakage. I5eb9d2b39768b047290ac8c14e0201114630daed was an interim fix. This changeset reverts the interim fix, as that is a preformance regression, and fixes the initial problem by not looking in a dict for a key unnecessarily. Bug: 68560 Change-Id: I10ad12bc70088bf0924ba0664c3fc01db45785da --- M pywikibot/__init__.py M pywikibot/family.py 2 files changed, 10 insertions(+), 6 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index de518b8..fb452c7 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -463,14 +463,15 @@ # Fallback to config defaults code = code or config.mylang fam = fam or config.family - if hasattr(fam, 'name'): - fam = fam.name interface = interface or config.site_interface - user = user or config.usernames[fam].get(code, None) \ - or config.usernames[fam].get('*', None) - sysop = sysop or config.sysopnames[fam].get(code, None) \ - or config.sysopnames[fam].get('*', None) + # config.usernames is initialised with a dict for each family name + family_name = str(fam) + if family_name in config.usernames: + user = user or config.usernames[family_name].get(code) \ + or config.usernames[family_name].get('*') + sysop = sysop or config.sysopnames[family_name].get(code) \ + or config.sysopnames[family_name].get('*') try: tmp = __import__('pywikibot.site', fromlist=[interface]) diff --git a/pywikibot/family.py b/pywikibot/family.py index c70965d..e4c02a3 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -1021,6 +1021,9 @@ def __hash__(self): return hash(self.name) + def __str__(self): + return self.name + def __repr__(self): return 'Family("%s")' % self.name -- To view, visit https://gerrit.wikimedia.org/r/149287 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I10ad12bc70088bf0924ba0664c3fc01db45785da Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

[Gerrit] Wikibase test fix - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Wikibase test fix ...................................................................... Wikibase test fix The wikibase tests introduced recently are now failing. They were introduced here: Ic0e5ffd7526d71ca8d460f29ed37747a0b255930 That change passed all tests; see here: https://travis-ci.org/wikimedia/pywikibot-core/builds/30325106 That log shows that it introduces a new warning like the following and raised an APIError exception on an attempt to load an item. WARNING: API warning (wbgetentities): Unrecognized value for parameter 'sites': testwikidatawiki That warning appears until travis build 1078, and then appears in 1079 https://travis-ci.org/wikimedia/pywikibot-core/jobs/30562987 https://travis-ci.org/wikimedia/pywikibot-core/jobs/30661149 It appears to be a server config change that has fixed that API warning and APIError exception, and now the exception is NoPage. Change-Id: I3d1655b53bb11236545502634dad667ecef74d53 --- M tests/wikibase_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 72381fb..37c9553 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -314,7 +314,7 @@ def test_item_save(self): self.wdp = pywikibot.ItemPage(wikidatatest, 'Q6') item = self.wdp.data_item() - self.assertRaises(APIError, item.title) + self.assertRaises(pywikibot.NoPage, item.title) self.assertRaises(pywikibot.PageNotSaved, self.wdp.save) self.wdp.previousRevision() self.assertEquals(self.wdp.langlinks(), []) -- To view, visit https://gerrit.wikimedia.org/r/149255 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d1655b53bb11236545502634dad667ecef74d53 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

[Gerrit] fix lookup of family in config.usernames and config.sysopnames - change (pywikibot/core)

by Russell Blau (Code Review)

Russell Blau has submitted this change and it was merged. Change subject: fix lookup of family in config.usernames and config.sysopnames ...................................................................... fix lookup of family in config.usernames and config.sysopnames using fam.name instead of the string representation for Family objects bug: 68440 Change-Id: I5eb9d2b39768b047290ac8c14e0201114630daed --- M pywikibot/__init__.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Russell Blau: Verified; Looks good to me, approved diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 07a40ac..de518b8 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -463,6 +463,8 @@ # Fallback to config defaults code = code or config.mylang fam = fam or config.family + if hasattr(fam, 'name'): + fam = fam.name interface = interface or config.site_interface user = user or config.usernames[fam].get(code, None) \ -- To view, visit https://gerrit.wikimedia.org/r/148994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5eb9d2b39768b047290ac8c14e0201114630daed Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

[Gerrit] Not to use "global" keyword in protect.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Not to use "global" keyword in protect.py ...................................................................... Not to use "global" keyword in protect.py It's against python guidelines and makes error in pyflakes Change-Id: I6440f95d3a7bb13fdf99c5c675025d7dba27db09 --- M scripts/protect.py 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: Ricordisamoa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/protect.py b/scripts/protect.py index cdee924..2dd0417 100644 --- a/scripts/protect.py +++ b/scripts/protect.py @@ -91,7 +91,7 @@ prompt=self.prompt, edit=self.edit, move=self.move) -def choiceProtectionLevel(operation, default): +def choiceProtectionLevel(operation, default, protectionLevels): """ Asks a valid protection level for "operation". Returns the protection level chosen by user. @@ -108,7 +108,6 @@ def main(*args): - global protectionLevels protectionLevels = ['sysop', 'autoconfirmed', 'none'] # This factory is responsible for processing command line arguments @@ -144,15 +143,18 @@ elif arg.startswith('-edit'): edit = arg[len('-edit:'):] if edit not in protectionLevels: - edit = choiceProtectionLevel('edit', defaultProtection) + edit = choiceProtectionLevel( + 'edit', defaultProtection, protectionLevels) elif arg.startswith('-move'): move = arg[len('-move:'):] if move not in protectionLevels: - move = choiceProtectionLevel('move', defaultProtection) + move = choiceProtectionLevel( + 'move', defaultProtection, protectionLevels) elif arg.startswith('-create'): create = arg[len('-create:'):] if create not in protectionLevels: - create = choiceProtectionLevel('create', defaultProtection) + create = choiceProtectionLevel( + 'create', defaultProtection, protectionLevels) else: genFactory.handleArg(arg) found = arg.find(':') + 1 -- To view, visit https://gerrit.wikimedia.org/r/148860 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6440f95d3a7bb13fdf99c5c675025d7dba27db09 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

[Gerrit] update language by size - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: update language by size ...................................................................... update language by size Change-Id: I7b86c7c9a2d8981b2f7b8a9be2ba5b900f37d825 --- M pywikibot/families/wikipedia_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wiktionary_family.py 3 files changed, 21 insertions(+), 21 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index d3ddd96..676fc71 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -11,32 +11,32 @@ self.name = 'wikipedia' self.languages_by_size = [ - 'en', 'nl', 'de', 'sv', 'fr', 'it', 'ru', 'es', 'vi', 'war', 'pl', + 'en', 'nl', 'sv', 'de', 'fr', 'it', 'ru', 'es', 'vi', 'war', 'pl', 'ceb', 'ja', 'pt', 'zh', 'uk', 'ca', 'no', 'fa', 'fi', 'id', 'cs', - 'ar', 'ko', 'ms', 'hu', 'sr', 'ro', 'tr', 'min', 'kk', 'eo', 'sh', + 'ar', 'ko', 'ms', 'hu', 'ro', 'sr', 'tr', 'min', 'kk', 'eo', 'sh', 'sk', 'da', 'eu', 'lt', 'bg', 'he', 'hr', 'sl', 'uz', 'et', 'hy', 'vo', 'nn', 'gl', 'simple', 'hi', 'la', 'el', 'az', 'th', 'oc', 'ka', 'mk', 'be', 'new', 'tt', 'pms', 'tl', 'ta', 'te', 'cy', 'lv', - 'be-x-old', 'ht', 'ur', 'bs', 'sq', 'br', 'jv', 'mg', 'ce', 'lb', - 'mr', 'is', 'ml', 'pnb', 'ba', 'af', 'my', 'zh-yue', 'ga', 'bn', + 'be-x-old', 'ht', 'ur', 'bs', 'sq', 'br', 'ce', 'jv', 'mg', 'lb', + 'mr', 'is', 'ml', 'pnb', 'ba', 'af', 'my', 'zh-yue', 'bn', 'ga', 'lmo', 'yo', 'fy', 'an', 'cv', 'tg', 'ky', 'sw', 'ne', 'io', 'gu', 'bpy', 'sco', 'scn', 'nds', 'ku', 'ast', 'qu', 'su', 'als', 'gd', - 'kn', 'am', 'ia', 'nap', 'ckb', 'bug', 'bat-smg', 'wa', 'map-bms', + 'kn', 'am', 'ia', 'ckb', 'nap', 'bug', 'bat-smg', 'wa', 'map-bms', 'mn', 'arz', 'mzn', 'pa', 'si', 'zh-min-nan', 'yi', 'sah', 'vec', 'fo', 'sa', 'bar', 'nah', 'os', 'roa-tara', 'pam', 'or', 'hsb', 'se', 'li', 'mrj', 'mi', 'ilo', 'co', 'hif', 'bcl', 'gan', 'frr', 'bo', 'rue', 'glk', 'mhr', 'nds-nl', 'fiu-vro', 'ps', 'tk', 'pag', 'vls', 'gv', 'xmf', 'diq', 'km', 'kv', 'zea', 'csb', 'crh', 'hak', - 'vep', 'ay', 'dv', 'so', 'sc', 'zh-classical', 'nrm', 'rm', 'udm', - 'koi', 'kw', 'ug', 'stq', 'lad', 'wuu', 'lij', 'fur', 'eml', 'mt', - 'bh', 'as', 'cbk-zam', 'gn', 'pi', 'gag', 'pcd', 'ksh', 'nov', + 'vep', 'ay', 'sc', 'dv', 'so', 'zh-classical', 'nrm', 'rm', 'udm', + 'koi', 'kw', 'ug', 'stq', 'lad', 'wuu', 'lij', 'eml', 'fur', 'mt', + 'as', 'bh', 'cbk-zam', 'gn', 'pi', 'pcd', 'gag', 'ksh', 'nov', 'szl', 'ang', 'ie', 'nv', 'ace', 'ext', 'frp', 'mwl', 'ln', 'sn', 'dsb', 'lez', 'pfl', 'krc', 'haw', 'pdc', 'xal', 'kab', 'rw', 'myv', 'to', 'arc', 'kl', 'bjn', 'kbd', 'lo', 'ha', 'pap', 'tpi', 'av', - 'lbe', 'mdf', 'jbo', 'wo', 'na', 'bxr', 'ty', 'srn', 'ig', 'nso', - 'kg', 'tet', 'kaa', 'ab', 'ltg', 'zu', 'za', 'cdo', 'tyv', 'chy', - 'rmy', 'cu', 'tn', 'chr', 'tw', 'roa-rup', 'got', 'bi', 'pih', 'sm', - 'rn', 'bm', 'ss', 'iu', 'sd', 'pnt', 'ki', 'om', 'xh', 'ts', 'ee', + 'lbe', 'mdf', 'jbo', 'na', 'wo', 'bxr', 'ty', 'srn', 'ig', 'nso', + 'kaa', 'kg', 'tet', 'ab', 'ltg', 'zu', 'za', 'cdo', 'tyv', 'chy', + 'rmy', 'cu', 'tw', 'tn', 'chr', 'roa-rup', 'om', 'got', 'bi', 'pih', + 'sm', 'rn', 'bm', 'ss', 'iu', 'sd', 'pnt', 'ki', 'xh', 'ts', 'ee', 'ak', 'fj', 'ti', 'ks', 'lg', 'sg', 'ny', 'ff', 've', 'cr', 'st', 'dz', 'tum', 'ik', 'ch', ] diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index aa0e7c0..de1b57a 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -12,8 +12,8 @@ self.languages_by_size = [ 'fr', 'en', 'de', 'ru', 'it', 'pl', 'zh', 'he', 'es', 'sv', 'pt', - 'ca', 'cs', 'fa', 'hu', 'ar', 'ml', 'ko', 'sl', 'te', 'ro', 'fi', - 'vi', 'sr', 'sa', 'el', 'hr', 'no', 'th', 'bn', 'hy', 'is', 'nl', + 'cs', 'ca', 'fa', 'hu', 'ar', 'ml', 'ko', 'sl', 'te', 'ro', 'fi', + 'sr', 'vi', 'sa', 'el', 'hr', 'no', 'th', 'bn', 'hy', 'is', 'nl', 'gu', 'la', 'ja', 'br', 'vec', 'uk', 'eo', 'tr', 'mk', 'yi', 'ta', 'az', 'id', 'be', 'da', 'li', 'et', 'as', 'mr', 'bg', 'bs', 'sah', 'kn', 'gl', 'lt', 'cy', 'sk', 'zh-min-nan', 'fo', diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 88a9e42..585abd5 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -15,16 +15,16 @@ 'sv', 'ko', 'it', 'de', 'ku', 'tr', 'ta', 'hu', 'fi', 'kn', 'io', 'vi', 'pt', 'chr', 'no', 'ml', 'id', 'my', 'ja', 'li', 'ro', 'et', 'te', 'jv', 'ca', 'fa', 'cs', 'ar', 'eu', 'gl', 'lo', 'uk', 'hy', - 'br', 'fj', 'eo', 'bg', 'th', 'hr', 'ps', 'uz', 'oc', 'az', 'is', - 'vo', 'simple', 'cy', 'zh-min-nan', 'da', 'scn', 'sr', 'ast', 'af', + 'br', 'fj', 'th', 'eo', 'bg', 'hr', 'ps', 'uz', 'az', 'oc', 'is', + 'vo', 'cy', 'simple', 'zh-min-nan', 'da', 'scn', 'sr', 'ast', 'af', 'he', 'sw', 'or', 'hi', 'fy', 'tl', 'wa', 'nn', 'ur', 'la', 'sq', - 'pnb', 'ka', 'sm', 'sl', 'nah', 'lv', 'tt', 'lb', 'bs', 'nds', 'sk', - 'tk', 'hsb', 'kk', 'ky', 'mk', 'be', 'km', 'ms', 'ga', 'wo', 'sa', + 'pnb', 'ka', 'sm', 'sl', 'nah', 'lv', 'tt', 'lb', 'bs', 'kk', 'nds', + 'sk', 'tk', 'hsb', 'mk', 'ky', 'be', 'km', 'ms', 'ga', 'wo', 'sa', 'ang', 'co', 'mn', 'tg', 'gn', 'mr', 'ug', 'csb', 'st', 'so', 'ia', 'sd', 'si', 'kl', 'vec', 'an', 'jbo', 'ln', 'fo', 'zu', 'gv', 'kw', - 'gu', 'rw', 'bn', 'om', 'qu', 'ss', 'ie', 'mt', 'pa', 'roa-rup', - 'iu', 'na', 'su', 'am', 'mi', 'za', 'ne', 'gd', 'tpi', 'yi', 'ti', - 'sg', 'tn', 'dv', 'ts', 'ha', 'ks', 'ay', + 'gu', 'rw', 'bn', 'om', 'qu', 'ss', 'ie', 'mt', 'pa', 'na', + 'roa-rup', 'iu', 'su', 'am', 'mi', 'za', 'ne', 'gd', 'tpi', 'yi', + 'ti', 'sg', 'tn', 'dv', 'ts', 'ha', 'ks', 'ay', ] self.langs = dict([(lang, '%s.wiktionary.org' % lang) -- To view, visit https://gerrit.wikimedia.org/r/148669 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b86c7c9a2d8981b2f7b8a9be2ba5b900f37d825 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Maintenance-bot <ladsgroup(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

[Gerrit] update language by size - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: update language by size ...................................................................... update language by size Change-Id: I8631020251973dcb7eb5bea4528a0ea47759771c --- M families/wikipedia_family.py M families/wikisource_family.py M families/wiktionary_family.py 3 files changed, 21 insertions(+), 21 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/families/wikipedia_family.py b/families/wikipedia_family.py index a1c1d5a..82cf117 100644 --- a/families/wikipedia_family.py +++ b/families/wikipedia_family.py @@ -11,32 +11,32 @@ self.name = 'wikipedia' self.languages_by_size = [ - 'en', 'nl', 'de', 'sv', 'fr', 'it', 'ru', 'es', 'vi', 'war', 'pl', + 'en', 'nl', 'sv', 'de', 'fr', 'it', 'ru', 'es', 'vi', 'war', 'pl', 'ceb', 'ja', 'pt', 'zh', 'uk', 'ca', 'no', 'fa', 'fi', 'id', 'cs', - 'ar', 'ko', 'ms', 'hu', 'sr', 'ro', 'tr', 'min', 'kk', 'eo', 'sh', + 'ar', 'ko', 'ms', 'hu', 'ro', 'sr', 'tr', 'min', 'kk', 'eo', 'sh', 'sk', 'da', 'eu', 'lt', 'bg', 'he', 'hr', 'sl', 'uz', 'et', 'hy', 'vo', 'nn', 'gl', 'simple', 'hi', 'la', 'el', 'az', 'th', 'oc', 'ka', 'mk', 'be', 'new', 'tt', 'pms', 'tl', 'ta', 'te', 'cy', 'lv', - 'be-x-old', 'ht', 'ur', 'bs', 'sq', 'br', 'jv', 'mg', 'ce', 'lb', - 'mr', 'is', 'ml', 'pnb', 'ba', 'af', 'my', 'zh-yue', 'ga', 'bn', + 'be-x-old', 'ht', 'ur', 'bs', 'sq', 'br', 'ce', 'jv', 'mg', 'lb', + 'mr', 'is', 'ml', 'pnb', 'ba', 'af', 'my', 'zh-yue', 'bn', 'ga', 'lmo', 'yo', 'fy', 'an', 'cv', 'tg', 'ky', 'sw', 'ne', 'io', 'gu', 'bpy', 'sco', 'scn', 'nds', 'ku', 'ast', 'qu', 'su', 'als', 'gd', - 'kn', 'am', 'ia', 'nap', 'ckb', 'bug', 'bat-smg', 'wa', 'map-bms', + 'kn', 'am', 'ia', 'ckb', 'nap', 'bug', 'bat-smg', 'wa', 'map-bms', 'mn', 'arz', 'mzn', 'pa', 'si', 'zh-min-nan', 'yi', 'sah', 'vec', 'fo', 'sa', 'bar', 'nah', 'os', 'roa-tara', 'pam', 'or', 'hsb', 'se', 'li', 'mrj', 'mi', 'ilo', 'co', 'hif', 'bcl', 'gan', 'frr', 'bo', 'rue', 'glk', 'mhr', 'nds-nl', 'fiu-vro', 'ps', 'tk', 'pag', 'vls', 'gv', 'xmf', 'diq', 'km', 'kv', 'zea', 'csb', 'crh', 'hak', - 'vep', 'ay', 'dv', 'so', 'sc', 'zh-classical', 'nrm', 'rm', 'udm', - 'koi', 'kw', 'ug', 'stq', 'lad', 'wuu', 'lij', 'fur', 'eml', 'mt', - 'bh', 'as', 'cbk-zam', 'gn', 'pi', 'gag', 'pcd', 'ksh', 'nov', + 'vep', 'ay', 'sc', 'dv', 'so', 'zh-classical', 'nrm', 'rm', 'udm', + 'koi', 'kw', 'ug', 'stq', 'lad', 'wuu', 'lij', 'eml', 'fur', 'mt', + 'as', 'bh', 'cbk-zam', 'gn', 'pi', 'pcd', 'gag', 'ksh', 'nov', 'szl', 'ang', 'ie', 'nv', 'ace', 'ext', 'frp', 'mwl', 'ln', 'sn', 'dsb', 'lez', 'pfl', 'krc', 'haw', 'pdc', 'xal', 'kab', 'rw', 'myv', 'to', 'arc', 'kl', 'bjn', 'kbd', 'lo', 'ha', 'pap', 'tpi', 'av', - 'lbe', 'mdf', 'jbo', 'wo', 'na', 'bxr', 'ty', 'srn', 'ig', 'nso', - 'kg', 'tet', 'kaa', 'ab', 'ltg', 'zu', 'za', 'cdo', 'tyv', 'chy', - 'rmy', 'cu', 'tn', 'chr', 'tw', 'roa-rup', 'got', 'bi', 'pih', 'sm', - 'rn', 'bm', 'ss', 'iu', 'sd', 'pnt', 'ki', 'om', 'xh', 'ts', 'ee', + 'lbe', 'mdf', 'jbo', 'na', 'wo', 'bxr', 'ty', 'srn', 'ig', 'nso', + 'kaa', 'kg', 'tet', 'ab', 'ltg', 'zu', 'za', 'cdo', 'tyv', 'chy', + 'rmy', 'cu', 'tw', 'tn', 'chr', 'roa-rup', 'om', 'got', 'bi', 'pih', + 'sm', 'rn', 'bm', 'ss', 'iu', 'sd', 'pnt', 'ki', 'xh', 'ts', 'ee', 'ak', 'fj', 'ti', 'ks', 'lg', 'sg', 'ny', 'ff', 've', 'cr', 'st', 'dz', 'tum', 'ik', 'ch', ] diff --git a/families/wikisource_family.py b/families/wikisource_family.py index 3b9eca5..53c20cc 100644 --- a/families/wikisource_family.py +++ b/families/wikisource_family.py @@ -12,8 +12,8 @@ self.languages_by_size = [ 'fr', 'en', 'de', 'ru', 'it', 'pl', 'zh', 'he', 'es', 'sv', 'pt', - 'ca', 'cs', 'fa', 'hu', 'ar', 'ml', 'ko', 'sl', 'te', 'ro', 'fi', - 'vi', 'sr', 'sa', 'el', 'hr', 'no', 'th', 'bn', 'hy', 'is', 'nl', + 'cs', 'ca', 'fa', 'hu', 'ar', 'ml', 'ko', 'sl', 'te', 'ro', 'fi', + 'sr', 'vi', 'sa', 'el', 'hr', 'no', 'th', 'bn', 'hy', 'is', 'nl', 'gu', 'la', 'ja', 'br', 'vec', 'uk', 'eo', 'tr', 'mk', 'yi', 'ta', 'az', 'id', 'be', 'da', 'li', 'et', 'as', 'mr', 'bg', 'bs', 'sah', 'kn', 'gl', 'lt', 'cy', 'sk', 'zh-min-nan', 'fo', diff --git a/families/wiktionary_family.py b/families/wiktionary_family.py index 4d18499..419b648 100644 --- a/families/wiktionary_family.py +++ b/families/wiktionary_family.py @@ -15,16 +15,16 @@ 'sv', 'ko', 'it', 'de', 'ku', 'tr', 'ta', 'hu', 'fi', 'kn', 'io', 'vi', 'pt', 'chr', 'no', 'ml', 'id', 'my', 'ja', 'li', 'ro', 'et', 'te', 'jv', 'ca', 'fa', 'cs', 'ar', 'eu', 'gl', 'lo', 'uk', 'hy', - 'br', 'fj', 'eo', 'bg', 'th', 'hr', 'ps', 'uz', 'oc', 'az', 'is', - 'vo', 'simple', 'cy', 'zh-min-nan', 'da', 'scn', 'sr', 'ast', 'af', + 'br', 'fj', 'th', 'eo', 'bg', 'hr', 'ps', 'uz', 'az', 'oc', 'is', + 'vo', 'cy', 'simple', 'zh-min-nan', 'da', 'scn', 'sr', 'ast', 'af', 'he', 'sw', 'or', 'hi', 'fy', 'tl', 'wa', 'nn', 'ur', 'la', 'sq', - 'pnb', 'ka', 'sm', 'sl', 'nah', 'lv', 'tt', 'lb', 'bs', 'nds', 'sk', - 'tk', 'hsb', 'kk', 'ky', 'mk', 'be', 'km', 'ms', 'ga', 'wo', 'sa', + 'pnb', 'ka', 'sm', 'sl', 'nah', 'lv', 'tt', 'lb', 'bs', 'kk', 'nds', + 'sk', 'tk', 'hsb', 'mk', 'ky', 'be', 'km', 'ms', 'ga', 'wo', 'sa', 'ang', 'co', 'mn', 'tg', 'gn', 'mr', 'ug', 'csb', 'st', 'so', 'ia', 'sd', 'si', 'kl', 'vec', 'an', 'jbo', 'ln', 'fo', 'zu', 'gv', 'kw', - 'gu', 'rw', 'bn', 'om', 'qu', 'ss', 'ie', 'mt', 'pa', 'roa-rup', - 'iu', 'na', 'su', 'am', 'mi', 'za', 'ne', 'gd', 'tpi', 'yi', 'ti', - 'sg', 'tn', 'dv', 'ts', 'ha', 'ks', 'ay', + 'gu', 'rw', 'bn', 'om', 'qu', 'ss', 'ie', 'mt', 'pa', 'na', + 'roa-rup', 'iu', 'su', 'am', 'mi', 'za', 'ne', 'gd', 'tpi', 'yi', + 'ti', 'sg', 'tn', 'dv', 'ts', 'ha', 'ks', 'ay', ] self.langs = dict([(lang, '%s.wiktionary.org' % lang) -- To view, visit https://gerrit.wikimedia.org/r/148668 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8631020251973dcb7eb5bea4528a0ea47759771c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Maintenance-bot <ladsgroup(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

[Gerrit] Simplify Site() fallback to config settings - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Simplify Site() fallback to config settings ...................................................................... Simplify Site() fallback to config settings Also lightly document the sysop and interface parameters. Change-Id: If767d6fd5367d0e52ccacf7f2229112ed1c0933d --- M pywikibot/__init__.py 1 file changed, 22 insertions(+), 32 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 83093f5..d1bdf76 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -431,46 +431,36 @@ def Site(code=None, fam=None, user=None, sysop=None, interface=None): - """Return the specified Site object. + """A factory method to obtain a Site object. - Returns a cached object if possible, otherwise instantiates a new one. + Site objects are cached and reused by this method. - @param code: language code + By default rely on config settings. These defaults may all be overriden + using the method parameters. + + @param code: language code (override config.mylang) @type code: string - @param fam: family name or object + @param fam: family name or object (override config.family) @type fam: string or Family - @param user: bot user name to use on this site + @param user: bot user name to use on this site (override config.usernames) @type user: unicode - + @param sysop: sysop user to use on this site (override config.sysopnames) + @type sysop: unicode + @param interface: site interface (override config.site_interface) + @type interface: string """ _logger = "wiki" - if code is None: - code = config.mylang - if fam is None: - fam = config.family - if user is None: - try: - user = config.usernames[fam][code] - except KeyError: - user = None - if user is None: - try: - user = config.usernames[fam]['*'] - except KeyError: - user = None - if sysop is None: - try: - sysop = config.sysopnames[fam][code] - except KeyError: - sysop = None - if sysop is None: - try: - sysop = config.sysopnames[fam]['*'] - except KeyError: - sysop = None - if interface is None: - interface = config.site_interface + # Fallback to config defaults + code = code or config.mylang + fam = fam or config.family + interface = interface or config.site_interface + + user = user or config.usernames[fam].get(code, None) \ + or config.usernames[fam].get('*', None) + sysop = sysop or config.sysopnames[fam].get(code, None) \ + or config.sysopnames[fam].get('*', None) + try: tmp = __import__('pywikibot.site', fromlist=[interface]) __Site = getattr(tmp, interface) -- To view, visit https://gerrit.wikimedia.org/r/145691 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If767d6fd5367d0e52ccacf7f2229112ed1c0933d Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Hashar <hashar(a)free.fr> Gerrit-Reviewer: Hashar <hashar(a)free.fr> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

[Gerrit] fixup Ief9d5f95b37f949d667a0ffd43d79b69d12bd8d7 - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: fixup Ief9d5f95b37f949d667a0ffd43d79b69d12bd8d7 ...................................................................... fixup Ief9d5f95b37f949d667a0ffd43d79b69d12bd8d7 replace `old` with `self.old` Change-Id: I82d93939bcc4a11a65279884a8b5ae8a86c8bdad --- M tests/textlib_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 32771f4..72958c7 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -147,7 +147,7 @@ def test_replace_category_links(self): cats = textlib.getCategoryLinks(self.old, site=self.site) new = textlib.replaceCategoryLinks(self.old, cats, site=self.site) - self.assertEqual(old, new) + self.assertEqual(self.old, new) if __name__ == '__main__': -- To view, visit https://gerrit.wikimedia.org/r/148324 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82d93939bcc4a11a65279884a8b5ae8a86c8bdad Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

[Gerrit] fix and reenable cosmetic_changes' standardizePageFooter() - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: fix and reenable cosmetic_changes' standardizePageFooter() ...................................................................... fix and reenable cosmetic_changes' standardizePageFooter() using category.aslink() instead of .title(asLink=True) in textlib.categoryFormat(), thus preserving the sortKey. this implicitly reverts I88b01681f59aab91d5f70e788eae3349b87455a8 bug: 66921 Change-Id: Ib0701600a300b2435ac8f2c3b8a55c89faf2c2fe --- M pywikibot/textlib.py M scripts/cosmetic_changes.py 2 files changed, 2 insertions(+), 3 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified Objections: Xqt: There's a problem with this change, please improve diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 64dbf3c..bbac6a3 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -846,8 +846,7 @@ else: catLinks = ['[[Category:%s]]' % category for category in categories] else: - catLinks = [category.title(asLink=True, allowInterwiki=False) - for category in categories] + catLinks = [category.aslink() for category in categories] if insite.category_on_one_line(): sep = ' ' diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py index f9f2479..8fc65cf 100755 --- a/scripts/cosmetic_changes.py +++ b/scripts/cosmetic_changes.py @@ -170,7 +170,7 @@ if self.site.sitename() == u'commons:commons' and self.namespace == 6: text = self.commonsfiledesc(text) text = self.fixSelfInterwiki(text) -## bug 66921 text = self.standardizePageFooter(text) + text = self.standardizePageFooter(text) text = self.fixSyntaxSave(text) text = self.cleanUpLinks(text) text = self.cleanUpSectionHeaders(text) -- To view, visit https://gerrit.wikimedia.org/r/147845 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib0701600a300b2435ac8f2c3b8a55c89faf2c2fe Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

← Newer
1
2
3
4
5
6
7
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits July 2014