Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13424 discussions

[Gerrit] [BUG 55275] Prevent category_redirect.py from doing cosmetic... - change (pywikibot/core)
by jenkins-bot (Code Review) 12 Nov '13

12 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [BUG 55275] Prevent category_redirect.py from doing cosmetic changes ...................................................................... [BUG 55275] Prevent category_redirect.py from doing cosmetic changes category_redirect touches category to clean them. Thus it is a good idea to keep them off from doing cosmetic changes by placing it to the cosmetic_changes_deny_script list. cosmetic_changes_deny_script is a list of scripts for which cosmetic changes are disabled. See also https://gerrit.wikimedia.org/r/#/c/94495/ Some parts where synchronized with compat. Change-Id: I52aca8bbd468a347c677a33aea0efb6673df3f80 --- M pywikibot/config2.py 1 file changed, 39 insertions(+), 26 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index e82bc50..c758295 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # (C) Rob W.W. Hooft, 2003 -# (C) Pywikibot team, 2003-2012 +# (C) Pywikibot team, 2003-2013 # # Distributed under the terms of the MIT license. # @@ -31,14 +31,11 @@ family = 'wikipedia' # The language code of the site we're working on. mylang = 'language' -# The default interface for communicating with the site -# currently the only defined interface is 'APISite', so don't change this! -site_interface = 'APISite' -# number of days to cache namespaces, api configuration, etc. -API_config_expiry = 30 + # The dictionary usernames should contain a username for each site where you # have a bot account. Please set your usernames by adding such lines to your # user-config.py: +# # usernames['wikipedia']['de'] = 'myGermanUsername' # usernames['wiktionary']['en'] = 'myEnglishUsername' # @@ -49,11 +46,18 @@ # If you have a sysop account on some wikis, this will be used to delete pages # or to edit locked pages if you add such lines to your # user-config.py: +# # sysopnames['wikipedia']['de'] = 'myGermanUsername' # sysopnames['wiktionary']['en'] = 'myEnglishUsername' usernames = {} sysopnames = {} disambiguation_comment = {} + +# The default interface for communicating with the site +# currently the only defined interface is 'APISite', so don't change this! +site_interface = 'APISite' +# number of days to cache namespaces, api configuration, etc. +API_config_expiry = 30 # Solve captchas in the webbrowser. Setting this to False will result in the # exception CaptchaError being thrown if a captcha is encountered. @@ -143,7 +147,8 @@ raise RuntimeError("Directory '%(base_dir)s' does not exist." % locals()) if not os.path.exists(os.path.join(base_dir, "user-config.py")): - exc_text = "No user-config.py found in directory '%(base_dir)s'.\n" % locals() + exc_text = ("No user-config.py found in directory '%(base_dir)s'.\n" + % locals()) exc_text += " Please check that user-config.py is stored in the correct location.\n" exc_text += " Directory where user-config.py is searched is determined as follows:\n\n" exc_text += " " + _get_base_dir.__doc__ @@ -241,9 +246,11 @@ if __sys.platform == 'win32': try: import _winreg - _key1 = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER, 'Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithProgids') + _key1 = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER, + 'Software\Microsoft\Windows\CurrentVersion\Explorer\FileExts\.txt\OpenWithProgids') _progID = _winreg.EnumValue(_key1, 1)[0] - _key2 = _winreg.OpenKey(_winreg.HKEY_CLASSES_ROOT, '%s\shell\open\command' % _progID) + _key2 = _winreg.OpenKey(_winreg.HKEY_CLASSES_ROOT, + '%s\shell\open\command' % _progID) _cmd = _winreg.QueryValueEx(_key2, None)[0] editor = _cmd.replace('%1', '') # Notepad is even worse than our Tkinter editor. @@ -429,10 +436,10 @@ ############## SEARCH ENGINE SETTINGS ############## -# Some scripts allow querying Google via the Google Web API. To use this feature, -# you must install the pyGoogle module from http://pygoogle.sf.net/ and have a -# Google Web API license key. Note that Google doesn't give out license keys -# anymore. +# Some scripts allow querying Google via the Google Web API. To use this +# feature, you must install the pyGoogle module from http://pygoogle.sf.net/ +# and have a Google Web API license key. Note that Google doesn't give out +# license keys anymore. google_key = '' # Some scripts allow using the Yahoo! Search Web Services. To use this feature, @@ -545,17 +552,19 @@ # cosmetic_changes_deny_script += ['your_script_name_1', 'your_script_name_2'] # Appending the script name also works: # cosmetic_changes_deny_script.append('your_script_name') -cosmetic_changes_deny_script = ['cosmetic_changes', 'touch'] +cosmetic_changes_deny_script = ['category_redirect', 'cosmetic_changes', + 'touch'] ############## REPLICATION BOT ################ -# You can add replicate_replace to your user_config.py, which has the following format: +# You can add replicate_replace to your user_config.py, which has the following +# format: # # replicate_replace = { # 'wikipedia:li': {'Hoofdpagina': 'Veurblaad'} # } # -# to replace all occurences of 'Hoofdpagina' with 'Veurblaad' when writing to liwiki. Note that this does -# not take the origin wiki into account. +# to replace all occurences of 'Hoofdpagina' with 'Veurblaad' when writing to +# liwiki. Note that this does not take the origin wiki into account. replicate_replace = {} ############## FURTHER SETTINGS ############## @@ -594,7 +603,8 @@ # LS is a shortcut alias. line_separator = LS = u'\n' -# Settings to enable mwparserfromhell <http://mwparserfromhell.readthedocs.org/en/latest/> +# Settings to enable mwparserfromhell +# <http://mwparserfromhell.readthedocs.org/en/latest/> # Currently used in textlib.extract_templates_and_params # This should be more accurate than our current regex, but is currently opt-in. use_mwparserfromhell = False @@ -664,10 +674,10 @@ if __sys.platform == 'win32' or _filemode & 002 == 0 or True: execfile(_filename) else: - print "WARNING: Skipped '%(fn)s': writeable by others."\ + print "WARNING: Skipped '%(fn)s': writeable by others." \ % {'fn': _filename} else: - print "WARNING: Skipped '%(fn)s': owned by someone else."\ + print "WARNING: Skipped '%(fn)s': owned by someone else." \ % {'fn': _filename} # Test for obsoleted and/or unknown variables. @@ -691,9 +701,9 @@ print " %(now)s: %(new)s" % {'now': "Now", 'new': nt} del nt, ot else: - print \ - "Configuration variable %(_key)r is defined but unknown."\ - " Misspelled?" % locals() + print("WARNING: " + "Configuration variable %(_key)r is defined but unknown.\n" + "Misspelled?" % locals()) # Fix up default console_encoding if console_encoding is None: @@ -706,8 +716,10 @@ if transliteration_target == 'not set': if __sys.platform == 'win32': transliteration_target = console_encoding - print "WARNING: Running on Windows and transliteration_target is not set." - print "Please see http://www.mediawiki.org/wiki/Manual:Pywikipediabot/Windows" + print("WARNING: Running on Windows and transliteration_target is not " + "set.") + print("Please see " + "http://www.mediawiki.org/wiki/Manual:Pywikipediabot/Windows") else: transliteration_target = None elif transliteration_target in ('None', 'none'): @@ -732,7 +744,8 @@ _k.sort() for _name in _k: if _name[0] != '_': - if not type(globals()[_name]) in [types.FunctionType, types.ModuleType]: + if not type(globals()[_name]) in [types.FunctionType, + types.ModuleType]: if _all or _glv[_name] != globals()[_name]: print _name, "=", repr(globals()[_name]) -- To view, visit https://gerrit.wikimedia.org/r/94845 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52aca8bbd468a347c677a33aea0efb6673df3f80 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [BUG 55275] Prevent category_redirect.py from doing cosmetic... - change (pywikibot/compat)
by jenkins-bot (Code Review) 12 Nov '13

12 Nov '13

1 0

[Gerrit] add_text.py porting to core. The -untagged option is not yet... - change (pywikibot/core)
by jenkins-bot (Code Review) 11 Nov '13

