[Pywikibot-commits] [Gerrit] pep8-ify __init__.py - change (pywikibot/core)

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