Pywikibot-commits August 2013

pywikibot-commits@lists.wikimedia.org

1 participants
172 discussions

[Gerrit] pep8-ified family files - change (pywikibot/core)

by Xqt (Code Review)

Xqt has submitted this change and it was merged. Change subject: pep8-ified family files ...................................................................... pep8-ified family files Change-Id: Ie30b3ddf73fc7cfc841789f6bac3cfc0af419d8d --- M pywikibot/families/anarchopedia_family.py M pywikibot/families/battlestarwiki_family.py M pywikibot/families/commons_family.py M pywikibot/families/fon_family.py M pywikibot/families/gentoo_family.py M pywikibot/families/i18n_family.py M pywikibot/families/incubator_family.py M pywikibot/families/lockwiki_family.py M pywikibot/families/lyricwiki_family.py M pywikibot/families/mediawiki_family.py M pywikibot/families/meta_family.py M pywikibot/families/oldwikivoyage_family.py M pywikibot/families/omegawiki_family.py M pywikibot/families/osm_family.py M pywikibot/families/southernapproach_family.py M pywikibot/families/species_family.py M pywikibot/families/strategy_family.py M pywikibot/families/test_family.py M pywikibot/families/vikidia_family.py M pywikibot/families/wikia_family.py M pywikibot/families/wikibooks_family.py M pywikibot/families/wikimedia_family.py M pywikibot/families/wikinews_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wikitech_family.py M pywikibot/families/wikiversity_family.py M pywikibot/families/wiktionary_family.py M pywikibot/families/wowwiki_family.py 30 files changed, 104 insertions(+), 103 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified Objections: Merlijn van Deen: There's a problem with this change, please improve diff --git a/pywikibot/families/anarchopedia_family.py b/pywikibot/families/anarchopedia_family.py index 664a221..037d015 100644 --- a/pywikibot/families/anarchopedia_family.py +++ b/pywikibot/families/anarchopedia_family.py @@ -3,8 +3,8 @@ from pywikibot import family -# The Anarchopedia family +# The Anarchopedia family class Family(family.Family): def __init__(self): family.Family.__init__(self) diff --git a/pywikibot/families/battlestarwiki_family.py b/pywikibot/families/battlestarwiki_family.py index cc41027..c77dc47 100644 --- a/pywikibot/families/battlestarwiki_family.py +++ b/pywikibot/families/battlestarwiki_family.py @@ -3,9 +3,9 @@ from pywikibot import family + # The Battlestar Wiki family, a set of Battlestar wikis. # http://battlestarwiki.org/ - class Family(family.Family): def __init__(self): family.Family.__init__(self) @@ -23,7 +23,7 @@ alphabetic = ['de', 'en', 'es', 'fr', 'tr', 'zh'] - def hostname(self,code): + def hostname(self, code): return '%s.battlestarwiki.org' % code def version(self, code): diff --git a/pywikibot/families/commons_family.py b/pywikibot/families/commons_family.py index e1ad8fa..7daedac 100644 --- a/pywikibot/families/commons_family.py +++ b/pywikibot/families/commons_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The Wikimedia Commons family +# The Wikimedia Commons family class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() diff --git a/pywikibot/families/fon_family.py b/pywikibot/families/fon_family.py index d4a9f78..5d776f2 100644 --- a/pywikibot/families/fon_family.py +++ b/pywikibot/families/fon_family.py @@ -3,6 +3,7 @@ from pywikibot import family + # The official Beta Wiki. class Family(family.Family): diff --git a/pywikibot/families/gentoo_family.py b/pywikibot/families/gentoo_family.py index c0907d4..1d8e63b 100644 --- a/pywikibot/families/gentoo_family.py +++ b/pywikibot/families/gentoo_family.py @@ -4,11 +4,11 @@ __version__ = '$Id$' + # An inofficial Gentoo wiki project. # Ask for permission at http://gentoo-wiki.com/Help:Bots before running a bot. # Be very careful, and set a long throttle: "until we see it is good one edit # ever minute and one page fetch every 30 seconds, maybe a *bit* faster later". - class Family(family.Family): def __init__(self): diff --git a/pywikibot/families/i18n_family.py b/pywikibot/families/i18n_family.py index ea0c30d..fc7a1af 100644 --- a/pywikibot/families/i18n_family.py +++ b/pywikibot/families/i18n_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The Wikimedia i18n family +# The Wikimedia i18n family class Family(family.Family): def __init__(self): diff --git a/pywikibot/families/incubator_family.py b/pywikibot/families/incubator_family.py index 1ac3876..2f38409 100644 --- a/pywikibot/families/incubator_family.py +++ b/pywikibot/families/incubator_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The Wikimedia Incubator family +# The Wikimedia Incubator family class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() diff --git a/pywikibot/families/lockwiki_family.py b/pywikibot/families/lockwiki_family.py index 4a91873..97d06e7 100644 --- a/pywikibot/families/lockwiki_family.py +++ b/pywikibot/families/lockwiki_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The locksmithwiki family +# The locksmithwiki family class Family(family.Family): def __init__(self): family.Family.__init__(self) diff --git a/pywikibot/families/lyricwiki_family.py b/pywikibot/families/lyricwiki_family.py index edbe647..5b25802 100644 --- a/pywikibot/families/lyricwiki_family.py +++ b/pywikibot/families/lyricwiki_family.py @@ -3,18 +3,18 @@ from pywikibot import family + # The LyricWiki family # user_config.py: # usernames['lyricwiki']['en'] = 'user' - class Family(family.Family): def __init__(self): family.Family.__init__(self) self.name = 'lyricwiki' self.langs = { 'en': 'lyrics.wikia.com', - } + } def version(self, code): return "1.16.2" diff --git a/pywikibot/families/mediawiki_family.py b/pywikibot/families/mediawiki_family.py index 99de8ef..7f3891c 100644 --- a/pywikibot/families/mediawiki_family.py +++ b/pywikibot/families/mediawiki_family.py @@ -4,9 +4,9 @@ from pywikibot import family + # The MediaWiki family # user-config.py: usernames['mediawiki']['mediawiki'] = 'User name' - class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() diff --git a/pywikibot/families/meta_family.py b/pywikibot/families/meta_family.py index 0812b13..7f3abc3 100644 --- a/pywikibot/families/meta_family.py +++ b/pywikibot/families/meta_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The meta wikimedia family +# The meta wikimedia family class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -14,7 +14,7 @@ 'meta': 'meta.wikimedia.org', } self.interwiki_forward = 'wikipedia' - self.cross_allowed = ['meta',] + self.cross_allowed = ['meta', ] def ssl_pathprefix(self, code): return "/wikipedia/meta" diff --git a/pywikibot/families/oldwikivoyage_family.py b/pywikibot/families/oldwikivoyage_family.py index df4cc11..9872d01 100644 --- a/pywikibot/families/oldwikivoyage_family.py +++ b/pywikibot/families/oldwikivoyage_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -#Family file for the original wikivoyage +#Family file for the original wikivoyage class Family(family.Family): def __init__(self): family.Family.__init__(self) diff --git a/pywikibot/families/omegawiki_family.py b/pywikibot/families/omegawiki_family.py index 024580a..4722987 100644 --- a/pywikibot/families/omegawiki_family.py +++ b/pywikibot/families/omegawiki_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# Omegawiki, the Ultimate online dictionary +# Omegawiki, the Ultimate online dictionary class Family(family.Family): def __init__(self): @@ -18,7 +18,7 @@ self.nocapitalize = self.langs.keys() - def hostname(self,code): + def hostname(self, code): return 'www.omegawiki.org' def version(self, code): diff --git a/pywikibot/families/osm_family.py b/pywikibot/families/osm_family.py index e1ec976..3a7ccbe 100644 --- a/pywikibot/families/osm_family.py +++ b/pywikibot/families/osm_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The project wiki of OpenStreetMap (OSM). +# The project wiki of OpenStreetMap (OSM). class Family(family.Family): def __init__(self): diff --git a/pywikibot/families/southernapproach_family.py b/pywikibot/families/southernapproach_family.py index 9dd36d5..33b218d 100644 --- a/pywikibot/families/southernapproach_family.py +++ b/pywikibot/families/southernapproach_family.py @@ -3,14 +3,14 @@ from pywikibot import family -# ZRHwiki, formerly known as SouthernApproachWiki, a wiki about Zürich Airport. +# ZRHwiki, formerly known as SouthernApproachWiki, a wiki about Zürich Airport. class Family(family.Family): def __init__(self): family.Family.__init__(self) self.name = 'southernapproach' self.langs = { - 'de':'www.zrhwiki.ch', + 'de': 'www.zrhwiki.ch', } def version(self, code): diff --git a/pywikibot/families/species_family.py b/pywikibot/families/species_family.py index 2fa41c8..1ff4c0a 100644 --- a/pywikibot/families/species_family.py +++ b/pywikibot/families/species_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The wikispecies family +# The wikispecies family class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() diff --git a/pywikibot/families/strategy_family.py b/pywikibot/families/strategy_family.py index 10e2005..276cc01 100644 --- a/pywikibot/families/strategy_family.py +++ b/pywikibot/families/strategy_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The Wikimedia Strategy family +# The Wikimedia Strategy family class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() diff --git a/pywikibot/families/test_family.py b/pywikibot/families/test_family.py index 6e71268..fb93ecc 100644 --- a/pywikibot/families/test_family.py +++ b/pywikibot/families/test_family.py @@ -4,6 +4,7 @@ from pywikibot import family + # The test wikipedia family class Family(family.WikimediaFamily): def __init__(self): diff --git a/pywikibot/families/vikidia_family.py b/pywikibot/families/vikidia_family.py index 019a212..9a8129d 100644 --- a/pywikibot/families/vikidia_family.py +++ b/pywikibot/families/vikidia_family.py @@ -3,6 +3,7 @@ from pywikibot import family + class Family(family.Family): def __init__(self): family.Family.__init__(self) diff --git a/pywikibot/families/wikia_family.py b/pywikibot/families/wikia_family.py index 75759eb..4830282 100644 --- a/pywikibot/families/wikia_family.py +++ b/pywikibot/families/wikia_family.py @@ -4,9 +4,9 @@ from pywikibot import family + # The Wikia Search family # user-config.py: usernames['wikia']['wikia'] = 'User name' - class Family(family.Family): def __init__(self): family.Family.__init__(self) diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 07e5cef..14435b9 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wikibooks +# The Wikimedia family that is known as Wikibooks class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -46,53 +46,53 @@ } self.obsolete = { - 'aa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Af… - 'ak': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ak… - 'als': None, # http://als.wikipedia.org/wiki/Wikipedia:Stammtisch/Archiv_2008-1#Afterwards… - 'as': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_As… + 'aa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Af… + 'ak': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ak… + 'als': None, # http://als.wikipedia.org/wiki/Wikipedia:Stammtisch/Archiv_2008-1#Afterwards… + 'as': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_As… 'ast': None, - 'ay': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ay… - 'ba': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… - 'bi': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Bi… - 'bm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… - 'bo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ti… - 'ch': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ch… - 'co': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28644 + 'ay': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ay… + 'ba': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… + 'bi': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Bi… + 'bm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… + 'bo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ti… + 'ch': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ch… + 'co': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28644 'dk': 'da', - 'ga': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ga… - 'got': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Go… - 'gn': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Gu… - 'gu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Gu… + 'ga': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ga… + 'got': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Go… + 'gn': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Gu… + 'gu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Gu… 'jp': 'ja', - 'kn': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 - 'ks': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… - 'lb': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_L%… - 'ln': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Li… - 'lv': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_La… - 'mi': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ma… - 'minnan':'zh-min-nan', + 'kn': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 + 'ks': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… + 'lb': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_L%… + 'ln': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Li… + 'lv': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_La… + 'mi': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ma… + 'minnan': 'zh-min-nan', 'mn': None, 'my': None, - 'na': None, #http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Nauruan_Wikibooks - 'nah': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Na… + 'na': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Na… + 'nah': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Na… 'nb': 'no', - 'nds': None, #http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Plattd%C3%BC%C3%BCtsch_Wikibooks - 'ps': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Pa… - 'qu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Qu… - 'rm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ru… - 'se': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Sa… - 'simple' : 'en', # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 - 'su': None, #http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Basa_Sunda_Wikibooks_(2) - 'sw': None, #https://bugzilla.wikimedia.org/show_bug.cgi?id=25170 + 'nds': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Pl… + 'ps': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Pa… + 'qu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Qu… + 'rm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ru… + 'se': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Sa… + 'simple': 'en', # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 + 'su': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… + 'sw': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=25170 'tk': None, 'tokipona': None, - 'ug': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Uy… - 'vo': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=37413 - 'wa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Wa… - 'xh': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Xh… - 'yo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Yo… - 'za': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 + 'ug': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Uy… + 'vo': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=37413 + 'wa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Wa… + 'xh': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Xh… + 'yo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Yo… + 'za': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 'zh-tw': 'zh', 'zh-cn': 'zh', - 'zu': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=25425 + 'zu': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=25425 } diff --git a/pywikibot/families/wikimedia_family.py b/pywikibot/families/wikimedia_family.py index 35d7378..b1fb2c1 100644 --- a/pywikibot/families/wikimedia_family.py +++ b/pywikibot/families/wikimedia_family.py @@ -2,10 +2,10 @@ __version__ = '$Id$' -# The wikis of Chapters of the Wikimedia Foundation living at a xy.wikimedia.org url - from pywikibot import family + +# The wikis of Chapters of the Wikimedia Foundation living at a xy.wikimedia.org url class Family(family.Family): def __init__(self): family.Family.__init__(self) diff --git a/pywikibot/families/wikinews_family.py b/pywikibot/families/wikinews_family.py index dfa3f59..d24c408 100644 --- a/pywikibot/families/wikinews_family.py +++ b/pywikibot/families/wikinews_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wikinews +# The Wikimedia family that is known as Wikinews class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -18,7 +18,6 @@ self.langs = dict([(lang, '%s.wikinews.org' % lang) for lang in self.languages_by_size]) - # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… self.cross_allowed = ['ca', 'cs', 'en', 'fa', 'ko', ] @@ -39,12 +38,12 @@ } self.obsolete = { - 'hu': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28342 + 'hu': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28342 'jp': 'ja', 'nb': 'no', - 'nl': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 + 'nl': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 'sd': None, - 'th': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28341 + 'th': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28341 'zh-tw': 'zh', 'zh-cn': 'zh' } diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 8dfcd23..10ac8a4 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wikipedia, the Free Encyclopedia +# The Wikimedia family that is known as Wikipedia, the Free Encyclopedia class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -45,7 +45,6 @@ self.langs = dict([(lang, '%s.wikipedia.org' % lang) for lang in langs]) - self.category_redirect_templates = { '_default': (), diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 8fe6b3f..9ecf55b 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wikiquote +# The Wikimedia family that is known as Wikiquote class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -22,7 +22,6 @@ self.langs = dict([(lang, '%s.wikiquote.org' % lang) for lang in self.languages_by_size]) - # attop is a list of languages that prefer to have the interwiki # links at the top of the page. @@ -66,32 +65,32 @@ } self.obsolete = { - 'als': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Al… - 'ang': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=29150 - 'ast': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28964 - 'bm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… + 'als': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Al… + 'ang': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=29150 + 'ast': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28964 + 'bm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… 'co': None, - 'cr': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ne… + 'cr': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ne… 'dk': 'da', - 'ga': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ga… + 'ga': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ga… 'jp': 'ja', - 'kk': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 - 'kr': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… - 'ks': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… - 'kw': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ke… + 'kk': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 + 'kr': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… + 'ks': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… + 'kw': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ke… 'lb': None, - 'minnan':'zh-min-nan', - 'na': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Na… + 'minnan': 'zh-min-nan', + 'na': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Na… 'nb': 'no', - 'nds': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Lo… - 'qu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Qu… - 'simple': 'en', #http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Simple_English_(3)_Wikiquote - 'tk': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Tu… + 'nds': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Lo… + 'qu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Qu… + 'simple': 'en', # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Si… + 'tk': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Tu… 'tokipona': None, - 'tt': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ta… - 'ug': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Oy… - 'vo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Vo… - 'za':None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Zh… + 'tt': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ta… + 'ug': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Oy… + 'vo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Vo… + 'za': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Zh… 'zh-tw': 'zh', 'zh-cn': 'zh' } diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 319541b..c33f6a2 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wikisource +# The Wikimedia family that is known as Wikisource class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -45,11 +45,11 @@ } self.obsolete = { - 'ang': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ol… + 'ang': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ol… 'dk': 'da', - 'ht': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ha… + 'ht': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ha… 'jp': 'ja', - 'minnan':'zh-min-nan', + 'minnan': 'zh-min-nan', 'nb': 'no', 'tokipona': None, 'zh-tw': 'zh', @@ -79,7 +79,7 @@ 'tr': [100], 'vi': [102], 'zh': [102], - } + } self.crossnamespace[0] = { '_default': self.authornamespaces, diff --git a/pywikibot/families/wikitech_family.py b/pywikibot/families/wikitech_family.py index 761e6cd..1c7f279 100644 --- a/pywikibot/families/wikitech_family.py +++ b/pywikibot/families/wikitech_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The Wikitech family +# The Wikitech family class Family(family.Family): def __init__(self): diff --git a/pywikibot/families/wikiversity_family.py b/pywikibot/families/wikiversity_family.py index 1fda56d..eb3c0dc 100644 --- a/pywikibot/families/wikiversity_family.py +++ b/pywikibot/families/wikiversity_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wikiversity +# The Wikimedia family that is known as Wikiversity class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -19,4 +19,4 @@ for lang in self.languages_by_size]) # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… - self.cross_allowed = ['ja',] + self.cross_allowed = ['ja', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 228437b..396ca18 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wiktionary +# The Wikimedia family that is known as Wiktionary class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -71,7 +71,7 @@ 'ps', 'dv', 'ks', 'ne', 'pi', 'bh', 'mr', 'sa', 'hi', 'as', 'bn', 'pa', 'pnb', 'gu', 'or', 'ta', 'te', 'kn', 'ml', 'si', 'th', 'lo', 'dz', 'ka', 'ti', 'am', 'chr', 'iu', 'km', 'zh', 'ja', 'ko', - ] + ] self.interwiki_putfirst = { 'da': self.alphabetic, diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py index 1ac120f..0ff4809 100644 --- a/pywikibot/families/wowwiki_family.py +++ b/pywikibot/families/wowwiki_family.py @@ -53,6 +53,7 @@ # Wikia's default CategorySelect extension always puts categories last self.categories_last = ['cs', 'da', 'de', 'el', 'en', 'es', 'fa', 'fi', 'fr', 'he', 'hr', 'hu', 'is', 'it', 'ja', 'ko', 'lt', 'lv', 'nl', 'no', 'pl', 'pt', 'pt-br', 'ro', 'ru', 'sk', 'sr', 'sv', 'tr', 'zh-tw', 'zh'] + def scriptpath(self, code): return '' -- To view, visit https://gerrit.wikimedia.org/r/80800 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie30b3ddf73fc7cfc841789f6bac3cfc0af419d8d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> 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

10 years, 7 months

[Gerrit] Fix bug 1659: set correct language as source - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix bug 1659: set correct language as source ...................................................................... Fix bug 1659: set correct language as source Because the variable 'lang' was used for two different meanings, the saved language was whatever was read last from the json configuration. Change-Id: I2abd7311f6d534f71ffdbec44c80138966d70e1c --- M scripts/harvest_template.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index c78b97a..05a9c52 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -55,8 +55,8 @@ page = pywikibot.Page(self.repo, 'Wikidata:List of wikis/python') source_values = json.loads(page.get()) source_values = source_values['wikipedia'] - for lang in source_values: - source_values[lang] = pywikibot.ItemPage(self.repo, source_values[lang]) + for source_lang in source_values: + source_values[source_lang] = pywikibot.ItemPage(self.repo, source_values[source_lang]) if lang in source_values: self.source = pywikibot.Claim(self.repo, 'p143') -- To view, visit https://gerrit.wikimedia.org/r/80976 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2abd7311f6d534f71ffdbec44c80138966d70e1c Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Matmarex <matma.rex(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 7 months

[Gerrit] Start with a fresh list in html2unicode every time - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Start with a fresh list in html2unicode every time ...................................................................... Start with a fresh list in html2unicode every time def x(..., something=[]): something.extend([1,2,3]) means something becomes [1,2,3] on the first call, but [1,2,3,1,2,3] on the *second* call. This meant html2unicode got a longer list of replacements every time it is called. This commit changes it to the standard def x(..., something=None): if something is None: something = [] which means it's always an empty list, instead of what's left from the last call. Change-Id: Ifb5221135498633e6e38967fcf4b5a02b14fb4d5 Compat-Change-Id: Ie490b575a8a0cc4b5d45bbb97c0606e0fd64d4f9 --- M pywikibot/page.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 81daf92..db22a9a 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -3265,8 +3265,10 @@ # Utility functions for parsing page titles -def html2unicode(text, ignore = []): +def html2unicode(text, ignore = None): """Return text, replacing HTML entities by equivalent unicode characters.""" + if ignore is None: + ignore = [] # This regular expression will match any decimal and hexadecimal entity and # also entities that might be named entities. entityR = re.compile( -- To view, visit https://gerrit.wikimedia.org/r/79813 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifb5221135498633e6e38967fcf4b5a02b14fb4d5 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 7 months

[Gerrit] pwb.py: allow different config directory using -dir: - change (pywikibot/core)

by Xqt (Code Review)

Xqt has submitted this change and it was merged. Change subject: pwb.py: allow different config directory using -dir: ...................................................................... pwb.py: allow different config directory using -dir: Change-Id: I7643c189d06680c593d183c49d7324f8ab9f8e74 --- M pwb.py 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index ae732ed..6d58bbf 100644 --- a/pwb.py +++ b/pwb.py @@ -32,6 +32,13 @@ if "PYWIKIBOT2_DIR" not in os.environ: os.environ["PYWIKIBOT2_DIR"] = os.path.split(__file__)[0] +for i,x in enumerate(sys.argv): + if x.startswith("-dir:"): + os.environ["PYWIKIBOT2_DIR"] = x[5:] + sys.argv.pop(i) + break + + if not os.path.exists(os.path.join(os.environ["PYWIKIBOT2_DIR"], "user-config.py")): execfile('generate_user_files.py') -- To view, visit https://gerrit.wikimedia.org/r/79578 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7643c189d06680c593d183c49d7324f8ab9f8e74 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 7 months

[Gerrit] bot.critical: It's a critical, not a debug record - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: bot.critical: It's a critical, not a debug record ...................................................................... bot.critical: It's a critical, not a debug record Change-Id: Iefff68e78e3b3341157110c0080520451ab1d7bf --- M pywikibot/bot.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index fa7ee43..220f77a 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -404,7 +404,7 @@ def critical(text, decoder=None, newline=True, **kwargs): - """Output a debug record to the log file.""" + """Output a critical record to the log file.""" logoutput(text, decoder, newline, CRITICAL, **kwargs) -- To view, visit https://gerrit.wikimedia.org/r/80966 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefff68e78e3b3341157110c0080520451ab1d7bf Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mineo <themineo(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: jenkins-bot

10 years, 7 months

[Gerrit] bug fix for 1655 - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: bug fix for 1655 ...................................................................... bug fix for 1655 * solve sub-optimal messages to user (indicate needed admin rights) * add missing ubuntu package names * message improved in case if NO was chosen Change-Id: Ibe5e42e6c7cf5450ac527dd0fec681d93ced649e --- M externals/__init__.py 1 file changed, 16 insertions(+), 8 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/externals/__init__.py b/externals/__init__.py index 3bb6677..c94047c 100644 --- a/externals/__init__.py +++ b/externals/__init__.py @@ -55,12 +55,12 @@ # spelling http://svn.wikimedia.org/svnroot/pywikipedia/trunk/spelling/ # $ git submodule add https://gerrit.wikimedia.org/r/p/pywikibot/spelling.git externals/spelling 'BeautifulSoup.py': ({'linux-fedora': ['python-BeautifulSoup'], - 'linux-ubuntu': ['']}, + 'linux-ubuntu': ['python-beautifulsoup']}, { 'url': 'https://pypi.python.org/packages/source/B/BeautifulSoup/BeautifulSoup-3.2.0…', 'path': 'BeautifulSoup-3.2.0/BeautifulSoup.py'}, {}), # OK 'irclib': ({'linux-fedora': ['python-irclib'], - 'linux-ubuntu': ['']}, + 'linux-ubuntu': ['python-irclib']}, {}, # http://python-irclib.sourceforge.net/ {}), # OK 'mwparserfromhell': ({}, @@ -197,13 +197,15 @@ return ("%s-%s" % (platform.system(), platform.dist()[0])).lower() -def show_question(which_files): +def show_question(which_files, admin=True): lowlevel_warning("Required package missing: %s" % which_files) lowlevel_warning("A required package is missing, but externals can" - " automatically install it." - " If you say Yes, externals will need administrator" - " privileges, and you might be asked for the administrator" - " password. For more info, please confer:\n" + " automatically install it.") + if admin: + lowlevel_warning("If you say Yes, externals will need administrator" + " privileges, and you might be asked for the" + " administrator password.") + lowlevel_warning("For more info, please confer:\n" " http://www.mediawiki.org/wiki/Manual:Pywikipediabot/" "Installation#Dependencies") lowlevel_warning("Give externals permission to try to install package?" @@ -308,7 +310,7 @@ def download_install(package, module, path): - if package and show_question(module): + if package and show_question(module, admin=False): lowlevel_warning(u'Download package "%s" from %s' % (module, package['url'])) import mimetypes @@ -393,13 +395,19 @@ lowlevel_warning(u'Trying to install by use of "%s" package management system:' % dist) if (func in globals()) and globals()[func](modules_needed[m][0]): return + else: + lowlevel_warning(u'No suitable package could be installed or found!') lowlevel_warning(u'Trying to install by download from source URL:') if download_install(modules_needed[m][1], m, path): return + else: + lowlevel_warning(u'No suitable package could be installed or found!') lowlevel_warning(u'Trying to install by use of mercurial:') if (len(modules_needed[m]) > 2) and\ mercurial_repo_install(modules_needed[m][2], m, path): return + else: + lowlevel_warning(u'No suitable package could be installed or found!') lowlevel_warning(u'Package "%s" could not be found nor installed!' % m) lowlevel_warning(u'Several scripts might fail, if some modules are not' -- To view, visit https://gerrit.wikimedia.org/r/79977 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe5e42e6c7cf5450ac527dd0fec681d93ced649e Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> 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: Nikerabbit <niklas.laxstrom(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 7 months

[Gerrit] pwb.bot.debug: Document the `layer` argument - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: pwb.bot.debug: Document the `layer` argument ...................................................................... pwb.bot.debug: Document the `layer` argument Change-Id: Id1efa0fa1091ccbe65507f488fba6dde3607401e --- M pywikibot/bot.py 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index fa7ee43..eb66ad1 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -409,7 +409,10 @@ def debug(text, layer, decoder=None, newline=True, **kwargs): - """Output a debug record to the log file.""" + """Output a debug record to the log file. + + @param layer: The name of the logger that text will be sent to. + """ logoutput(text, decoder, newline, DEBUG, layer, **kwargs) -- To view, visit https://gerrit.wikimedia.org/r/80796 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id1efa0fa1091ccbe65507f488fba6dde3607401e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mineo <themineo(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: jenkins-bot

10 years, 7 months

[Gerrit] Make ItemPage.editEntity() functional for creating a new item - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Make ItemPage.editEntity() functional for creating a new item ...................................................................... Make ItemPage.editEntity() functional for creating a new item Patch: https://sourceforge.net/p/pywikipediabot/patches/611/ Change-Id: Ia5c578e4a0cfcc3f80092c4496b48474cf95ee06 --- M pywikibot/site.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index bca3feb..ef00047 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3419,6 +3419,8 @@ @must_be(group='user') def editEntity(self, identification, data, bot=True, **kwargs): + if "id" in identification and identification["id"] == "-1": + del identification["id"] params = dict(**identification) if not params: # If no identification was provided params['new'] = 'item' # TODO create properties+queries -- To view, visit https://gerrit.wikimedia.org/r/80330 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5c578e4a0cfcc3f80092c4496b48474cf95ee06 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 7 months

[Gerrit] Revert "Implement wbsetclaim function" - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Revert "Implement wbsetclaim function" ...................................................................... Revert "Implement wbsetclaim function" This reverts commit 227f0dddab5a3f6c5b87a101ae3a0e739210cc1b; backing out due to broken build: https://travis-ci.org/wikimedia/pywikibot-core/builds/10577053 Change-Id: I4eda408501751b19a848cf20e480c773df5f968c --- M pywikibot/page.py M pywikibot/site.py 2 files changed, 13 insertions(+), 119 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index bee1461..52e792a 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2693,7 +2693,6 @@ self.qualifiers = {} self.target = None self.snaktype = 'value' - self.rank = 'normal' self.on_item = None # The item it's on @staticmethod @@ -2723,7 +2722,6 @@ else: #This covers string type claim.target = data['mainsnak']['datavalue']['value'] - claim.rank = data['rank'] if 'references' in data: for source in data['references']: claim.sources.append(Claim.referenceFromJSON(site, source)) @@ -2757,6 +2755,7 @@ """ wrap = {'mainsnak': data} return Claim.fromJSON(site, wrap) + def setTarget(self, value): """ @@ -2793,12 +2792,6 @@ """ return self.target - def getRank(self): - return self.rank - - def setRank(self): - raise NotImplementedError - def getSnakType(self): """ Returns the "snaktype" @@ -2829,9 +2822,8 @@ def addSource(self, source, **kwargs): """ - Adds a reference to the current claim - @param source: reference to add - @type source: pywikibot.Claim + source is a Claim. + adds it as a reference. """ data = self.repo.editSource(self, source, new=True, **kwargs) source.hash = data['reference']['hash'] @@ -2841,7 +2833,6 @@ def _formatDataValue(self): """ Format the target into the proper JSON datavalue that Wikibase wants - @return: dict|basestring """ if self.getType() == 'wikibase-item': value = {'entity-type': 'item', @@ -2855,32 +2846,6 @@ else: raise NotImplementedError('%s datatype is not supported yet.' % self.getType()) return value - - def _buildMainSnak(self): - """ - Builds the full mainsnak that Wikibase wants - @return: dict - """ - if self.getType() == 'wikibase-item': - datavalue = { - 'type': 'wikibase-entityid', - 'value': self._formatDataValue() - } - elif self.getType() in ['string', 'commonsMedia']: - datavalue = { - 'type': 'string', - 'value': self._formatDataValue() - } - elif self.getType() == 'globecoordinate': - datavalue = { - 'type': 'globecoordinate', - 'value': self._formatDataValue() - } - else: - raise NotImplementedError('%s datatype is not supported yet.' % self.getType()) - return datavalue - - diff --git a/pywikibot/site.py b/pywikibot/site.py index 31ce3d5..bca3feb 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -17,7 +17,6 @@ import datetime import itertools import os -from random import randint import re import sys import threading @@ -3461,85 +3460,6 @@ item.claims[claim.getID()] = [claim] item.lastrevid = data['pageinfo']['lastrevid'] - def setClaim(self, item, claim, bot=True, **kwargs): - """ - Implementation of wbsetclaim - The advantage of using this is that we can create - the reference in the same edit as adding the claim - @param item: Item to add a claim on - @type item: pywikibot.ItemPage - @param claim: Claim to add. This claim can have references - @type claim: pywikibot.Claim - @param bot: Mark edit as bot - @type bot: bool - @return: dict - """ - if claim.getSnakType() != 'value': - raise NotImplementedError - # Assemble the claim thingy - data = { - 'id': self.generateGUID(item), - 'mainsnak': { - 'snaktype': claim.getSnakType(), - 'property': claim.getID(), - 'datavalue': claim._buildMainSnak(), - }, - 'type': 'statement', - 'rank': claim.getRank(), - 'references': [], - } - if claim.sources: - # FIXME: Only the first ref will be added - ref = claim.sources[0] - data['references'].append({ - 'snaks': { - ref.getID(): [{ - 'snaktype': 'value', # FIXME: Support multiple snaktypes - 'property': ref.getID(), - 'datavalue': ref._buildMainSnak(), - }] - } - }) - - params = { - 'action': 'wbsetclaim', - 'claim': json.dumps(data), - 'token': self.token(item, 'edit'), - 'baserevid': item.lastrevid, - } - if bot: - params['bot'] = 1 - - req = api.Request(site=self, **params) - data = req.submit() - if claim.getID() in item.claims: - item.claims[claim.getID()].append(claim) - else: - item.claims[claim.getID()] = [claim] - item.lastrevid = data['pageinfo']['lastrevid'] - claim.on_item = item - - def generateGUID(self, item): - """ - Function to generate a random GUID, converted from the - one in Wikibase in PHP - @param item: item the guid is for - @type item: pywikibot.ItemPage - @return: str - """ - fmt = '{0:04X}{0:04X}-{0:04X}-{0:04X}-{0:04X}-{0:04X}{0:04X}{0:04X}' - string = fmt.format( - randint(0, 65535), - randint(0, 65535), - randint(0, 65535), - randint(16384, 20479), - randint(32768, 49151), - randint(0, 65535), - randint(0, 65535), - randint(0, 65535), - ) - return item.getID() + '$' + string - @must_be(group='user') def changeClaimTarget(self, claim, snaktype='value', bot=True, **kwargs): """ @@ -3590,7 +3510,16 @@ if not new and hasattr(source, 'hash'): params['reference'] = source.hash #build up the snak - datavalue = source._buildMainSnak() + if source.getType() == 'wikibase-item': + datavalue = {'type': 'wikibase-entityid', + 'value': source._formatDataValue(), + } + elif source.getType() == 'string': + datavalue = {'type': 'string', + 'value': source._formatDataValue(), + } + else: + raise NotImplementedError('%s datatype is not supported yet.' % claim.getType()) snak = {source.getID(): [{'snaktype': 'value', 'property': source.getID(), 'datavalue': datavalue, -- To view, visit https://gerrit.wikimedia.org/r/80765 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4eda408501751b19a848cf20e480c773df5f968c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> 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: jenkins-bot

10 years, 7 months

[Gerrit] Implement wbsetclaim function - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Implement wbsetclaim function ...................................................................... Implement wbsetclaim function wbsetclaim lets us add a claim and reference in one edit, but requires us to create the serialized object ourselves. Also added in proper handling of ranks. Code based on Aude's PHP implementation Change-Id: I599bd354c3e201149fd799b71937be0d7cc79f8e --- M pywikibot/page.py M pywikibot/site.py 2 files changed, 119 insertions(+), 13 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 52e792a..bee1461 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2693,6 +2693,7 @@ self.qualifiers = {} self.target = None self.snaktype = 'value' + self.rank = 'normal' self.on_item = None # The item it's on @staticmethod @@ -2722,6 +2723,7 @@ else: #This covers string type claim.target = data['mainsnak']['datavalue']['value'] + claim.rank = data['rank'] if 'references' in data: for source in data['references']: claim.sources.append(Claim.referenceFromJSON(site, source)) @@ -2755,7 +2757,6 @@ """ wrap = {'mainsnak': data} return Claim.fromJSON(site, wrap) - def setTarget(self, value): """ @@ -2792,6 +2793,12 @@ """ return self.target + def getRank(self): + return self.rank + + def setRank(self): + raise NotImplementedError + def getSnakType(self): """ Returns the "snaktype" @@ -2822,8 +2829,9 @@ def addSource(self, source, **kwargs): """ - source is a Claim. - adds it as a reference. + Adds a reference to the current claim + @param source: reference to add + @type source: pywikibot.Claim """ data = self.repo.editSource(self, source, new=True, **kwargs) source.hash = data['reference']['hash'] @@ -2833,6 +2841,7 @@ def _formatDataValue(self): """ Format the target into the proper JSON datavalue that Wikibase wants + @return: dict|basestring """ if self.getType() == 'wikibase-item': value = {'entity-type': 'item', @@ -2847,6 +2856,32 @@ raise NotImplementedError('%s datatype is not supported yet.' % self.getType()) return value + def _buildMainSnak(self): + """ + Builds the full mainsnak that Wikibase wants + @return: dict + """ + if self.getType() == 'wikibase-item': + datavalue = { + 'type': 'wikibase-entityid', + 'value': self._formatDataValue() + } + elif self.getType() in ['string', 'commonsMedia']: + datavalue = { + 'type': 'string', + 'value': self._formatDataValue() + } + elif self.getType() == 'globecoordinate': + datavalue = { + 'type': 'globecoordinate', + 'value': self._formatDataValue() + } + else: + raise NotImplementedError('%s datatype is not supported yet.' % self.getType()) + return datavalue + + + diff --git a/pywikibot/site.py b/pywikibot/site.py index bca3feb..31ce3d5 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -17,6 +17,7 @@ import datetime import itertools import os +from random import randint import re import sys import threading @@ -3460,6 +3461,85 @@ item.claims[claim.getID()] = [claim] item.lastrevid = data['pageinfo']['lastrevid'] + def setClaim(self, item, claim, bot=True, **kwargs): + """ + Implementation of wbsetclaim + The advantage of using this is that we can create + the reference in the same edit as adding the claim + @param item: Item to add a claim on + @type item: pywikibot.ItemPage + @param claim: Claim to add. This claim can have references + @type claim: pywikibot.Claim + @param bot: Mark edit as bot + @type bot: bool + @return: dict + """ + if claim.getSnakType() != 'value': + raise NotImplementedError + # Assemble the claim thingy + data = { + 'id': self.generateGUID(item), + 'mainsnak': { + 'snaktype': claim.getSnakType(), + 'property': claim.getID(), + 'datavalue': claim._buildMainSnak(), + }, + 'type': 'statement', + 'rank': claim.getRank(), + 'references': [], + } + if claim.sources: + # FIXME: Only the first ref will be added + ref = claim.sources[0] + data['references'].append({ + 'snaks': { + ref.getID(): [{ + 'snaktype': 'value', # FIXME: Support multiple snaktypes + 'property': ref.getID(), + 'datavalue': ref._buildMainSnak(), + }] + } + }) + + params = { + 'action': 'wbsetclaim', + 'claim': json.dumps(data), + 'token': self.token(item, 'edit'), + 'baserevid': item.lastrevid, + } + if bot: + params['bot'] = 1 + + req = api.Request(site=self, **params) + data = req.submit() + if claim.getID() in item.claims: + item.claims[claim.getID()].append(claim) + else: + item.claims[claim.getID()] = [claim] + item.lastrevid = data['pageinfo']['lastrevid'] + claim.on_item = item + + def generateGUID(self, item): + """ + Function to generate a random GUID, converted from the + one in Wikibase in PHP + @param item: item the guid is for + @type item: pywikibot.ItemPage + @return: str + """ + fmt = '{0:04X}{0:04X}-{0:04X}-{0:04X}-{0:04X}-{0:04X}{0:04X}{0:04X}' + string = fmt.format( + randint(0, 65535), + randint(0, 65535), + randint(0, 65535), + randint(16384, 20479), + randint(32768, 49151), + randint(0, 65535), + randint(0, 65535), + randint(0, 65535), + ) + return item.getID() + '$' + string + @must_be(group='user') def changeClaimTarget(self, claim, snaktype='value', bot=True, **kwargs): """ @@ -3510,16 +3590,7 @@ if not new and hasattr(source, 'hash'): params['reference'] = source.hash #build up the snak - if source.getType() == 'wikibase-item': - datavalue = {'type': 'wikibase-entityid', - 'value': source._formatDataValue(), - } - elif source.getType() == 'string': - datavalue = {'type': 'string', - 'value': source._formatDataValue(), - } - else: - raise NotImplementedError('%s datatype is not supported yet.' % claim.getType()) + datavalue = source._buildMainSnak() snak = {source.getID(): [{'snaktype': 'value', 'property': source.getID(), 'datavalue': datavalue, -- To view, visit https://gerrit.wikimedia.org/r/80328 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I599bd354c3e201149fd799b71937be0d7cc79f8e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Aude <aude.wiki(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2013