11 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: add_text.py porting to core. The -untagged option is not yet supported. Started work on bug 56774. ...................................................................... add_text.py porting to core. The -untagged option is not yet supported. Started work on bug 56774. Change-Id: I2cf7a4ede53ebf3479748b31590c88b8c9aff4f3 --- A scripts/add_text.py 1 file changed, 377 insertions(+), 0 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/add_text.py b/scripts/add_text.py new file mode 100644 index 0000000..528b82f --- /dev/null +++ b/scripts/add_text.py @@ -0,0 +1,377 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +""" +This is a Bot written by Filnik to add a text at the end of the page but above +categories, interwiki and template for the stars of the interwiki (default). + +Alternatively it may also add a text at the top of the page. +These command line parameters can be used to specify which pages to work on: + +&params; + +Furthermore, the following command line parameters are supported: + +-page Use a page as generator + +-talkpage Put the text onto the talk page instead the generated on +-talk + +-text Define which text to add. "\n" are interpreted as newlines. + +-textfile Define a texfile name which contains the text to add + +-summary Define the summary to use + +-except Use a regex to check if the text is already in the page + +-excepturl Use the html page as text where you want to see if there's + the text, not the wiki-page. + +-newimages Add text in the new images + +(Not yet supported: -untagged Add text in the images that don't have any license template) + +-always If used, the bot won't ask if it should add the text + specified + +-up If used, put the text at the top of the page + +-noreorder Avoid to reorder cats and interwiki + +--- Example --- +1. +# This is a script to add a template to the top of the pages with +# category:catname +# Warning! Put it in one line, otherwise it won't work correctly. + +python add_text.py -cat:catname -summary:"Bot: Adding a template" +-text:"{{Something}}" -except:"\{\{([Tt]emplate:|)[Ss]omething" -up + +2. +# Command used on it.wikipedia to put the template in the page without any +# category. +# Warning! Put it in one line, otherwise it won't work correctly. + +python add_text.py -excepturl:"class='catlinks'>" -uncat +-text:"{{Categorizzare}}" -except:"\{\{([Tt]emplate:|)[Cc]ategorizzare" +-summary:"Bot: Aggiungo template Categorizzare" + +--- Credits and Help --- +This script has been written by Botwiki's staff, if you want to help us +or you need some help regarding this script, you can find us here: + +* http://botwiki.sno.cc + +""" + +# +# (C) Filnik, 2007-2010 +# (C) Pywikipedia bot team, 2007-2013 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' +# + +import re +import webbrowser +import codecs +import pywikibot +from pywikibot import config +from pywikibot import i18n +from pywikibot import pagegenerators + +docuReplacements = { + '&params;': pagegenerators.parameterHelp, +} + + +class NoEnoughData(pywikibot.Error): + """ Error class for when the user doesn't specified all the data needed """ + +starsList = [ + u'bueno', + u'bom interwiki', + u'cyswllt[ _]erthygl[ _]ddethol', u'dolen[ _]ed', + u'destacado', u'destaca[tu]', + u'enllaç[ _]ad', + u'enllaz[ _]ad', + u'leam[ _]vdc', + u'legătură[ _]a[bcf]', + u'liamm[ _]pub', + u'lien[ _]adq', + u'lien[ _]ba', + u'liên[ _]kết[ _]bài[ _]chất[ _]lượng[ _]tốt', + u'liên[ _]kết[ _]chọn[ _]lọc', + u'ligam[ _]adq', + u'ligoelstara', + u'ligoleginda', + u'link[ _][afgu]a', u'link[ _]adq', u'link[ _]f[lm]', u'link[ _]km', + u'link[ _]sm', u'linkfa', + u'na[ _]lotura', + u'nasc[ _]ar', + u'tengill[ _][úg]g', + u'ua', + u'yüm yg', + u'רא', + u'وصلة مقالة جيدة', + u'وصلة مقالة مختارة', +] + + +def add_text(page=None, addText=None, summary=None, regexSkip=None, + regexSkipUrl=None, always=False, up=False, putText=True, + oldTextGiven=None, reorderEnabled=True, create=False): + if not addText: + raise NoEnoughData('You have to specify what text you want to add!') + if not summary: + summary = i18n.twtranslate(pywikibot.getSite(), 'add_text-adding', + {'adding': addText[:200]}) + + # When a page is tagged as "really well written" it has a star in the + # interwiki links. This is a list of all the templates used (in regex + # format) to make the stars appear. + + errorCount = 0 + site = pywikibot.getSite() + pathWiki = site.family.nicepath(site.lang) + + if putText: + pywikibot.output(u'Loading %s...' % page.title()) + if oldTextGiven is None: + try: + text = page.get() + except pywikibot.NoPage: + if create: + pywikibot.output(u"%s doesn't exist, creating it!" + % page.title()) + text = u'' + else: + pywikibot.output(u"%s doesn't exist, skip!" % page.title()) + return (False, False, always) + except pywikibot.IsRedirectPage: + pywikibot.output(u"%s is a redirect, skip!" % page.title()) + return (False, False, always) + else: + text = oldTextGiven + # Understand if the bot has to skip the page or not + # In this way you can use both -except and -excepturl + if regexSkipUrl is not None: + url = '%s%s' % (pathWiki, page.urlname()) + result = re.findall(regexSkipUrl, site.getUrl(url)) + if result != []: + pywikibot.output( +u'''Exception! regex (or word) used with -exceptUrl is in the page. Skip! +Match was: %s''' % result) + return (False, False, always) + if regexSkip is not None: + result = re.findall(regexSkip, text) + if result != []: + pywikibot.output( +u'''Exception! regex (or word) used with -except is in the page. Skip! +Match was: %s''' % result) + return (False, False, always) + # If not up, text put below + if not up: + newtext = text + # Translating the \\n into binary \n + addText = addText.replace('\\n', '\n') + if (reorderEnabled): + # Getting the categories + categoriesInside = pywikibot.getCategoryLinks(newtext, site) + # Deleting the categories + newtext = pywikibot.removeCategoryLinks(newtext, site) + # Getting the interwiki + interwikiInside = pywikibot.getLanguageLinks(newtext, site) + # Removing the interwiki + newtext = pywikibot.removeLanguageLinks(newtext, site) + + # Adding the text + newtext += u"\n%s" % addText + # Reputting the categories + newtext = pywikibot.replaceCategoryLinks(newtext, + categoriesInside, site, + True) + # Dealing the stars' issue + allstars = [] + starstext = pywikibot.removeDisabledParts(text) + for star in starsList: + regex = re.compile('(\{\{(?:template:|)%s\|.*?\}\}[\s]*)' + % star, re.I) + found = regex.findall(starstext) + if found != []: + newtext = regex.sub('', newtext) + allstars += found + if allstars != []: + newtext = newtext.strip() + '\r\n\r\n' + allstars.sort() + for element in allstars: + newtext += '%s\r\n' % element.strip() + # Adding the interwiki + newtext = pywikibot.replaceLanguageLinks(newtext, interwikiInside, + site) + else: + newtext += u"\n%s" % addText + else: + newtext = addText + '\n' + text + if putText and text != newtext: + pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" + % page.title()) + pywikibot.showDiff(text, newtext) + # Let's put the changes. + while True: + # If someone load it as module, maybe it's not so useful to put the + # text in the page + if putText: + if not always: + choice = pywikibot.inputChoice( + u'Do you want to accept these changes?', + ['Yes', 'No', 'All', 'open in Browser'], + ['y', 'n', 'a', 'b'], 'n') + if choice == 'a': + always = True + elif choice == 'n': + return (False, False, always) + elif choice == 'b': + webbrowser.open("http://%s%s" % ( + page.site().hostname(), + page.site().nice_get_address(page.title()) + )) + pywikibot.input("Press Enter when finished in browser.") + if always or choice == 'y': + try: + if always: + page.put(newtext, summary, + minorEdit=page.namespace() != 3) + else: + page.put_async(newtext, summary, + minorEdit=page.namespace() != 3) + except pywikibot.EditConflict: + pywikibot.output(u'Edit conflict! skip!') + return (False, False, always) + except pywikibot.ServerError: + errorCount += 1 + if errorCount < 5: + pywikibot.output(u'Server Error! Wait..') + time.sleep(5) + continue + else: + raise pywikibot.ServerError(u'Fifth Server Error!') + except pywikibot.SpamfilterError, e: + pywikibot.output( + u'Cannot change %s because of blacklist entry %s' + % (page.title(), e.url)) + return (False, False, always) + except pywikibot.PageNotSaved, error: + pywikibot.output(u'Error putting page: %s' % error.args) + return (False, False, always) + except pywikibot.LockedPage: + pywikibot.output(u'Skipping %s (locked page)' + % page.title()) + return (False, False, always) + else: + # Break only if the errors are one after the other... + errorCount = 0 + return (True, True, always) + else: + return (text, newtext, always) + + +def main(): + # If none, the var is setted only for check purpose. + summary = None + addText = None + regexSkip = None + regexSkipUrl = None + generator = None + always = False + textfile = None + talkPage = False + reorderEnabled = True + namespaces = [] + # Load a lot of default generators + genFactory = pagegenerators.GeneratorFactory() + # Put the text above or below the text? + up = False + # Loading the arguments + for arg in pywikibot.handleArgs(): + if arg.startswith('-textfile'): + if len(arg) == 9: + textfile = pywikibot.input( + u'Which textfile do you want to add?') + else: + textfile = arg[10:] + elif arg.startswith('-text'): + if len(arg) == 5: + addText = pywikibot.input(u'What text do you want to add?') + else: + addText = arg[6:] + elif arg.startswith('-summary'): + if len(arg) == 8: + summary = pywikibot.input(u'What summary do you want to use?') + else: + summary = arg[9:] + elif arg.startswith('-page'): + if len(arg) == 5: + generator = [pywikibot.Page( + pywikibot.getSite(), + pywikibot.input(u'What page do you want to use?'))] + else: + generator = [pywikibot.Page(pywikibot.getSite(), arg[6:])] + elif arg.startswith('-excepturl'): + if len(arg) == 10: + regexSkipUrl = pywikibot.input(u'What text should I skip?') + else: + regexSkipUrl = arg[11:] + elif arg.startswith('-except'): + if len(arg) == 7: + regexSkip = pywikibot.input(u'What text should I skip?') + else: + regexSkip = arg[8:] +## *** NOT YET SUPPORTED *** +## elif arg.startswith('-untagged'): +## if len(arg) == 9: +## untaggedProject = pywikibot.input( +## u'What project do you want to use?') +## else: +## untaggedProject = arg[10:] +## generator = untaggedGenerator(untaggedProject) + elif arg == '-up': + up = True + elif arg == '-noreorder': + reorderEnabled = False + elif arg == '-always': + always = True + elif arg == '-talk' or arg == '-talkpage': + talkPage = True + else: + genFactory.handleArg(arg) + if textfile and not addText: + f = codecs.open(textfile, 'r', config.textfile_encoding) + addText = f.read() + f.close() + if not generator: + generator = genFactory.getCombinedGenerator() + if not generator: + raise NoEnoughData( + 'You have to specify the generator you want to use for the script!') + if talkPage: + generator = pagegenerators.PageWithTalkPageGenerator(generator) + site = pywikibot.getSite() + for namespace in site.namespaces(): + index = site.getNamespaceIndex(namespace) + if index % 2 == 1 and index > 0: + namespaces += [index] + generator = pagegenerators.NamespaceFilterPageGenerator( + generator, namespaces) + for page in generator: + (text, newtext, always) = add_text(page, addText, summary, regexSkip, + regexSkipUrl, always, up, True, + reorderEnabled=reorderEnabled, + create=talkPage) + +if __name__ == "__main__": + try: + main() + finally: + pywikibot.stopme() -- To view, visit https://gerrit.wikimedia.org/r/94623 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2cf7a4ede53ebf3479748b31590c88b8c9aff4f3 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Pyfisch <pyfisch(a)googlemail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [BUGFIX] do not add separator if interwiki links are on one ... - change (pywikibot/core)
by jenkins-bot (Code Review) 11 Nov '13

11 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [BUGFIX] do not add separator if interwiki links are on one line ...................................................................... [BUGFIX] do not add separator if interwiki links are on one line added missing check for site.language() in site.family.interwiki_on_one_line follow-up for f706e8b89885ad8510fe17f8c87bed2c7f6e0db0 Change-Id: Idd5b80a1c7046dc4a299b948246e40a3eb682b72 --- M pywikibot/textlib.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index f1df622..3ebb0d0 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -516,9 +516,11 @@ if s: if site.language() in site.family.interwiki_attop or \ u'' in oldtext: - #do not add separator if interiki links are on one line + #do not add separator if interwiki links are on one line newtext = (s + - [u'' if site.language() else separator] + \ + [u'' + if site.language() in site.family.interwiki_on_one_line + else separator] + s2.replace(marker, '').strip()) else: # calculate what was after the language links on the page -- To view, visit https://gerrit.wikimedia.org/r/94701 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idd5b80a1c7046dc4a299b948246e40a3eb682b72 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] [SYNC] Synchronize compat with core - change (pywikibot/compat)
by jenkins-bot (Code Review) 11 Nov '13

11 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: [SYNC] Synchronize compat with core ...................................................................... [SYNC] Synchronize compat with core follow-up for https://gerrit.wikimedia.org/r/#/c/94701/ Change-Id: If92c948f0184dc8e84528d807d53f25d417c82d0 --- M pywikibot/textlib.py 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 80b55e5..ee84235 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -514,10 +514,11 @@ if s: if site.language() in site.family.interwiki_attop or \ u'' in oldtext: - #do not add separator if interiki links are on one line + #do not add separator if interwiki links are on one line newtext = (s + - [separator, u''][site.language() in - site.family.interwiki_on_one_line] + + [u'' + if site.language() in site.family.interwiki_on_one_line + else separator] + s2.replace(marker, '').strip()) else: # calculate what was after the language links on the page -- To view, visit https://gerrit.wikimedia.org/r/94702 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If92c948f0184dc8e84528d807d53f25d417c82d0 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Name changed. Minor fixes. - change (pywikibot/core)
by jenkins-bot (Code Review) 11 Nov '13

11 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: Name changed. Minor fixes. ...................................................................... Name changed. Minor fixes. Change-Id: Iba89a308466a87adc4a9806c995d4b9e8db4a5e8 --- M pywikibot/__init__.py M pywikibot/bot.py M pywikibot/botirc.py M pywikibot/catlib.py M pywikibot/config2.py M pywikibot/date.py M pywikibot/editor.py M pywikibot/exceptions.py M pywikibot/family.py M pywikibot/fixes.py M pywikibot/i18n.py M pywikibot/interwiki_graph.py M pywikibot/logentries.py M pywikibot/login.py M pywikibot/page.py M pywikibot/pagegenerators.py M pywikibot/plural.py M pywikibot/site.py M pywikibot/textlib.py M pywikibot/throttle.py M pywikibot/titletranslate.py M pywikibot/tools.py M pywikibot/userlib.py M pywikibot/version.py M pywikibot/xmlreader.py 25 files changed, 55 insertions(+), 42 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 8fe058c..8f53758 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -3,7 +3,7 @@ The initialization file for the Pywikibot framework. """ # -# (C) Pywikipedia bot team, 2008-213 +# (C) Pywikibot team, 2008-213 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/bot.py b/pywikibot/bot.py index c530c4b..b885a6a 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -3,7 +3,7 @@ User-interface related functions for building bots """ # -# (C) Pywikipedia bot team, 2008-2012 +# (C) Pywikibot team, 2008-2012 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/botirc.py b/pywikibot/botirc.py index 48e7f4d..8a847a9 100644 --- a/pywikibot/botirc.py +++ b/pywikibot/botirc.py @@ -7,7 +7,7 @@ """ # # (C) Balasyum -# (C) Pywikipedia bot team, 2008-2013 +# (C) Pywikibot team, 2008-2013 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/catlib.py b/pywikibot/catlib.py index 067c834..a3ed406 100644 --- a/pywikibot/catlib.py +++ b/pywikibot/catlib.py @@ -7,7 +7,7 @@ """ # -# (C) Pywikipedia bot team, 2008 +# (C) Pywikibot team, 2008 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/config2.py b/pywikibot/config2.py index af4ee98..e82bc50 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- # # (C) Rob W.W. Hooft, 2003 -# (C) Pywikipedia bot team, 2003-2012 +# (C) Pywikibot team, 2003-2012 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# import os import sys as __sys diff --git a/pywikibot/date.py b/pywikibot/date.py index 1239d48..6378649 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -4,20 +4,19 @@ lists which are required by some other programs. """ # -# © Rob W.W. Hooft, 2003 -# © Daniel Herding, 2004 -# © Ævar Arnfjörð Bjarmason, 2004 -# © Andre Engels, 2004-2005 -# © Yuri Astrakhan, 2005-2006 FirstnameLastname(a)gmail.com +# (C) Rob W.W. Hooft, 2003 +# (C) Daniel Herding, 2004 +# (C) Ævar Arnfjörð Bjarmason, 2004 +# (C) Andre Engels, 2004-2005 +# (C) Yuri Astrakhan, 2005-2006 FirstnameLastname(a)gmail.com # (years/decades/centuries/millenniums str <=> int conversions) -# © Pywikipedia bot team, 2004-2012 +# (C) Pywikibot team, 2004-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# -# used for date recognition -import types import re # diff --git a/pywikibot/editor.py b/pywikibot/editor.py index 871c4a7..af10f8d 100644 --- a/pywikibot/editor.py +++ b/pywikibot/editor.py @@ -6,14 +6,13 @@ # # (C) Gerrit Holl 2004 -# (C) Pywikipedia team, 2004-2012 -# -__version__ = "$Id$" +# (C) Pywikibot team, 2004-2013 # # Distributed under the terms of the MIT license. # +__version__ = "$Id$" +# -__metaclass__ = type import sys import os import tempfile diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index dd97cb0..f029147 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -3,7 +3,7 @@ Exception classes used throughout the framework. """ # -# (C) Pywikipedia bot team, 2008 +# (C) Pywikibot team, 2008 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/family.py b/pywikibot/family.py index 4c54c66..3a3d663 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- # -# (C) Pywikipedia bot team, 2004-2013 +# (C) Pywikibot team, 2004-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# import logging import re diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py index 9f7ee2c..4802292 100644 --- a/pywikibot/fixes.py +++ b/pywikibot/fixes.py @@ -5,12 +5,12 @@ """ # -# (C) Pywikipedia team, 2008-2010 -# -__version__ = '$Id$' +# (C) Pywikibot team, 2008-2010 # # Distributed under the terms of the MIT license. # +__version__ = '$Id$' +# help = u""" * HTML - Convert HTML tags to wiki syntax, and diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index b15f7fc..df64ef5 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -1,13 +1,15 @@ # -*- coding: utf-8 -*- -""" Various i18n functions, both for the internal translation system - and for TranslateWiki-based translations +""" +Various i18n functions, both for the internal translation system +and for TranslateWiki-based translations """ # -# (C) Pywikipedia bot team, 2004-2013 +# (C) Pywikibot team, 2004-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# import re import locale diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py index 5daf1a6..ee043ae 100644 --- a/pywikibot/interwiki_graph.py +++ b/pywikibot/interwiki_graph.py @@ -1,11 +1,14 @@ """ Module with the graphviz drawing calls """ # -# (C) Pywikipedia bot team, 2006-2010 +# (C) Pywikibot team, 2006-2010 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# + import threading + pydotfound = True try: import pydot diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index 81adb71..05df835 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -3,11 +3,12 @@ Objects representing Mediawiki log entries """ # -# (C) Pywikipedia bot team, 2007-12 +# (C) Pywikibot team, 2007-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# from pywikibot.exceptions import * import pywikibot diff --git a/pywikibot/login.py b/pywikibot/login.py index f73f544..536d5ff 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -5,11 +5,12 @@ """ # # (C) Rob W.W. Hooft, 2003 -# (C) Pywikipedia bot team, 2003-2012 +# (C) Pywikibot team, 2003-2012 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# import pywikibot from pywikibot import config, deprecate_arg diff --git a/pywikibot/page.py b/pywikibot/page.py index 89574f7..daf37e8 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -3,11 +3,12 @@ Objects representing various types of MediaWiki pages. """ # -# (C) Pywikipedia bot team, 2008-2013 +# (C) Pywikibot team, 2008-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# import pywikibot from pywikibot import deprecate_arg diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index a0698e4..d09b713 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -13,11 +13,12 @@ &params; """ # -# (C) Pywikipedia bot team, 2008-2013 +# (C) Pywikibot team, 2008-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# import re import codecs diff --git a/pywikibot/plural.py b/pywikibot/plural.py index 742baf1..2b02046 100644 --- a/pywikibot/plural.py +++ b/pywikibot/plural.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # (C) xqt, 2011 -# (C) Pywikipedia bot team, 2011 +# (C) Pywikibot team, 2011 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/site.py b/pywikibot/site.py index 18416c1..854ec27 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -4,11 +4,12 @@ on the same topic in different languages). """ # -# (C) Pywikipedia bot team, 2008-2012 +# (C) Pywikibot team, 2008-2012 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# try: from hashlib import md5 diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index f1df622..1816125 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -7,11 +7,12 @@ """ # -# (C) Pywikipedia bot team, 2008-2013 +# (C) Pywikibot team, 2008-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# try: import mwparserfromhell diff --git a/pywikibot/throttle.py b/pywikibot/throttle.py index 240b606..db74e5d 100644 --- a/pywikibot/throttle.py +++ b/pywikibot/throttle.py @@ -3,20 +3,21 @@ Mechanics to slow down wiki read and/or write rate. """ # -# (C) Pywikipedia bot team, 2008 +# (C) Pywikibot team, 2008 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' - -import pywikibot -from pywikibot import config +# import logging import math import threading import time +import pywikibot +from pywikibot import config + _logger = "wiki.throttle" pid = False # global process identifier diff --git a/pywikibot/titletranslate.py b/pywikibot/titletranslate.py index 24ed10f..db05833 100644 --- a/pywikibot/titletranslate.py +++ b/pywikibot/titletranslate.py @@ -2,7 +2,7 @@ # # (C) Rob W.W. Hooft, 2003 # (C) Yuri Astrakhan, 2005 -# (C) Pywikipedia bot team, 2003-2010 +# (C) Pywikibot team, 2003-2010 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/tools.py b/pywikibot/tools.py index b7d8b72..299a248 100644 --- a/pywikibot/tools.py +++ b/pywikibot/tools.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Miscellaneous helper functions (not wiki-dependent)""" # -# (C) Pywikipedia bot team, 2008 +# (C) Pywikibot team, 2008 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/userlib.py b/pywikibot/userlib.py index 7844650..6d90419 100644 --- a/pywikibot/userlib.py +++ b/pywikibot/userlib.py @@ -7,7 +7,7 @@ """ # -# (C) Pywikipedia bot team, 2008 +# (C) Pywikibot team, 2008 # # Distributed under the terms of the MIT license. # diff --git a/pywikibot/version.py b/pywikibot/version.py index 9555d71..5e3fc9d 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -3,11 +3,12 @@ # # (C) Merlijn 'valhallasw' van Deen, 2007-2008 # (C) xqt, 2010-2012 -# (C) Pywikipedia bot team, 2007-2013 +# (C) Pywikibot team, 2007-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# import os import time diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py index c389266..0348bb3 100644 --- a/pywikibot/xmlreader.py +++ b/pywikibot/xmlreader.py @@ -8,7 +8,7 @@ XmlEntry objects which can be used by other bots. """ # -# (C) Pywikipedia bot team, 2005-2012 +# (C) Pywikibot team, 2005-2012 # # Distributed under the terms of the MIT license. # -- To view, visit https://gerrit.wikimedia.org/r/94784 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba89a308466a87adc4a9806c995d4b9e8db4a5e8 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Pyfisch <pyfisch(a)googlemail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Changing name. - change (pywikibot/core)
by jenkins-bot (Code Review) 11 Nov '13

11 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: Changing name. ...................................................................... Changing name. Old name: "Pywikipedia bot" New name: "Pywikibot" Change-Id: I860d8ca0771f2cf021837d702d34ec220af11441 --- M INSTALL M LICENSE M README-conversion.txt M generate_user_files.py M pwb.py M setup.py 6 files changed, 16 insertions(+), 17 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/INSTALL b/INSTALL index 3d5166d..86a5a28 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -To install the Pywikipediabot framework: +To install the Pywikibot framework: 1) Extract/unzip this package to a directory on your computer. 2) Open a command prompt in that directory, and run the command: @@ -12,7 +12,7 @@ python setup.py install --home=/path/to/location -where "/path/to/location" is the directory that you want the Pywikipediabot +where "/path/to/location" is the directory that you want the Pywikibot files installed to. Note: You will need to have an active Internet connection when you run the diff --git a/LICENSE b/LICENSE index 976c237..1b1e522 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2013 Pywikipedia bot team +Copyright (c) 2004-2013 Pywikibot team Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -22,6 +22,6 @@ OTHER DEALINGS IN THE SOFTWARE. Everything in the 'externals' directory is general released under seperate -licenses. Some parts may come from Pywikipedia bot team and share the same +licenses. Some parts may come from Pywikibot team and share the same permissions, but in general they have to be checked for any external package seperately. diff --git a/README-conversion.txt b/README-conversion.txt index 58078da..c3c69cb 100644 --- a/README-conversion.txt +++ b/README-conversion.txt @@ -1,5 +1,5 @@ This is a guide to converting bot scripts from version 1 of the -Pywikipediabot framework to version 2. +Pywikibot framework to version 2. Most importantly, note that the version 2 framework *only* supports wikis using MediaWiki v.1.14 or higher software. If you need to access a wiki that diff --git a/generate_user_files.py b/generate_user_files.py index b28f4df..f1363fd 100644 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- """ Script to create user files (user-config.py, user-fixes.py) """ # -# (C) Pywikipedia team, 2010-2013 -# -__version__ = '$Id$' +# (C) Pywikibot team, 2010-2013 # # Distributed under the terms of the MIT license. # +__version__ = '$Id$' +# import os import sys diff --git a/pwb.py b/pwb.py index 9977fe0..4aecdee 100644 --- a/pwb.py +++ b/pwb.py @@ -5,13 +5,11 @@ and it will use the package directory to store all user files, will fix up search paths so the package does not need to be installed, etc. """ -# (C) Pywikipedia team, 2013 -# -__version__ = '$Id$' +# (C) Pywikibot team, 2013 # # Distributed under the terms of the MIT license. # - +__version__ = '$Id$' # The following snippet was developed by Ned Batchelder (and others) # for coverage.py [1], and is available under the BSD license (see [2]) diff --git a/setup.py b/setup.py index 620ee2f..c61b298 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,14 @@ # -*- coding: utf-8 -*- """ Installer script for Pywikibot 2.0 framework - -(C) Pywikipedia team, 2009-2013 - -Distributed under the terms of the MIT license. - """ +# +# (C) Pywikibot team, 2009-2013 +# +# Distributed under the terms of the MIT license. +# __version__ = '$Id$' +# import sys -- To view, visit https://gerrit.wikimedia.org/r/94781 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I860d8ca0771f2cf021837d702d34ec220af11441 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Pyfisch <pyfisch(a)googlemail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Chaning the name in script files. Minor fixes. - change (pywikibot/core)
by jenkins-bot (Code Review) 11 Nov '13

11 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: Chaning the name in script files. Minor fixes. ...................................................................... Chaning the name in script files. Minor fixes. Old name: "Pywikipedia bot team" New name: "Pywikibot team" Change-Id: I943bbbe624aeee029eb34bb4a94f9eb1ff596921 --- M scripts/basic.py M scripts/blockpageschecker.py M scripts/category.py M scripts/category_redirect.py M scripts/cfd.py M scripts/claimit.py M scripts/clean_sandbox.py M scripts/cosmetic_changes.py M scripts/data_ingestion.py M scripts/delete.py M scripts/editarticle.py M scripts/featured.py M scripts/flickrripper.py M scripts/harvest_template.py M scripts/imagerecat.py M scripts/imageuncat.py M scripts/interwiki.py M scripts/isbn.py M scripts/listpages.py M scripts/login.py M scripts/movepages.py M scripts/noreferences.py M scripts/redirect.py M scripts/replace.py M scripts/replicate_wiki.py M scripts/solve_disambiguation.py M scripts/template.py M scripts/touch.py M scripts/upload.py M scripts/version.py 30 files changed, 104 insertions(+), 80 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/basic.py b/scripts/basic.py index 1d8bfab..4d73deb 100755 --- a/scripts/basic.py +++ b/scripts/basic.py @@ -16,7 +16,7 @@ and the bot will only work on that single page. """ # -# (C) Pywikipedia bot team, 2006-2011 +# (C) Pywikibot team, 2006-2013 # # Distributed under the terms of the MIT license. # diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index affd2b7..d6a5677 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -57,7 +57,7 @@ # (C) Monobi a.k.a. Wikihermit, 2007 # (C) Filnik, 2007-2011 # (C) NicDumZ, 2008-2009 -# (C) Pywikipedia bot team, 2007-2013 +# (C) Pywikibot team, 2007-2013 # # Distributed under the terms of the MIT license. # diff --git a/scripts/category.py b/scripts/category.py index 01ecd70..54513b2 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -77,7 +77,6 @@ This will move all pages in the category US to the category United States. """ - # # (C) Rob W.W. Hooft, 2004 # (C) Daniel Herding, 2004 @@ -86,12 +85,12 @@ # (C) Cyde, 2006-2010 # (C) Anreas J Schwab, 2007 # (C) xqt, 2009-2012 -# (C) Pywikipedia team, 2008-2013 -# -__version__ = '$Id$' +# (C) Pywikibot team, 2008-2013 # # Distributed under the terms of the MIT license. # +__version__ = '$Id$' +# import os import re diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 17053ff..005827f 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -13,14 +13,13 @@ are taken into account. """ - # -# (C) Pywikipedia team, 2008-2011 -# -__version__ = '$Id$' +# (C) Pywikibot team, 2008-2011 # # Distributed under the terms of the MIT license. # +__version__ = '$Id$' +# import cPickle import math diff --git a/scripts/cfd.py b/scripts/cfd.py index 9116660..e84da60 100644 --- a/scripts/cfd.py +++ b/scripts/cfd.py @@ -9,9 +9,12 @@ """ # # (C) Ben McIlwain, 2008 -# (C) Pywikipedia bot team, 2009-2013 +# (C) Pywikibot team, 2009-2013 # # Distributed under the terms of the MIT license. +# +__version__ = '$Id$' +# import pywikibot import re diff --git a/scripts/claimit.py b/scripts/claimit.py index e72e804..f326a4c 100755 --- a/scripts/claimit.py +++ b/scripts/claimit.py @@ -1,10 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- """ -Copyright (C) 2013 Legoktm -Copyright (C) 2013 Pywikipediabot team - -Distributed under the MIT License +This script adds claims to Wikidata items based on categories. Usage: @@ -14,6 +11,15 @@ Then list the property-->target pairs to add. """ +# +# (C) Legoktm, 2013 +# (C) Pywikibot team, 2013 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' +# + import json import pywikibot from pywikibot import pagegenerators diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py index c06662c..50ee1ff 100755 --- a/scripts/clean_sandbox.py +++ b/scripts/clean_sandbox.py @@ -34,6 +34,7 @@ # (C) Siebrand Mazeland, 2007 # (C) xqt, 2009-2013 # (C) Dr. Trigon, 2012 +# (C) Pywikibot team, 2013 # # Distributed under the terms of the MIT license. # diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py index 5acb8ee..557873e 100755 --- a/scripts/cosmetic_changes.py +++ b/scripts/cosmetic_changes.py @@ -66,12 +66,13 @@ """ # # (C) xqt, 2009-2013 -# (C) Pywikipedia bot team, 2006-2013 +# (C) Pywikibot team, 2006-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' # + import sys import re import pywikibot diff --git a/scripts/data_ingestion.py b/scripts/data_ingestion.py index 386ff91..f8bc376 100755 --- a/scripts/data_ingestion.py +++ b/scripts/data_ingestion.py @@ -1,9 +1,16 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -''' +""" A generic bot to do data ingestion (batch uploading) to Commons +""" +# +# (C) Pywikibot team, 2013 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' +# -''' import pywikibot import posixpath import urlparse diff --git a/scripts/delete.py b/scripts/delete.py index 0a8e8b0..25b659e 100644 --- a/scripts/delete.py +++ b/scripts/delete.py @@ -25,10 +25,14 @@ python delete.py -cat:"To delete" -always """ -__version__ = '$Id$' +# +# (C) Pywikibot team, 2013 # # Distributed under the terms of the MIT license. # +__version__ = '$Id$' +# + import pywikibot from pywikibot import i18n, config, catlib, pagegenerators diff --git a/scripts/editarticle.py b/scripts/editarticle.py index babf185..e6e74ab 100755 --- a/scripts/editarticle.py +++ b/scripts/editarticle.py @@ -2,26 +2,22 @@ # -*- coding: utf-8 -*- """ Edit a Wikipedia article with your favourite editor. -""" + TODO: - non existing pages + - edit conflicts + - minor edits + - watch/unwatch + - ... +""" # # (C) Gerrit Holl 2004 -# (C) Pywikipedia team, 2004-2012 -# -__version__ = "$Id$" +# (C) Pywikibot team, 2004-2012 # # Distributed under the terms of the MIT license. # - -# Version 0.4. +__version__ = "$Id$" # -# TODO: - non existing pages -# - edit conflicts -# - minor edits -# - watch/unwatch -# - ... -__metaclass__ = type import os import string import optparse @@ -32,7 +28,7 @@ from pywikibot.editor import TextEditor -class ArticleEditor: +class ArticleEditor(object): # join lines if line starts with this ones joinchars = string.letters + '[]' + string.digits diff --git a/scripts/featured.py b/scripts/featured.py index 3923d71..a3bba6b 100644 --- a/scripts/featured.py +++ b/scripts/featured.py @@ -53,16 +53,16 @@ -quiet no corresponding pages are displayed. """ -__version__ = '$Id$' - # # (C) Maxim Razin, 2005 # (C) Leonardo Gregianin, 2005-2008 # (C) xqt, 2009-2013 -# (C) Pywikipedia bot team, 2005-2012 +# (C) Pywikibot team, 2005-2012 # # Distributed under the terms of the MIT license. # +__version__ = '$Id$' +# import pickle import re diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index 9b0c60d..da96c14 100644 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -25,11 +25,12 @@ """ # # (C) Multichill, 2009 -# (C) Pywikipedia team, 2009-2013 +# (C) Pywikibot team, 2009-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# import urllib import re diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index c482c9d..dbdb9ac 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -15,8 +15,8 @@ &params; """ # -# (C) 2013 Multichill, Amir -# (C) 2013 Pywikipediabot team +# (C) Multichill, Amir, 2013 +# (C) Pywikibot team, 2013 # # Distributed under the terms of MIT License. # diff --git a/scripts/imagerecat.py b/scripts/imagerecat.py index df04190..7016d18 100644 --- a/scripts/imagerecat.py +++ b/scripts/imagerecat.py @@ -24,14 +24,15 @@ wps : Work on all wikipedia's """ -__version__ = '$Id$' # -# (C) Multichill 2008-2011 -# (C) Pywikipedia bot team, 2008-2013 +# (C) Multichill 2008-2011 +# (C) Pywikibot team, 2008-2013 # # Distributed under the terms of the MIT license. # +__version__ = '$Id$' # + import sys import re import urllib diff --git a/scripts/imageuncat.py b/scripts/imageuncat.py index 1f7e9ff..c75bada 100755 --- a/scripts/imageuncat.py +++ b/scripts/imageuncat.py @@ -5,12 +5,12 @@ See imagerecat.py (still working on that one) to add these images to categories. """ -__version__ = '$Id$' # # (C) Multichill 2008 # # Distributed under the terms of the MIT license. # +__version__ = '$Id$' # import os diff --git a/scripts/interwiki.py b/scripts/interwiki.py index edf08ab..74fd13b 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -336,7 +336,7 @@ # (C) Daniel Herding, 2004 # (C) Yuri Astrakhan, 2005-2006 # (C) xqt, 2009-2013 -# (C) Pywikipedia bot team, 2007-2013 +# (C) Pywikibot team, 2007-2013 # # Distributed under the terms of the MIT license. # diff --git a/scripts/isbn.py b/scripts/isbn.py index 76382f3..b2eb52a 100755 --- a/scripts/isbn.py +++ b/scripts/isbn.py @@ -35,8 +35,13 @@ -always Don't prompt you for each replacement. """ - +# +# (C) Pywikibot team, 2013 +# +# Distributed under the terms of the MIT license. +# __version__ = '$Id$' +# import sys import re diff --git a/scripts/listpages.py b/scripts/listpages.py index 2cb668b..4638abc 100644 --- a/scripts/listpages.py +++ b/scripts/listpages.py @@ -7,11 +7,12 @@ &params; """ # -# (C) Pywikipedia bot team, 2008-2013 +# (C) Pywikibot team, 2008-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# import pywikibot from pywikibot.pagegenerators import GeneratorFactory, parameterHelp diff --git a/scripts/login.py b/scripts/login.py index 02a4590..6d31e09 100755 --- a/scripts/login.py +++ b/scripts/login.py @@ -48,11 +48,12 @@ """ # # (C) Rob W.W. Hooft, 2003 -# (C) Pywikipedia bot team, 2003-2012 +# (C) Pywikibot team, 2003-2012 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# import logging import pywikibot diff --git a/scripts/movepages.py b/scripts/movepages.py index bbed63d..24d8434 100644 --- a/scripts/movepages.py +++ b/scripts/movepages.py @@ -32,12 +32,12 @@ # # (C) Leonardo Gregianin, 2006 # (C) Andreas J. Schwab, 2007 -# (C) Pywikipedia bot team, 2006-2013 +# (C) Pywikibot team, 2006-2013 # # Distributed under the terms of the MIT license. # - __version__ = '$Id$' +# import sys import re diff --git a/scripts/noreferences.py b/scripts/noreferences.py index 253c095..791fb27 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -33,14 +33,19 @@ bandwidth. Instead, use the -xml parameter, or use another way to generate a list of affected articles """ - +# +# (C) Pywikibot team, 2013 +# +# Distributed under the terms of the MIT license. +# __version__ = '$Id$' +# import re import sys import pywikibot from pywikibot import i18n -from pywikibot import pagegenerators, catlib +from pywikibot import pagegenerators import editarticle # This is required for the text that is shown when you run this script @@ -691,8 +696,8 @@ else: if not namespaces: namespaces = [0] - cat = catlib.Category(site, "%s:%s" % (site.category_namespace(), - cat)) + cat = pywikibot.Category(site, "%s:%s" % ( + site.category_namespace(), cat)) gen = pagegenerators.CategorizedPageGenerator(cat) if not gen: pywikibot.showHelp('noreferences') diff --git a/scripts/redirect.py b/scripts/redirect.py index 233cad9..46c2281 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -52,12 +52,13 @@ # (C) Daniel Herding, 2004. # (C) Purodha Blissenbach, 2009. # (C) xqt, 2009-2012 -# (C) Pywikipedia bot team, 2004-2013 +# (C) Pywikibot team, 2004-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' # + import re import datetime import pywikibot diff --git a/scripts/replace.py b/scripts/replace.py index 76f0636..e02cb0c 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -114,16 +114,14 @@ Please type "replace.py -help | more" if you can't read the top of the help. """ -from __future__ import generators # # (C) Daniel Herding & the Pywikipedia team, 2004-2012 # -__version__ = '$Id$' -# # Distributed under the terms of the MIT license. # +__version__ = '$Id$' +# -import sys import re import time import pywikibot diff --git a/scripts/replicate_wiki.py b/scripts/replicate_wiki.py index 5ed1bd9..c2c80d0 100644 --- a/scripts/replicate_wiki.py +++ b/scripts/replicate_wiki.py @@ -1,13 +1,6 @@ #!/usr/bin/env python -# # -*- coding: utf-8 -*- -# -# (C) Kasper Souren 2012-2013 -# -# Distributed under the terms of the MIT license. -# - -''' +""" This bot replicates all pages (from specific namespaces) in a wiki to a second wiki within one family. Example: @@ -24,7 +17,14 @@ to replace all occurences of 'Hoofdpagina' with 'Veurblaad' when writing to liwiki. Note that this does not take the origin wiki into account. -''' +""" +# +# (C) Kasper Souren 2012-2013 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' +# import sys import re diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index c6f792a..9dc6d77 100644 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -67,26 +67,22 @@ python solve_disambiguation.py -just -pos:New_Name Old_Name """ - # # (C) Rob W.W. Hooft, 2003 # (C) Daniel Herding, 2004 # (C) Andre Engels, 2003-2004 # (C) WikiWichtel, 2004 -# (C) Pywikipedia team, 2003-2009 -# -__version__ = '$Id$' +# (C) Pywikibot team, 2003-2013 # # Distributed under the terms of the MIT license. # +__version__ = '$Id$' +# - -# Standard library imports import re import sys import codecs -# Application specific imports import pywikibot from pywikibot import editor as editarticle from pywikibot import pagegenerators diff --git a/scripts/template.py b/scripts/template.py index 91ec9ff..4222f5d 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -100,15 +100,14 @@ # (C) Daniel Herding, 2004 # (C) Rob W.W. Hooft, 2003 # (C) xqt, 2009-2011 -# (C) Pywikipedia team, 2004-2010 +# (C) Pywikibot team, 2004-2010 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' # + import re -import sys -import string import pywikibot from pywikibot import i18n from pywikibot import config, pagegenerators, catlib diff --git a/scripts/touch.py b/scripts/touch.py index 84c2076..c65070b 100755 --- a/scripts/touch.py +++ b/scripts/touch.py @@ -16,9 +16,8 @@ All other parameters will be regarded as a page title; in this case, the bot will only touch a single page. """ - # -# (C) Pywikipedia team +# (C) Pywikibot team, 2013 # __version__ = '$Id$' # diff --git a/scripts/upload.py b/scripts/upload.py index f3aefe4..f913e38 100755 --- a/scripts/upload.py +++ b/scripts/upload.py @@ -20,7 +20,7 @@ """ # # (C) Rob W.W. Hooft, Andre Engels 2003-2004 -# (C) Pywikipedia bot team, 2003-2010 +# (C) Pywikibot team, 2003-2010 # # Distributed under the terms of the MIT license. # diff --git a/scripts/version.py b/scripts/version.py index 7cb2bc7..94d8f65 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -4,11 +4,12 @@ # # (C) Merlijn 'valhallasw' van Deen, 2007-2008 # (C) xqt, 2010-2012 -# (C) Pywikipedia bot team, 2007-2013 +# (C) Pywikibot team, 2007-2013 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# import sys import pywikibot -- To view, visit https://gerrit.wikimedia.org/r/94778 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I943bbbe624aeee029eb34bb4a94f9eb1ff596921 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Pyfisch <pyfisch(a)googlemail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Code improvements - change (pywikibot/core)
by jenkins-bot (Code Review) 11 Nov '13

11 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: Code improvements ...................................................................... Code improvements - remove obsolete threading - call getVersionHistory() as method not as function because we do not need the result here and use the internal variable "_revisions" - simplify result for isEmpty() - change "return None" to "return" which returns None per default - PEP8 changes Change-Id: I8eb71790f3c762feee1ff7d86fa91eed3be72b32 --- M pywikibot/page.py 1 file changed, 98 insertions(+), 78 deletions(-) Approvals: Xqt: Looks good to me, approved Pyfisch: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index ca159fd..89574f7 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -19,7 +19,6 @@ import htmlentitydefs import logging import re -import threading import unicodedata import urllib import collections @@ -83,7 +82,8 @@ self.__dict__ = source.__dict__ if title: # overwrite title - self._link = Link(title, source=source.site, defaultNamespace=ns) + self._link = Link(title, source=source.site, + defaultNamespace=ns) elif isinstance(source, Link): self._link = source self._revisions = {} @@ -141,11 +141,11 @@ title = title + "#" + self._link.section if asLink: if forceInterwiki or \ - (allowInterwiki and \ - (self.site.family.name != config.family - or self.site.code != config.mylang)): + (allowInterwiki and + (self.site.family.name != config.family + or self.site.code != config.mylang)): if self.site.family.name != config.family \ - and self.site.family.name != self.site.code: + and self.site.family.name != self.site.code: return u'[[%s:%s:%s]]' % (self.site.family.name, self.site.code, title) @@ -391,13 +391,12 @@ def expand_text(self, refresh=False): """Return the page text with all templates expanded.""" - if not hasattr(self, "_expanded_text") or (self._expanded_text is None) or refresh: - req = pywikibot.data.api.Request(action="expandtemplates", - text=self.text, - title=self.title(withSection=False), - site=self.site) + if not hasattr(self, "_expanded_text") or ( + self._expanded_text is None) or refresh: + req = pywikibot.data.api.Request( + action="expandtemplates", text=self.text, + title=self.title(withSection=False), site=self.site) self._expanded_text = req.submit()["expandtemplates"]["*"] - return self._expanded_text def userName(self): @@ -429,7 +428,7 @@ def previousRevision(self): """Return the revision id for the previous revision of this Page.""" - vh = self.getVersionHistory(total=2) + self.getVersionHistory(total=2) revkey = sorted(self._revisions, reverse=True)[1] return revkey @@ -473,7 +472,8 @@ if template.title(withNamespace=False) in catredirs: # Get target (first template argument) try: - self._catredirect = self.site.namespace(14) + ":" + args[0].strip() + self._catredirect = "%s:%s" % (self.site.namespace(14), + args[0].strip()) break except IndexError: pywikibot.warning( @@ -501,10 +501,7 @@ txt = self.get() txt = pywikibot.removeLanguageLinks(txt, site=self.site) txt = pywikibot.removeCategoryLinks(txt, site=self.site) - if len(txt) < 4: - return True - else: - return False + return len(txt) < 4 def isTalkPage(self): """Return True if this page is in any talk namespace.""" @@ -523,20 +520,18 @@ """ ns = self.namespace() if ns < 0: # Special page - return None + return if self.isTalkPage(): if self.namespace() == 1: return Page(self.site, self.title(withNamespace=False)) else: - return Page( - self.site, - self.site.namespace(ns - 1) + ':' + self.title(withNamespace=False) - ) + return Page(self.site, + "%s:%s" % (self.site.namespace(ns - 1), + self.title(withNamespace=False))) else: - return Page( - self.site, - self.site.namespace(ns + 1) + ':' + self.title(withNamespace=False) - ) + return Page(self.site, + "%s:%s" % (self.site.namespace(ns + 1), + self.title(withNamespace=False))) def isCategory(self): """Return True if the page is a Category, False otherwise.""" @@ -820,7 +815,8 @@ botflag=botflag, async=async, callback=callback, **kwargs) - def _save(self, comment, minor, watchval, botflag, async, callback, **kwargs): + def _save(self, comment, minor, watchval, botflag, async, callback, + **kwargs): err = None link = self.title(asLink=True) if config.cosmetic_changes: @@ -854,15 +850,15 @@ family = self.site.family.name config.cosmetic_changes_disable.update({'wikidata': ('repo', )}) if config.cosmetic_changes_mylang_only: - cc = (family == config.family and \ - self.site.lang == config.mylang) or \ - family in config.cosmetic_changes_enable.keys() and \ - self.site.lang in config.cosmetic_changes_enable[family] + cc = ((family == config.family and + self.site.lang == config.mylang) or + family in config.cosmetic_changes_enable.keys() and + self.site.lang in config.cosmetic_changes_enable[family]) else: cc = True - cc = cc and not \ - (family in config.cosmetic_changes_disable.keys() and \ - self.site.lang in config.cosmetic_changes_disable[family]) + cc = (cc and not + (family in config.cosmetic_changes_disable.keys() and + self.site.lang in config.cosmetic_changes_disable[family])) if not cc: return old = self.text @@ -876,7 +872,8 @@ pageTitle=self.title()) self.text = ccToolkit.change(old) if comment and \ - old.strip().replace('\r\n', '\n') != self.text.strip().replace('\r\n', '\n'): + old.strip().replace('\r\n', + '\n') != self.text.strip().replace('\r\n', '\n'): comment += i18n.twtranslate(self.site, 'cosmetic_changes-append') return comment @@ -1277,7 +1274,8 @@ answer = u'y' if prompt and not hasattr(self.site, '_noDeletePrompt'): answer = pywikibot.inputChoice( - u'Do you want to delete %s?' % self.title(asLink=True, forceInterwiki=True), + u'Do you want to delete %s?' % self.title(asLink=True, + forceInterwiki=True), ['Yes', 'No', 'All'], ['Y', 'N', 'A'], 'N') @@ -1342,8 +1340,8 @@ if not hasattr(self, "_deletedRevs"): self.loadDeletedRevisions() if timestamp not in self._deletedRevs: - #TODO: Throw an exception? - return None + # TODO: Throw an exception? + return self._deletedRevs[timestamp][4] = undelete self._deletedRevsModified = True @@ -1404,7 +1402,8 @@ answer = 'y' if prompt and not hasattr(self.site, '_noProtectPrompt'): answer = pywikibot.inputChoice( - u'Do you want to change the protection level of %s?' % self.title(asLink=True, forceInterwiki=True), + u'Do you want to change the protection level of %s?' + % self.title(asLink=True, forceInterwiki=True), ['Yes', 'No', 'All'], ['Y', 'N', 'A'], 'N') @@ -1431,7 +1430,8 @@ rearranging them. """ - #get list of Category objects the article is in and remove possible duplicates + # get list of Category objects the article is in and remove possible + # duplicates cats = [] for cat in self.categories(get_redirect=True): if cat not in cats: @@ -1457,7 +1457,8 @@ newtext = pywikibot.replaceCategoryInPlace(oldtext, oldCat, newCat) else: if newCat: - cats[cats.index(oldCat)] = Category(site, newCat.title(), sortKey=sortKey) + cats[cats.index(oldCat)] = Category(site, newCat.title(), + sortKey=sortKey) else: cats.pop(cats.index(oldCat)) oldtext = self.get(get_redirect=True) @@ -1466,8 +1467,8 @@ except ValueError: # Make sure that the only way replaceCategoryLinks() can return # a ValueError is in the case of interwiki links to self. - pywikibot.output(u'Skipping %s because of interwiki link to self' - % self.title()) + pywikibot.output(u'Skipping %s because of interwiki link to ' + u'self' % self.title()) if oldtext != newtext: try: @@ -1482,8 +1483,8 @@ pywikibot.output(u'Skipping %s because page is locked' % self.title()) except pywikibot.NoUsername: - pywikibot.output(u'Page %s not saved; sysop privileges required.' - % self.title(asLink=True)) + pywikibot.output(u'Page %s not saved; sysop privileges ' + u'required.' % self.title(asLink=True)) except pywikibot.PageNotSaved, error: pywikibot.output(u'Saving page %s failed: %s' % (self.title(asLink=True), error.message)) @@ -1496,11 +1497,11 @@ """ if not self.isCategory(): - return None # should this raise an exception?? + return # should this raise an exception?? try: return self.site.categoryinfo(self) except NotImplementedError: - return None + return ######## DEPRECATED METHODS ######## @@ -1808,8 +1809,10 @@ namespaces=namespaces, step=step, total=total, content=content, sortby=sortby, - starttime=starttime, endtime=endtime, - startsort=startsort, endsort=endsort, + starttime=starttime, + endtime=endtime, + startsort=startsort, + endsort=endsort ): yield member if total is not None: @@ -1822,9 +1825,12 @@ for subcat in self.subcategories(step=step): for article in subcat.articles(recurse, step=step, total=total, content=content, - namespaces=namespaces, sortby=sortby, - starttime=starttime, endtime=endtime, - startsort=startsort, endsort=endsort, + namespaces=namespaces, + sortby=sortby, + starttime=starttime, + endtime=endtime, + startsort=startsort, + endsort=endsort ): yield article if total is not None: @@ -2135,7 +2141,8 @@ if self._isAutoblock: #This user is probably being queried for purpose of lifting #an autoblock, so has no user pages per se. - raise AutoblockUser("This is an autoblock ID, you can only use to unblock it.") + raise AutoblockUser( + "This is an autoblock ID, you can only use to unblock it.") if subpage: subpage = u'/' + subpage return Page(Link(self.title() + subpage, self.site)) @@ -2151,7 +2158,8 @@ if self._isAutoblock: #This user is probably being queried for purpose of lifting #an autoblock, so has no user talk pages per se. - raise AutoblockUser("This is an autoblock ID, you can only use to unblock it.") + raise AutoblockUser( + "This is an autoblock ID, you can only use to unblock it.") if subpage: subpage = u'/' + subpage return Page(Link(self.title(withNamespace=False) + subpage, @@ -2199,8 +2207,8 @@ return True return False - def block(self, expiry, reason, anononly=True, nocreate=True, autoblock=True, - noemail=False, reblock=False): + def block(self, expiry, reason, anononly=True, nocreate=True, + autoblock=True, noemail=False, reblock=False): """ Blocks a user @param expiry: When the block should expire @@ -2220,7 +2228,8 @@ @return: None """ try: - self.site.blockuser(self, expiry, reason, anononly, nocreate, autoblock, noemail, reblock) + self.site.blockuser(self, expiry, reason, anononly, nocreate, + autoblock, noemail, reblock) except pywikibot.data.api.APIError, err: if err.code == 'invalidrange': raise ValueError("%s is not a valid IP range." % self.username) @@ -2258,7 +2267,7 @@ for contrib in self.site.usercontribs( user=self.username, namespaces=namespaces, total=total): ts = pywikibot.Timestamp.fromISOformat(contrib['timestamp']) - yield (Page(self.site, contrib['title'], contrib['ns']), \ + yield (Page(self.site, contrib['title'], contrib['ns']), contrib['revid'], ts, contrib.get('comment', None) @@ -2278,7 +2287,7 @@ raise StopIteration for item in self.site.logevents( logtype='upload', user=self.username, total=total): - yield (ImagePage(self.site, item.title().title()), \ + yield (ImagePage(self.site, item.title().title()), unicode(item.timestamp()), item.comment(), item.pageid() > 0 @@ -2401,7 +2410,8 @@ self.descriptions = {} if 'descriptions' in self._content: for lang in self._content['descriptions']: - self.descriptions[lang] = self._content['descriptions'][lang]['value'] + self.descriptions[lang] = self._content[ + 'descriptions'][lang]['value'] return {'aliases': self.aliases, 'labels': self.labels, @@ -2525,7 +2535,8 @@ @return: ItemPage """ repo = page.site.data_repository() - if hasattr(page, '_pageprops') and page.properties().get('wikibase_item'): + if hasattr(page, + '_pageprops') and page.properties().get('wikibase_item'): # If we have already fetched the pageprops for something else, # we already have the id, so use it return cls(repo, page.properties().get('wikibase_item')) @@ -2566,11 +2577,13 @@ self.sitelinks = {} if 'sitelinks' in self._content: for dbname in self._content['sitelinks']: - #Due to issues with locked/obsolete sites - #this part is commented out - #site = self.__make_site(dbname) - #self.sitelinks[site] = pywikibot.Page(site, self._content['sitelinks'][dbname]['title']) - self.sitelinks[dbname] = self._content['sitelinks'][dbname]['title'] + # Due to issues with locked/obsolete sites + # this part is commented out +## site = self.__make_site(dbname) +## self.sitelinks[site] = pywikibot.Page( +## site, self._content['sitelinks'][dbname]['title']) + self.sitelinks[dbname] = self._content[ + 'sitelinks'][dbname]['title'] return {'aliases': self.aliases, 'labels': self.labels, @@ -2589,10 +2602,12 @@ """ if not hasattr(self, 'sitelinks'): self.get() - if family is not None and not isinstance(family, pywikibot.family.Family): + if family is not None and not isinstance(family, + pywikibot.family.Family): family = pywikibot.site.Family(family) for dbname in self.sitelinks: - pg = Page(pywikibot.site.APISite.fromDBName(dbname), self.sitelinks[dbname]) + pg = Page(pywikibot.site.APISite.fromDBName(dbname), + self.sitelinks[dbname]) if family is None or family == pg.site.family: yield pg @@ -2779,14 +2794,16 @@ if claim.getSnakType() == 'value': if claim.getType() == 'wikibase-item': claim.target = ItemPage(site, 'Q' + - str(data['mainsnak']['datavalue']['value']['numeric-id'])) + str(data['mainsnak']['datavalue'] + ['value']['numeric-id'])) elif claim.getType() == 'commonsMedia': claim.target = ImagePage(site.image_repository(), 'File:' + - data['mainsnak']['datavalue']['value']) + data['mainsnak']['datavalue']['value']) elif claim.getType() == 'globecoordinate': - claim.target = pywikibot.Coordinate.fromWikibase(data['mainsnak']['datavalue']['value'], site) + claim.target = pywikibot.Coordinate.fromWikibase( + data['mainsnak']['datavalue']['value'], site) else: - #This covers string, url types + # This covers string, url types claim.target = data['mainsnak']['datavalue']['value'] if 'rank' in data: # References/Qualifiers don't have ranks claim.rank = data['rank'] @@ -2798,7 +2815,6 @@ for qualifier in data['qualifiers'][prop]: qual = Claim.qualifierFromJSON(site, qualifier) claim.qualifiers[prop].append(qual) - return claim @staticmethod @@ -2811,7 +2827,8 @@ source = collections.defaultdict(list) for prop in data['snaks'].values(): for claimsnak in prop: - claim = Claim.fromJSON(site, {'mainsnak': claimsnak, 'hash': data['hash']}) + claim = Claim.fromJSON(site, {'mainsnak': claimsnak, + 'hash': data['hash']}) source[claim.getID()].append(claim) return source @@ -2872,7 +2889,8 @@ if value in ['value', 'somevalue', 'novalue']: self.snaktype = value else: - raise ValueError("snaktype must be 'value', 'somevalue', or 'novalue'.") + raise ValueError( + "snaktype must be 'value', 'somevalue', or 'novalue'.") def getRank(self): return self.rank @@ -2945,7 +2963,8 @@ elif self.getType() == 'globecoordinate': value = self.getTarget().toWikibase() else: - raise NotImplementedError('%s datatype is not supported yet.' % self.getType()) + raise NotImplementedError('%s datatype is not supported yet.' + % self.getType()) return value @@ -3053,7 +3072,8 @@ # This code was adapted from Title.php : secureAndSplit() # if u'\ufffd' in t: - raise pywikibot.Error("Title contains illegal char (\\uFFFD 'REPLACEMENT CHARACTER')") + raise pywikibot.Error( + "Title contains illegal char (\\uFFFD 'REPLACEMENT CHARACTER')") # Replace underscores by spaces t = t.replace(u"_", u" ") -- To view, visit https://gerrit.wikimedia.org/r/94599 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8eb71790f3c762feee1ff7d86fa91eed3be72b32 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Pyfisch <pyfisch(a)googlemail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] (Bug 56347) Enable RandomPageGenerator() and site.randompage... - change (pywikibot/core)
by jenkins-bot (Code Review) 11 Nov '13

11 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: (Bug 56347) Enable RandomPageGenerator() and site.randompages returning more than 10 pages ...................................................................... (Bug 56347) Enable RandomPageGenerator() and site.randompages returning more than 10 pages API random list does not return query-continue. We loop the query until we have our total limit exceeded. It is on programmers side to ensure that duplicate pages are filtered (e.g. via DuplicateFilterPageGenerator()) Change-Id: I496e661486afebf5dc681036c73a454c1b4ff367 --- M pywikibot/data/api.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 5f36019..9e549c4 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -707,6 +707,10 @@ count += 1 if self.limit > 0 and count >= self.limit: return + if self.module == "random" and self.limit: + # "random" module does not return "query-continue" + # now we loop for a new random query + continue if not "query-continue" in self.data: return if not self.continuekey in self.data["query-continue"]: -- To view, visit https://gerrit.wikimedia.org/r/93167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I496e661486afebf5dc681036c73a454c1b4ff367 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits