Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13395 discussions

[Gerrit] improvement; add httplib2 as submodule - setuptools still mi... - change (pywikibot/core)
by DrTrigon (Code Review) 30 Jul '13

30 Jul '13

Hello PywikibotCommitWatcher, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/76352 to review the following change. Change subject: improvement; add httplib2 as submodule - setuptools still missing ...................................................................... improvement; add httplib2 as submodule - setuptools still missing Change-Id: Iec4e2a4525185890546663c8702ad17370fee70c --- M .gitmodules A externals/httplib2 M scripts/blockpageschecker.py M scripts/harvest_template.py M scripts/redirect.py M scripts/tests/test_data_ingestion.py M scripts/tests/test_utils.py M tests/textlib_tests.py 8 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/52/76352/1 diff --git a/.gitmodules b/.gitmodules index 8daccd1..f862971 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "i18n"] path = scripts/i18n url = https://gerrit.wikimedia.org/r/p/pywikibot/i18n.git +[submodule "externals/httplib2"] + path = externals/httplib2 + url = https://github.com/iserko/httplib2.git diff --git a/externals/httplib2 b/externals/httplib2 new file mode 160000 index 0000000..989028e --- /dev/null +++ b/externals/httplib2 +Subproject commit 989028e51d283d04b46884b666d2ccde6452304f diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index 63a891a..8d8f23e 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -61,7 +61,7 @@ # # Distributed under the terms of the MIT license. # -__version__ = '$Id: blockpageschecker.py,v 1.5 2008/04/24 19.40.00 filnik Exp$' +__version__ = '$Id$' # import re, webbrowser diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index 3a187f0..c78b97a 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -19,7 +19,7 @@ # # Distributed under the terms of MIT License. # -__version__ = '$Id: harvest_template.py 11692 2013-06-24 16:55:46Z xqt $' +__version__ = '$Id$' # import re diff --git a/scripts/redirect.py b/scripts/redirect.py index 5082447..bf42437 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -56,7 +56,7 @@ # # Distributed under the terms of the MIT license. # -__version__='$Id: redirect.py 7789 2009-12-17 19:20:12Z xqt $' +__version__='$Id$' # import re import datetime diff --git a/scripts/tests/test_data_ingestion.py b/scripts/tests/test_data_ingestion.py index 346eed6..568a6aa 100644 --- a/scripts/tests/test_data_ingestion.py +++ b/scripts/tests/test_data_ingestion.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- """Unit tests for data_ingestion.py""" -__version__ = '$Id: test_userlib.py 9043 2011-03-13 10:25:08Z xqt $' +__version__ = '$Id$' import os import unittest diff --git a/scripts/tests/test_utils.py b/scripts/tests/test_utils.py index 4899bfb..7895f03 100644 --- a/scripts/tests/test_utils.py +++ b/scripts/tests/test_utils.py @@ -1,7 +1,7 @@ """ Support module for PyWikipediaBot regression tests. """ -__version__ = '$Id: test_utils.py 9197 2011-04-25 08:57:30Z xqt $' +__version__ = '$Id$' import sys diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 7296581..5a4d3f5 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -4,7 +4,7 @@ # # Distributed under the terms of the MIT license. # -__version__ = '$Id: api_tests.py 8238 2010-06-02 13:50:48Z xqt $' +__version__ = '$Id$' try: import mwparserfromhell -- To view, visit https://gerrit.wikimedia.org/r/76352 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec4e2a4525185890546663c8702ad17370fee70c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: PywikibotCommitWatcher <pywikibot-commits(a)lists.wikimedia.org> Gerrit-Reviewer: jenkins-bot

3 10

[Gerrit] .pep8: ignore E122 "continuation line missing ..." - change (pywikibot/core)
by DrTrigon (Code Review) 30 Jul '13

30 Jul '13

DrTrigon has submitted this change and it was merged. Change subject: .pep8: ignore E122 "continuation line missing ..." ...................................................................... .pep8: ignore E122 "continuation line missing ..." E122 continuation line missing indentation or outdented disallows the following: pywikibot.output( u"...some long text that really doesn't fit on the same line" ) because the text is outdented compared to the original function call. Change-Id: I1457f2d3e8cbeacd9bee9fa10fa7924e8dfb949a --- M .pep8 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: DrTrigon: Checked; Looks good to me, approved diff --git a/.pep8 b/.pep8 index 4827278..e52a001 100644 --- a/.pep8 +++ b/.pep8 @@ -1,3 +1,4 @@ [pep8] +ignore = E122 exclude = distribute_setup.py,externals,user-config.py,./scripts/i18n/*,./pywikibot/date.py max_line_length = 256 -- To view, visit https://gerrit.wikimedia.org/r/76731 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1457f2d3e8cbeacd9bee9fa10fa7924e8dfb949a Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> 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: jenkins-bot

1 0

[Gerrit] pep8-ify __init__.py - change (pywikibot/core)
by jenkins-bot (Code Review) 30 Jul '13

30 Jul '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ify __init__.py ...................................................................... pep8-ify __init__.py Change-Id: If983d5b3d94b37d1011aa186194449fa9094bd5d --- M pywikibot/__init__.py 1 file changed, 12 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 12bf9ec..73947ec 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -202,7 +202,6 @@ raise NotImplementedError - def deprecated(instead=None): """Decorator to output a method deprecation warning. @@ -215,7 +214,7 @@ classname = args[0].__class__.__name__ if instead: warning(u"%s.%s is DEPRECATED, use %s instead." - % (classname, funcname, instead)) + % (classname, funcname, instead)) else: warning(u"%s.%s is DEPRECATED." % (classname, funcname)) return method(*args, **kwargs) @@ -223,9 +222,11 @@ return wrapper return decorator + def deprecate_arg(old_arg, new_arg): """Decorator to declare old_arg deprecated and replace it with new_arg""" _logger = "" + def decorator(method): def wrapper(*__args, **__kw): meth_name = method.__name__ @@ -242,9 +243,8 @@ __kw[new_arg] = __kw[old_arg] else: pywikibot.debug( - u"%(old_arg)s argument of %(meth_name)s is deprecated." - % locals(), - _logger) +u"%(old_arg)s argument of %(meth_name)s is deprecated." + % locals(), _logger) del __kw[old_arg] return method(*__args, **__kw) wrapper.__doc__ = method.__doc__ @@ -382,6 +382,7 @@ stopped = False + def stopme(): """Drop this process from the throttle log, after pending threads finish. @@ -394,12 +395,13 @@ if not stopped: pywikibot.debug(u"stopme() called", _logger) + def remaining(): import datetime remainingPages = page_put_queue.qsize() - 1 # -1 because we added a None element to stop the queue remainingSeconds = datetime.timedelta( - seconds=(remainingPages * config.put_throttle)) + seconds=(remainingPages * config.put_throttle)) return (remainingPages, remainingSeconds) page_put_queue.put((None, [], {})) @@ -415,9 +417,8 @@ except KeyboardInterrupt: answer = inputChoice(u"""\ There are %i pages remaining in the queue. Estimated time remaining: %s -Really exit?""" - % remaining(), - ['yes', 'no'], ['y', 'N'], 'N') +Really exit?""" % remaining(), + ['yes', 'no'], ['y', 'N'], 'N') if answer == 'y': return @@ -431,8 +432,8 @@ import atexit atexit.register(stopme) -# Create a separate thread for asynchronous page saves (and other requests) +# Create a separate thread for asynchronous page saves (and other requests) def async_manager(): """Daemon; take requests from the queue and execute them in background.""" while True: @@ -441,6 +442,7 @@ break request(*args, **kwargs) + def async_request(request, *args, **kwargs): """Put a request on the queue, and start the daemon if necessary.""" if not _putthread.isAlive(): -- To view, visit https://gerrit.wikimedia.org/r/76732 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If983d5b3d94b37d1011aa186194449fa9094bd5d 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] pep8-ify bot.py - change (pywikibot/core)
by jenkins-bot (Code Review) 30 Jul '13

30 Jul '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ify bot.py ...................................................................... pep8-ify bot.py Change-Id: Ia080873d497b7647093e707b161c5009d517f57d --- M pywikibot/bot.py 1 file changed, 49 insertions(+), 31 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 355dfec..28c71db 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -14,7 +14,8 @@ # scripts, instead of writing each one from scratch. -import logging, logging.handlers +import logging +import logging.handlers # all output goes thru python std library "logging" module import os import os.path @@ -37,7 +38,7 @@ # search for user interface module in the 'userinterfaces' subdirectory uiModule = __import__("pywikibot.userinterfaces.%s_interface" % config.userinterface, - fromlist=['UI'] ) + fromlist=['UI']) ui = uiModule.UI() @@ -145,6 +146,7 @@ _handlers_initialized = False + def init_handlers(strm=None): """Initialize logging system for terminal-based bots. @@ -190,10 +192,10 @@ # for prompts requiring user response root_logger = logging.getLogger("pywiki") - root_logger.setLevel(DEBUG+1) # all records except DEBUG go to logger + root_logger.setLevel(DEBUG + 1) # all records except DEBUG go to logger if hasattr(root_logger, 'captureWarnings'): - root_logger.captureWarnings(True) # introduced in Python >= 2.7 - root_logger.handlers = [] # remove any old handlers + root_logger.captureWarnings(True) # introduced in Python >= 2.7 + root_logger.handlers = [] # remove any old handlers # configure handler(s) for display to user interface ui.init_handlers(root_logger, **config.userinterface_init_kwargs) @@ -210,10 +212,10 @@ file_handler.setLevel(DEBUG) form = LoggingFormatter( - fmt="%(asctime)s %(caller_file)18s, %(caller_line)4s " - "in %(caller_name)18s: %(levelname)-8s %(message)s", - datefmt="%Y-%m-%d %H:%M:%S" - ) + fmt="%(asctime)s %(caller_file)18s, %(caller_line)4s " + "in %(caller_name)18s: %(levelname)-8s %(message)s", + datefmt="%Y-%m-%d %H:%M:%S" + ) file_handler.setFormatter(form) root_logger.addHandler(file_handler) # Turn on debugging for each component requested by user @@ -250,8 +252,8 @@ # new framework release/revision? (handleArgs needs to be called first) try: log(u'VERSION: %s' % unicode((version.getversion().strip(), - version.getversion_onlinerepo(), - site.live_version()))) + version.getversion_onlinerepo(), + site.live_version()))) except version.ParseError: exception() @@ -310,6 +312,7 @@ # done filching + def logoutput(text, decoder=None, newline=True, _level=INFO, _logger="", **kwargs): """Format output and send to the logging module. @@ -349,6 +352,7 @@ logger.log(_level, text, extra=context, **kwargs) + def output(text, decoder=None, newline=True, toStdout=False, **kwargs): """Output a message to the user via the userinterface. @@ -378,29 +382,36 @@ else: logoutput(text, decoder, newline, INFO, **kwargs) + def stdout(text, decoder=None, newline=True, **kwargs): """Output script results to the user via the userinterface.""" logoutput(text, decoder, newline, STDOUT, **kwargs) + def warning(text, decoder=None, newline=True, **kwargs): """Output a warning message to the user via the userinterface.""" logoutput(text, decoder, newline, WARNING, **kwargs) + def error(text, decoder=None, newline=True, **kwargs): """Output an error message to the user via the userinterface.""" logoutput(text, decoder, newline, ERROR, **kwargs) + def log(text, decoder=None, newline=True, **kwargs): """Output a record to the log file.""" logoutput(text, decoder, newline, VERBOSE, **kwargs) + def critical(text, decoder=None, newline=True, **kwargs): """Output a debug record to the log file.""" logoutput(text, decoder, newline, CRITICAL, **kwargs) + def debug(text, layer, decoder=None, newline=True, **kwargs): """Output a debug record to the log file.""" logoutput(text, decoder, newline, DEBUG, layer, **kwargs) + def exception(msg=None, decoder=None, newline=True, tb=False, **kwargs): """Output an error traceback to the user via the userinterface. @@ -422,7 +433,7 @@ exc_info = 1 else: exc_info = sys.exc_info() - msg = u'%s: %s' % (repr(exc_info[1]).split('(')[0], + msg = u'%s: %s' % (repr(exc_info[1]).split('(')[0], unicode(exc_info[1]).strip()) if tb: kwargs['exc_info'] = exc_info @@ -430,6 +441,7 @@ # User input functions + def input(question, password=False): """Ask the user a question, return the user's answer. @@ -449,6 +461,7 @@ data = ui.input(question, password) return data + def inputChoice(question, answers, hotkeys, default=None): """Ask the user a question with several options, return the user's choice. @@ -478,6 +491,7 @@ # Command line parsing and help + def calledModuleName(): """Return the name of the module calling this function. @@ -491,6 +505,7 @@ # clip off the '.py?' filename extension called = called[:called.rindex('.py')] return os.path.basename(called) + def _decodeArg(arg): if sys.platform == 'win32': @@ -508,6 +523,7 @@ # Linux uses the same encoding for both. # I don't know how non-Western Windows versions behave. return unicode(arg, config.console_encoding) + def handleArgs(*args): """Handle standard command line arguments, return the rest as a list. @@ -537,22 +553,22 @@ if arg == '-help': do_help = True elif arg.startswith('-family:'): - config.family = arg[len("-family:") : ] + config.family = arg[len("-family:"):] elif arg.startswith('-lang:'): - config.mylang = arg[len("-lang:") : ] + config.mylang = arg[len("-lang:"):] elif arg.startswith("-user:"): - username = arg[len("-user:") : ] + username = arg[len("-user:"):] elif arg.startswith('-putthrottle:'): - config.put_throttle = int(arg[len("-putthrottle:") : ]) + config.put_throttle = int(arg[len("-putthrottle:"):]) elif arg.startswith('-pt:'): - config.put_throttle = int(arg[len("-pt:") : ]) + config.put_throttle = int(arg[len("-pt:"):]) elif arg == '-log': if moduleName not in config.log: config.log.append(moduleName) elif arg.startswith('-log:'): if moduleName not in config.log: config.log.append(moduleName) - config.logfilename = arg[len("-log:") : ] + config.logfilename = arg[len("-log:"):] elif arg == '-nolog': if moduleName in config.log: config.log.remove(moduleName) @@ -591,7 +607,7 @@ elif arg.startswith("-debug:"): if moduleName not in config.log: config.log.append(moduleName) - component = arg[len("-debug:") : ] + component = arg[len("-debug:"):] if component not in config.debug_log: config.debug_log.append(component) elif arg == '-verbose' or arg == "-v": @@ -601,7 +617,7 @@ daemonize.daemonize() elif arg.startswith('-daemonize:'): import daemonize - daemonize.daemonize(redirect_std = arg[11:]) + daemonize.daemonize(redirect_std=arg[11:]) else: # the argument depends numerical config settings cmd = [] @@ -623,7 +639,7 @@ if config.verbose_output: import re - ver = pywikibot.__version__ # probably can be improved on + ver = pywikibot.__version__ # probably can be improved on m = re.search(r"\$Id$", ver) pywikibot.output(u'Pywikipediabot r%s' % m.group(1)) pywikibot.output(u'Python %s' % sys.version) @@ -633,6 +649,7 @@ sys.exit(0) pywikibot.debug(u"handleArgs() completed.", _logger) return nonGlobalArgs + def showHelp(name=""): # argument, if given, is ignored @@ -698,7 +715,7 @@ if hasattr(module, 'docuReplacements'): for key, value in module.docuReplacements.iteritems(): helpText = helpText.replace(key, value.strip('\n\r')) - pywikibot.stdout(helpText) # output to STDOUT + pywikibot.stdout(helpText) # output to STDOUT except Exception: if modname: pywikibot.stdout(u'Sorry, no help available for %s' % modname) @@ -716,7 +733,7 @@ # The values are the default values # Extend this in subclasses! availableOptions = { - 'always': False, # ask for confirmation when putting a page? + 'always': False, # ask for confirmation when putting a page? } def __init__(self, **kwargs): @@ -740,7 +757,7 @@ for opt in receivedOptions - validOptions: pywikibot.warning(u'%s is not a valid option. It was ignored.' - % opt) + % opt) def getOption(self, option): """ @@ -761,8 +778,8 @@ * 'always' """ if oldtext == newtext: - pywikibot.output(u'No changes were needed on %s' \ - % page.title(asLink=True)) + pywikibot.output(u'No changes were needed on %s' + % page.title(asLink=True)) return pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" @@ -772,13 +789,14 @@ choice = 'a' if not self.getOption('always'): choice = pywikibot.inputChoice( - u'Do you want to accept these changes?', - ['Yes', 'No', 'All'], - ['y', 'N', 'a'], 'N') + u'Do you want to accept these changes?', + ['Yes', 'No', 'All'], + ['y', 'N', 'a'], + 'N' + ) if choice == 'a': # Remember the choice self.options['always'] = True if choice != 'n': - page.put(newtext, async=(choice=='a')) - + page.put(newtext, async=(choice == 'a')) -- To view, visit https://gerrit.wikimedia.org/r/76733 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia080873d497b7647093e707b161c5009d517f57d 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Add the ability to edit on test.wp and test2.wp - change (pywikibot/core)
by jenkins-bot (Code Review) 30 Jul '13

30 Jul '13

jenkins-bot has submitted this change and it was merged. Change subject: Add the ability to edit on test.wp and test2.wp ...................................................................... Add the ability to edit on test.wp and test2.wp Change-Id: I88f81fb9b20458bef2e3d2c6f21f4a756cbeef77 --- M pywikibot/families/wikipedia_family.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 9c82f10..4213a56 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -41,8 +41,10 @@ 'ny', 'tw', 'ch', 'xh', ] + langs = self.languages_by_size + ['test', 'test2'] # Sites we want to edit but not count as real languages + self.langs = dict([(lang, '%s.wikipedia.org' % lang) - for lang in self.languages_by_size]) + for lang in langs]) self.category_redirect_templates = { -- To view, visit https://gerrit.wikimedia.org/r/76672 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I88f81fb9b20458bef2e3d2c6f21f4a756cbeef77 Gerrit-PatchSet: 1 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

1 0

[Gerrit] pep8-ified scripts/basic.py - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Jul '13

29 Jul '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified scripts/basic.py ...................................................................... pep8-ified scripts/basic.py Change-Id: I4891ad9707671baad61ced71f6d7f7dc8dda13e1 --- M scripts/basic.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/basic.py b/scripts/basic.py index 74e1c70..1d8bfab 100755 --- a/scripts/basic.py +++ b/scripts/basic.py @@ -124,12 +124,13 @@ % (page.title())) except pywikibot.SpamfilterError, error: pywikibot.output( -u'Cannot change %s because of spam blacklist entry %s' + u'Cannot change %s because of spam blacklist entry %s' % (page.title(), error.url)) else: return True return False + def main(): global site # This factory is responsible for processing command line arguments -- To view, visit https://gerrit.wikimedia.org/r/76540 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4891ad9707671baad61ced71f6d7f7dc8dda13e1 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] pep8-ified category.py - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Jul '13

29 Jul '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified category.py ...................................................................... pep8-ified category.py Change-Id: I3586d801f6c678ad7d8dcf9a8025a9ea1eb4c308 --- M scripts/category.py 1 file changed, 72 insertions(+), 65 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category.py b/scripts/category.py index be2ea11..22ef129 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -92,7 +92,10 @@ # Distributed under the terms of the MIT license. # -import os, re, pickle, bz2 +import os +import re +import pickle +import bz2 import pywikibot from pywikibot import catlib, config, pagegenerators from pywikibot import i18n @@ -104,14 +107,14 @@ } cfd_templates = { - 'wikipedia' : { - 'en':[u'cfd', u'cfr', u'cfru', u'cfr-speedy', u'cfm', u'cfdu'], - 'fi':[u'roskaa', u'poistettava', u'korjattava/nimi', u'yhdistettäväLuokka'], - 'he':[u'הצבעת מחיקה', u'למחוק'], - 'nl':[u'categorieweg', u'catweg', u'wegcat', u'weg2'] + 'wikipedia': { + 'en': [u'cfd', u'cfr', u'cfru', u'cfr-speedy', u'cfm', u'cfdu'], + 'fi': [u'roskaa', u'poistettava', u'korjattava/nimi', u'yhdistettäväLuokka'], + 'he': [u'הצבעת מחיקה', u'למחוק'], + 'nl': [u'categorieweg', u'catweg', u'wegcat', u'weg2'] }, - 'commons' : { - 'commons':[u'cfd', u'move'] + 'commons': { + 'commons': [u'cfd', u'move'] } } @@ -122,7 +125,7 @@ over and over again ''' - def __init__(self, rebuild = False, filename = 'category.dump.bz2'): + def __init__(self, rebuild=False, filename='category.dump.bz2'): if rebuild: self.rebuild() else: @@ -144,8 +147,8 @@ self.rebuild() def rebuild(self): - self.catContentDB={} - self.superclassDB={} + self.catContentDB = {} + self.superclassDB = {} def getSubcats(self, supercat): '''For a given supercategory, return a list of Categorys for all its @@ -189,7 +192,7 @@ self.superclassDB[subcat] = supercatset return supercatset - def dump(self, filename = 'category.dump.bz2'): + def dump(self, filename='category.dump.bz2'): '''Saves the contents of the dictionaries superclassDB and catContentDB to disk. @@ -259,8 +262,7 @@ # pull last part of the name to the beginning, and append the # rest after a comma; e.g., "John von Neumann" becomes # "Neumann, John von" - sorted_key = split_string[-1] + ', ' + \ - ' '.join(split_string[:-1]) + sorted_key = split_string[-1] + ', ' + ' '.join(split_string[:-1]) # give explicit sort key return pywikibot.Page(site, catlink.title() + '|' + sorted_key) else: @@ -270,8 +272,7 @@ self.newcatTitle = pywikibot.input( u'Category to add (do not give namespace):') if not self.site.nocapitalize: - self.newcatTitle = self.newcatTitle[:1].upper() + \ - self.newcatTitle[1:] + self.newcatTitle = self.newcatTitle[:1].upper() + self.newcatTitle[1:] if not self.editSummary: self.editSummary = i18n.twtranslate(self.site, 'category-adding', {'newcat': self.newcatTitle}) @@ -310,7 +311,7 @@ if text != page.get(): # show what was changed pywikibot.showDiff(page.get(), text) - pywikibot.output(u'Comment: %s' %comment) + pywikibot.output(u'Comment: %s' % comment) if not self.dry: if not self.always: confirm = 'y' @@ -325,7 +326,8 @@ if confirm == 'y': self.always = True break - else: break + else: + break if self.always or choice == 'y': try: # Save the page @@ -340,7 +342,7 @@ % (page.title())) except pywikibot.SpamfilterError, error: pywikibot.output( -u'Cannot change %s because of spam blacklist entry %s' + u'Cannot change %s because of spam blacklist entry %s' % (page.title(), error.url)) else: return True @@ -398,23 +400,27 @@ newcat_contents = set(newCat.members()) # set edit summary message if not self.editSummary: - self.editSummary = i18n.twtranslate(site, 'category-replacing',\ - {'oldcat':self.oldCat.title(), - 'newcat':newCat.title()}) + self.editSummary = i18n.twtranslate( + site, 'category-replacing', + {'oldcat': self.oldCat.title(), + 'newcat': newCat.title()} + ) # Copy the category contents to the new category page copied = False oldMovedTalk = None if self.oldCat.exists() and self.moveCatPage: copied = self.oldCat.copyAndKeep( - self.newCatTitle, - pywikibot.translate(site, cfd_templates), - i18n.twtranslate(site, 'category-renamed') - ) + self.newCatTitle, + pywikibot.translate(site, cfd_templates), + i18n.twtranslate(site, 'category-renamed') + ) # Also move the talk page if copied: - reason = i18n.twtranslate(site, 'category-was-moved', \ - {'newcat':self.newCatTitle, 'title':self.newCatTitle}) + reason = i18n.twtranslate( + site, 'category-was-moved', + {'newcat': self.newCatTitle, 'title': self.newCatTitle} + ) oldTalk = self.oldCat.toggleTalkPage() if oldTalk.exists(): newTalkTitle = newCat.toggleTalkPage().title() @@ -438,12 +444,12 @@ article.title()): if article in newcat_contents: catlib.change_category(article, self.oldCat, None, - comment=self.editSummary, - inPlace=self.inPlace) + comment=self.editSummary, + inPlace=self.inPlace) else: catlib.change_category(article, self.oldCat, newCat, - comment=self.editSummary, - inPlace=self.inPlace) + comment=self.editSummary, + inPlace=self.inPlace) # Move subcategories gen = pagegenerators.SubCategoriesPageGenerator(self.oldCat, @@ -454,22 +460,24 @@ subcategory.title()): if subcategory in newcat_contents: catlib.change_category(subcategory, self.oldCat, None, - comment=self.editSummary, - inPlace=self.inPlace) + comment=self.editSummary, + inPlace=self.inPlace) else: catlib.change_category(subcategory, self.oldCat, newCat, - comment=self.editSummary, - inPlace=self.inPlace) + comment=self.editSummary, + inPlace=self.inPlace) # Delete the old category and its moved talk page - if copied and self.deleteEmptySourceCat == True: + if copied and self.deleteEmptySourceCat: if self.oldCat.isEmptyCategory(): - reason = i18n.twtranslate(site, 'category-was-moved', \ - {'newcat': self.newCatTitle, 'title': self.newCatTitle}) + reason = i18n.twtranslate( + site, 'category-was-moved', + {'newcat': self.newCatTitle, 'title': self.newCatTitle} + ) confirm = not self.batchMode - self.oldCat.delete(reason, confirm, mark = True) + self.oldCat.delete(reason, confirm, mark=True) if oldMovedTalk is not None: - oldMovedTalk.delete(reason, confirm, mark = True) + oldMovedTalk.delete(reason, confirm, mark=True) else: pywikibot.output('Couldn\'t delete %s - not empty.' % self.oldCat.title()) @@ -477,7 +485,7 @@ class CategoryListifyRobot: '''Creates a list containing all of the members in a category.''' - def __init__(self, catTitle, listTitle, editSummary, overwrite = False, showImages = False, subCats = False, talkPages = False, recurse = False): + def __init__(self, catTitle, listTitle, editSummary, overwrite=False, showImages=False, subCats=False, talkPages=False, recurse=False): self.editSummary = editSummary self.overwrite = overwrite self.showImages = showImages @@ -489,7 +497,7 @@ self.recurse = recurse def run(self): - setOfArticles = set(self.cat.articles(recurse = self.recurse)) + setOfArticles = set(self.cat.articles(recurse=self.recurse)) if self.subCats: setOfArticles = setOfArticles.union(set(self.cat.subcategories())) if not self.editSummary: @@ -547,8 +555,8 @@ pywikibot.output(u'There are no articles in category %s' % self.cat.title()) else: for article in articles: - if not self.titleRegex or re.search(self.titleRegex,article.title()): - catlib.change_category(article, self.cat, None, comment = self.editSummary, inPlace = self.inPlace) + if not self.titleRegex or re.search(self.titleRegex, article.title()): + catlib.change_category(article, self.cat, None, comment=self.editSummary, inPlace=self.inPlace) if self.pagesonly: return @@ -558,7 +566,7 @@ pywikibot.output(u'There are no subcategories in category %s' % self.cat.title()) else: for subcategory in subcategories: - catlib.change_category(subcategory, self.cat, None, comment = self.editSummary, inPlace = self.inPlace) + catlib.change_category(subcategory, self.cat, None, comment=self.editSummary, inPlace=self.inPlace) # Deletes the category page if self.cat.exists() and self.cat.isEmptyCategory(): if self.useSummaryForDeletion and self.editSummary: @@ -604,7 +612,7 @@ self.catDB = catDB self.site = pywikibot.getSite() self.editSummary = i18n.twtranslate(self.site, 'category-changing')\ - % {'oldcat':self.catTitle, 'newcat':u''} + % {'oldcat': self.catTitle, 'newcat': u''} def move_to_category(self, article, original_cat, current_cat): ''' @@ -621,15 +629,15 @@ # Determine a reasonable amount of context to print try: - full_text = article.get(get_redirect = True) + full_text = article.get(get_redirect=True) except pywikibot.NoPage: pywikibot.output(u'Page %s not found.' % article.title()) return try: contextLength = full_text.index('\n\n') - except ValueError: # substring not found + except ValueError: # substring not found contextLength = 500 - if full_text.startswith(u'[['): # probably an image + if full_text.startswith(u'[['): # probably an image # Add extra paragraph. contextLength = full_text.find('\n\n', contextLength+2) if contextLength > 1000 or contextLength < 0: @@ -671,7 +679,7 @@ if current_cat == original_cat: print 'No changes necessary.' else: - catlib.change_category(article, original_cat, current_cat, comment = self.editSummary) + catlib.change_category(article, original_cat, current_cat, comment=self.editSummary) flag = True elif choice in ['j', 'J']: newCatTitle = pywikibot.input(u'Please enter the category the article should be moved to:') @@ -681,7 +689,7 @@ flag = True elif choice in ['r', 'R']: # remove the category tag - catlib.change_category(article, original_cat, None, comment = self.editSummary) + catlib.change_category(article, original_cat, None, comment=self.editSummary) flag = True elif choice == '?': contextLength += 500 @@ -698,7 +706,7 @@ pywikibot.output(u'* %s' % cat.title()) elif choice[0] == 'u': try: - choice=int(choice[1:]) + choice = int(choice[1:]) except ValueError: # user pressed an unknown command. Prompt him again. continue @@ -706,7 +714,7 @@ flag = True else: try: - choice=int(choice) + choice = int(choice) except ValueError: # user pressed an unknown command. Prompt him again. continue @@ -742,7 +750,7 @@ the tree to stdout. ''' - def __init__(self, catTitle, catDB, filename = None, maxDepth = 10): + def __init__(self, catTitle, catDB, filename=None, maxDepth=10): self.catTitle = catTitle self.catDB = catDB if filename and not os.path.isabs(filename): @@ -752,7 +760,7 @@ self.maxDepth = maxDepth self.site = pywikibot.getSite() - def treeview(self, cat, currentDepth = 0, parent = None): + def treeview(self, cat, currentDepth=0, parent=None): ''' Returns a multi-line string which contains a tree view of all subcategories of cat, up to level maxDepth. Recursively calls itself. @@ -786,7 +794,7 @@ if currentDepth < self.maxDepth: for subcat in self.catDB.getSubcats(cat): # recurse into subdirectories - result += self.treeview(subcat, currentDepth + 1, parent = cat) + result += self.treeview(subcat, currentDepth + 1, parent=cat) else: if self.catDB.getSubcats(cat) != []: # show that there are more categories beyond the depth limit @@ -811,7 +819,7 @@ f.write(tree) f.close() else: - pywikibot.output(tree, toStdout = True) + pywikibot.output(tree, toStdout=True) def main(*args): @@ -908,18 +916,17 @@ bot = AddCategory(gen, sort_by_last_name, create_pages, editSummary) bot.run() elif action == 'remove': - if (fromGiven == False): - oldCatTitle = pywikibot.input( -u'Please enter the name of the category that should be removed:') + if not fromGiven: + oldCatTitle = pywikibot.input(u'Please enter the name of the category that should be removed:') bot = CategoryRemoveRobot(oldCatTitle, batchMode, editSummary, useSummaryForDeletion, inPlace=inPlace, pagesonly=pagesonly) bot.run() elif action == 'move': - if (fromGiven == False): + if not fromGiven: oldCatTitle = pywikibot.input( u'Please enter the old name of the category:') - if (toGiven == False): + if not toGiven: newCatTitle = pywikibot.input( u'Please enter the new name of the category:') bot = CategoryMoveRobot(oldCatTitle, newCatTitle, batchMode, @@ -938,10 +945,10 @@ bot = CategoryTreeRobot(catTitle, catDB, filename) bot.run() elif action == 'listify': - if (fromGiven == False): + if not fromGiven: oldCatTitle = pywikibot.input( u'Please enter the name of the category to listify:') - if (toGiven == False): + if not toGiven: newCatTitle = pywikibot.input( u'Please enter the name of the list to create:') bot = CategoryListifyRobot(oldCatTitle, newCatTitle, editSummary, -- To view, visit https://gerrit.wikimedia.org/r/76542 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3586d801f6c678ad7d8dcf9a8025a9ea1eb4c308 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] pep8-ified blockpageschecker.py - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Jul '13

29 Jul '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified blockpageschecker.py ...................................................................... pep8-ified blockpageschecker.py Change-Id: I59561131c125722bd855079eafd161fbc5a21137 --- M scripts/blockpageschecker.py 1 file changed, 74 insertions(+), 70 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index 1507348..920166f 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -64,7 +64,8 @@ __version__ = '$Id$' # -import re, webbrowser +import re +import webbrowser import pywikibot from pywikibot import pagegenerators from pywikibot import config @@ -80,73 +81,72 @@ ################### -- Edit below! -- ################# templateSemiProtection = { - 'en': None, - 'it':[r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccoparziale(?:|[ _]scad\|.*?|\|.*?)\}\}', - r'\{\{(?:[Tt]emplate:|)[Aa]bp(?:|[ _]scad\|(?:.*?))\}\}'], - 'fr': [ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Ss]emi[- ]?protection(|[^\}]*)\}\}'], - 'ja':[ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)半保護(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], - } + 'en': None, + 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccoparziale(?:|[ _]scad\|.*?|\|.*?)\}\}', + r'\{\{(?:[Tt]emplate:|)[Aa]bp(?:|[ _]scad\|(?:.*?))\}\}'], + 'fr': [ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Ss]emi[- ]?protection(|[^\}]*)\}\}'], + 'ja': [ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)半保護(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], +} # Regex to get the total-protection template templateTotalProtection = { - 'en': None, - 'it':[r'\{\{(?:[Tt]emplate:|)[Aa]vvisoblocco(?:|[ _]scad\|(?:.*?)|minaccia|cancellata)\}\}', - r'\{\{(?:[Tt]emplate:|)(?:[Cc][Tt]|[Cc]anc fatte|[Cc][Ee])\}\}', r'<div class="toccolours[ _]itwiki[ _]template[ _]avviso">(?:\s|\n)*?[Qq]uesta pagina'], - 'fr':[ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Pp]rotection(|[^\}]*)\}\}', - ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)(?:[Pp]age|[Aa]rchive|[Mm]odèle) protégée?(|[^\}]*)\}\}'], - 'ja':[ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)保護(?:性急|)(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], - } + 'en': None, + 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisoblocco(?:|[ _]scad\|(?:.*?)|minaccia|cancellata)\}\}', + r'\{\{(?:[Tt]emplate:|)(?:[Cc][Tt]|[Cc]anc fatte|[Cc][Ee])\}\}', + r'<div class="toccolours[ _]itwiki[ _]template[ _]avviso">(?:\s|\n)*?[Qq]uesta pagina'], + 'fr': [ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Pp]rotection(|[^\}]*)\}\}', + ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)(?:[Pp]age|[Aa]rchive|[Mm]odèle) protégée?(|[^\}]*)\}\}'], + 'ja': [ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)保護(?:性急|)(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], +} # Regex to get the semi-protection move template templateSemiMoveProtection = { - 'en': None, - 'it':[r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?|\|.*?)\}\}'], - 'ja':[ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)移動半保護(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], - } + 'en': None, + 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?|\|.*?)\}\}'], + 'ja': [ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)移動半保護(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], +} # Regex to get the total-protection move template templateTotalMoveProtection = { - 'en': None, - 'it':[r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?|\|.*?)\}\}'], - 'ja':[ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)移動保護(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], - } + 'en': None, + 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?|\|.*?)\}\}'], + 'ja': [ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)移動保護(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], +} # If you use only one template for all the type of protection, put it here. # You may use only one template or an unique template and some other "old" template that the # script should still check (as on it.wikipedia) -templateUnique = { - 'en': None, - 'it': [r'\{\{(?:[Tt]emplate:|)[Pp]rotetta\}\}'], +templateUnique = { + 'en': None, + 'it': [r'\{\{(?:[Tt]emplate:|)[Pp]rotetta\}\}'], } # Array: 0 => Semi-block, 1 => Total Block, 2 => Semi-Move, 3 => Total-Move, 4 => template-unique templateNoRegex = { - 'it':['{{Avvisobloccoparziale}}', '{{Avvisoblocco}}', None, None, '{{Protetta}}'], - 'fr':['{{Semi-protection}}', '{{Protection}}', None, None, None], - 'ja':[u'{{半保護}}', u'{{保護}}', u'{{移動半保護}}', u'{{移動保護}}', None], - } + 'it': ['{{Avvisobloccoparziale}}', '{{Avvisoblocco}}', None, None, '{{Protetta}}'], + 'fr': ['{{Semi-protection}}', '{{Protection}}', None, None, None], + 'ja': [u'{{半保護}}', u'{{保護}}', u'{{移動半保護}}', u'{{移動保護}}', None], +} # Category where the bot will check categoryToCheck = { - 'en':[u'Category:Protected'], - 'ar':[u'تصنيف:محتويات محمية'], - 'fr':[u'Category:Page semi-protégée', u'Category:Page protégée', u'Catégorie:Article protégé'], - 'he':[u'קטגוריה:ויקיפדיה: דפים מוגנים', u'קטגוריה:ויקיפדיה: דפים מוגנים חלקית'], - 'it':[u'Categoria:Pagine protette - scadute', u'Categoria:Pagine semiprotette', u'Categoria:Voci protette'], - 'ja':[u'Category:編集保護中の記事',u'Category:編集半保護中の記事', - u'Category:移動保護中の記事',], - 'pt':[u'Category:!Páginas protegidas', u'Category:!Páginas semiprotegidas'], - 'zh':[u'Category:被保护的页面',u'Category:被保護的模板',u'Category:暂时不能移动的页面', - u'Category:被半保护的页面',], - } + 'en': [u'Category:Protected'], + 'ar': [u'تصنيف:محتويات محمية'], + 'fr': [u'Category:Page semi-protégée', u'Category:Page protégée', u'Catégorie:Article protégé'], + 'he': [u'קטגוריה:ויקיפדיה: דפים מוגנים', u'קטגוריה:ויקיפדיה: דפים מוגנים חלקית'], + 'it': [u'Categoria:Pagine protette - scadute', u'Categoria:Pagine semiprotette', u'Categoria:Voci protette'], + 'ja': [u'Category:編集保護中の記事', u'Category:編集半保護中の記事', u'Category:移動保護中の記事'], + 'pt': [u'Category:!Páginas protegidas', u'Category:!Páginas semiprotegidas'], + 'zh': [u'Category:被保护的页面', u'Category:被保護的模板', u'Category:暂时不能移动的页面', u'Category:被半保护的页面'], +} # Comment used when the Bot edits comment = { - 'en':u'Bot: Deleting out-dated template', - 'ar':u'بوت: حذف قالب قديم', - 'fr':u'Robot: Mise à jour des bandeaux de protection', - 'he':u'בוט: מסיר תבנית שעבר זמנה', - 'it':u'Bot: Tolgo o sistemo template di avviso blocco', - 'ja':u'ロボットによる: 保護テンプレート除去', - 'pt':u'Bot: Retirando predefinição de proteção', - 'zh':u'機器人: 移除過期的保護模板', - } + 'en': u'Bot: Deleting out-dated template', + 'ar': u'بوت: حذف قالب قديم', + 'fr': u'Robot: Mise à jour des bandeaux de protection', + 'he': u'בוט: מסיר תבנית שעבר זמנה', + 'it': u'Bot: Tolgo o sistemo template di avviso blocco', + 'ja': u'ロボットによる: 保護テンプレート除去', + 'pt': u'Bot: Retirando predefinição de proteção', + 'zh': u'機器人: 移除過期的保護模板', +} # Check list to block the users that haven't set their preferences project_inserted = ['en', 'fr', 'it', 'ja', 'pt', 'zh'] @@ -154,24 +154,25 @@ #------------------ END PREFERENCES ------------------# ################## -- Edit above! -- ################## + def understandBlock(text, TTP, TSP, TSMP, TTMP, TU): """ Understand if the page is blocked and if it has the right template """ - if TTP != None: - for catchRegex in TTP: # TTP = templateTotalProtection + if TTP is not None: + for catchRegex in TTP: # TTP = templateTotalProtection resultCatch = re.findall(catchRegex, text) if resultCatch: return ('sysop-total', catchRegex) - if TSP != None: + if TSP is not None: for catchRegex in TSP: resultCatch = re.findall(catchRegex, text) if resultCatch: return ('autoconfirmed-total', catchRegex) - if TU != None: + if TU is not None: for catchRegex in TU: resultCatch = re.findall(catchRegex, text) if resultCatch: return ('unique', catchRegex) - if TSMP != None and TTMP != None and TTP != TTMP and TSP != TSMP: + if TSMP is not None and TTMP is not None and TTP != TTMP and TSP != TSMP: for catchRegex in TTMP: resultCatch = re.findall(catchRegex, text) if resultCatch: @@ -183,6 +184,7 @@ # If editable means that we have no regex, won't change anything with this # regex return ('editable', r'\A\n') + def showQuest(site, page): quest = pywikibot.inputChoice(u'Do you want to open the page?', @@ -198,13 +200,16 @@ editor = editarticle.TextEditor() text = editor.edit(page.get()) + def main(): """ Main Function """ # Loading the comments global categoryToCheck, comment, project_inserted # always, define a generator to understand if the user sets one, # defining what's genFactory - always = False; generator = False; show = False + always = False + generator = False + show = False moveBlockCheck = False protectedpages = False protectType = 'edit' @@ -308,7 +313,7 @@ if not editRestr: # page is not edit-protected # Deleting the template because the page doesn't need it. - if TU != None: + if TU is not None: replaceToPerform = u'|'.join(TTP + TSP + TU) else: replaceToPerform = u'|'.join(TTP + TSP) @@ -322,19 +327,19 @@ elif editRestr[0] == 'sysop': # total edit protection - if (TemplateInThePage[0] == 'sysop-total' and TTP != None) or (TemplateInThePage[0] == 'unique' and TU != None): + if (TemplateInThePage[0] == 'sysop-total' and TTP is not None) or (TemplateInThePage[0] == 'unique' and TU is not None): msg = 'The page is protected to the sysop' if not moveBlockCheck: msg += ', skipping...' pywikibot.output(msg) else: pywikibot.output(u'The page is protected to the sysop, but the template seems not correct. Fixing...') - if TU != None: + if TU is not None: text, changes = re.subn(TemplateInThePage[1], TNR[4], text) else: text, changes = re.subn(TemplateInThePage[1], TNR[1], text) - elif TSP != None or TU != None: + elif TSP is not None or TU is not None: # implicitely editRestr[0] = 'autoconfirmed', edit-Semi-protection if TemplateInThePage[0] == 'autoconfirmed-total' or TemplateInThePage[0] == 'unique': msg = 'The page is editable only for the autoconfirmed users' @@ -343,7 +348,7 @@ pywikibot.output(msg) else: pywikibot.output(u'The page is editable only for the autoconfirmed users, but the template seems not correct. Fixing...') - if TU != None: + if TU is not None: text, changes = re.subn(TemplateInThePage[1], TNR[4], text) else: text, changes = re.subn(TemplateInThePage[1], TNR[0], text) @@ -363,7 +368,7 @@ if not moveRestr: pywikibot.output(u'The page is movable for all, deleting the template...') # Deleting the template because the page doesn't need it. - if TU != None: + if TU is not None: replaceToPerform = u'|'.join(TSMP + TTMP + TU) else: replaceToPerform = u'|'.join(TSMP + TTMP) @@ -372,26 +377,26 @@ text, changes = re.subn('(%s)' % replaceToPerform, '', text) elif moveRestr[0] == 'sysop': # move-total-protection - if (TemplateInThePage[0] == 'sysop-move' and TTMP != None) or (TemplateInThePage[0] == 'unique' and TU != None): + if (TemplateInThePage[0] == 'sysop-move' and TTMP is not None) or (TemplateInThePage[0] == 'unique' and TU is not None): pywikibot.output(u'The page is protected from moving to the sysop, skipping...') - if TU != None: - text = oldtext # no changes needed, better to revert the old text. + if TU is not None: + text = oldtext # no changes needed, better to revert the old text. else: pywikibot.output(u'The page is protected from moving to the sysop, but the template seems not correct. Fixing...') - if TU != None: + if TU is not None: text, changes = re.subn(TemplateInThePage[1], TNR[4], text) else: text, changes = re.subn(TemplateInThePage[1], TNR[3], text) - elif TSMP != None or TU != None: + elif TSMP is not None or TU is not None: # implicitely moveRestr[0] = 'autoconfirmed', move-semi-protection if TemplateInThePage[0] == 'autoconfirmed-move' or TemplateInThePage[0] == 'unique': pywikibot.output(u'The page is movable only for the autoconfirmed users, skipping...') - if TU != None: - text = oldtext # no changes needed, better to revert the old text. + if TU is not None: + text = oldtext # no changes needed, better to revert the old text. else: pywikibot.output(u'The page is movable only for the autoconfirmed users, but the template seems not correct. Fixing...') - if TU != None: + if TU is not None: text, changes = re.subn(TemplateInThePage[1], TNR[4], text) else: text, changes = re.subn(TemplateInThePage[1], TNR[2], text) @@ -399,7 +404,6 @@ if changes == 0: # We tried to fix move-protection templates, but it did not work. pywikibot.output('Warning : No move-protection template could be found') - if oldtext != text: # Ok, asking if the change has to be performed and do it if yes. -- To view, visit https://gerrit.wikimedia.org/r/76541 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59561131c125722bd855079eafd161fbc5a21137 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] pep8-ify setup.py - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Jul '13

29 Jul '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ify setup.py ...................................................................... pep8-ify setup.py Change-Id: I3f0c8adfe3632d358e0ba552e608f514d964f7d9 --- M setup.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index 66c5d19..4273db2 100644 --- a/setup.py +++ b/setup.py @@ -34,5 +34,5 @@ import subprocess python = sys.executable -python = python.replace("pythonw.exe", "python.exe") # for Windows +python = python.replace("pythonw.exe", "python.exe") # for Windows ignore = subprocess.call([python, "generate_user_files.py"]) -- To view, visit https://gerrit.wikimedia.org/r/76539 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f0c8adfe3632d358e0ba552e608f514d964f7d9 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] pep8-ify pywikibot/version.py - change (pywikibot/core)
by jenkins-bot (Code Review) 29 Jul '13

29 Jul '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ify pywikibot/version.py ...................................................................... pep8-ify pywikibot/version.py Change-Id: Ia4d7e7009ebbf2416cc1487d9e079d2d8f06f1f9 --- M pywikibot/version.py 1 file changed, 18 insertions(+), 10 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/version.py b/pywikibot/version.py index 431fe2e..9d23b12 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -15,8 +15,10 @@ cache = None + class ParseError(Exception): """ Parsing went wrong """ + def _get_program_dir(): _program_dir = os.path.normpath(os.path.split(os.path.dirname(__file__))[0]) @@ -24,6 +26,7 @@ ## if not os.path.isabs(_program_dir): ## _program_dir = os.path.normpath(os.path.join(os.getcwd(), _program_dir)) return _program_dir + def getversion(): data = getversiondict() @@ -35,10 +38,11 @@ data['cmp_ver'] = 'n/a' return '%(tag)s (r%(rev)s, %(date)s, %(cmp_ver)s)' % data + def getversiondict(): global cache if cache: - return cache + return cache try: (tag, rev, date) = getversion_svn() except Exception: @@ -55,7 +59,8 @@ id, file, rev, date, ts, author, dollar = version.split(' ') tag = 'pywikibot/__init__.py' date = time.strptime('%sT%s' % (date, ts), '%Y-%m-%dT%H:%M:%SZ') - except: # nothing worked; version unknown (but suppress exceptions) + except: + # nothing worked; version unknown (but suppress exceptions) # the value is most likely '$Id' + '$', it means that # wikipedia.py got imported without using svn at all return dict(tag='', rev='-1 (unknown)', date='0 (unknown)') @@ -63,6 +68,7 @@ datestring = time.strftime('%Y/%m/%d, %H:%M:%S', date) cache = dict(tag=tag, rev=rev, date=datestring) return cache + def getversion_svn(path=None): _program_dir = path or _get_program_dir() @@ -74,7 +80,7 @@ from sqlite3 import dbapi2 as sqlite con = sqlite.connect(os.path.join(_program_dir, ".svn/wc.db")) cur = con.cursor() - cur.execute( '''select local_relpath, repos_path, revision, changed_date from nodes order by revision desc, changed_date desc''') + cur.execute('''select local_relpath, repos_path, revision, changed_date from nodes order by revision desc, changed_date desc''') name, tag, rev, date = cur.fetchone() con.close() tag = tag[:-len(name)] @@ -88,25 +94,26 @@ tag = '[%s] %s' % (t[0], t[1]) for i in xrange(4): entries.readline() - date = time.strptime(entries.readline()[:19],'%Y-%m-%dT%H:%M:%S') + date = time.strptime(entries.readline()[:19], '%Y-%m-%dT%H:%M:%S') rev = entries.readline()[:-1] entries.close() if (not date or not tag or not rev) and not path: raise ParseError return (tag, rev, date) + def getversion_nightly(): data = open(os.path.join(wikipediatools.get_base_dir(), 'version')) tag = data.readline().strip() - date = time.strptime(data.readline()[:19],'%Y-%m-%dT%H:%M:%S') + date = time.strptime(data.readline()[:19], '%Y-%m-%dT%H:%M:%S') rev = data.readline().strip() if not date or not tag or not rev: raise ParseError return (tag, rev, date) -## Retrieve revision number of framework online repository's svnroot -# + def getversion_onlinerepo(repo=None): + """ Retrieve revision number of framework online repository's svnroot """ url = repo or 'http://svn.wikimedia.org/svnroot/pywikipedia/trunk/pywikipedia/' rev = None try: @@ -120,10 +127,11 @@ # cmp_ver = lambda a, b, tol=1: {-1: '<', 0: '~', 1: '>'}[cmp((a-b)//tol, 0)] -## Retrieve revision number of file (__version__ variable containing Id tag) -# without importing it (thus can be done for any file) -# + def getfileversion(filename): + """ Retrieve revision number of file (__version__ variable containing Id tag) + without importing it (thus can be done for any file) + """ _program_dir = _get_program_dir() __version__ = None fn = os.path.join(_program_dir, filename) -- To view, visit https://gerrit.wikimedia.org/r/76529 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia4d7e7009ebbf2416cc1487d9e079d2d8f06f1f9 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

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits