jenkins-bot has submitted this change and it was merged.
Change subject: Major pyflakes in pywikibot/
......................................................................
Major pyflakes in pywikibot/
- site contains two newimages(), the latter one of which was broken.
- site.protect added unused errdata values.
- method cap_answerwikipedia does not exist.
- sys._getframe exists for py 2.1+, which is above minimum supported
version.
- compat/ - use __all__ to specify the unused symbols are for export.
Change-Id: Ia0010c878881e30822db6d7e928534ce15670584
---
M pywikibot/bot.py
M pywikibot/compat/catlib.py
M pywikibot/compat/userlib.py
M pywikibot/logentries.py
M pywikibot/site.py
5 files changed, 22 insertions(+), 45 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 074fe7d..fc4ed7f 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -321,25 +321,6 @@
# the user console. debug() takes a required second argument, which is a
# string indicating the debugging layer.
-# next bit filched from 1.5.2's inspect.py
-def currentframe():
- """Return the frame object for the caller's stack
frame."""
- try:
- raise Exception
- except:
- # go back two levels, one for logoutput and one for whatever called it
- return sys.exc_traceback.tb_frame.f_back.f_back
-
-if hasattr(sys, '_getframe'):
- # less portable but more efficient
- currentframe = lambda: sys._getframe(3)
- # frame0 is this lambda, frame1 is logoutput() in this module,
- # frame2 is the convenience function (output(), etc.)
- # so frame3 is whatever called the convenience function
-
-# done filching
-
-
def logoutput(text, decoder=None, newline=True, _level=INFO, _logger="",
**kwargs):
"""Format output and send to the logging module.
@@ -356,7 +337,11 @@
if not _handlers_initialized:
init_handlers()
- frame = currentframe()
+ # frame 0 is logoutput() in this module,
+ # frame 1 is the convenience function (output(), etc.)
+ # frame 2 is whatever called the convenience function
+ frame = sys._getframe(2)
+
module = os.path.basename(frame.f_code.co_filename)
context = {'caller_name': frame.f_code.co_name,
'caller_file': module,
diff --git a/pywikibot/compat/catlib.py b/pywikibot/compat/catlib.py
index a3ed406..27940ff 100644
--- a/pywikibot/compat/catlib.py
+++ b/pywikibot/compat/catlib.py
@@ -20,3 +20,5 @@
def change_category(article, oldCat, newCat, comment=None, sortKey=None,
inPlace=True):
return article.change_category(oldCat, newCat, comment, sortKey, inPlace)
+
+__all__ = ['Category', 'change_category']
diff --git a/pywikibot/compat/userlib.py b/pywikibot/compat/userlib.py
index 6d90419..348b059 100644
--- a/pywikibot/compat/userlib.py
+++ b/pywikibot/compat/userlib.py
@@ -15,3 +15,5 @@
from pywikibot import User
+
+__all__ = ['User']
diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py
index be6d08b..d0e753f 100644
--- a/pywikibot/logentries.py
+++ b/pywikibot/logentries.py
@@ -10,7 +10,7 @@
__version__ = '$Id$'
#
-from pywikibot.exceptions import *
+from pywikibot.exceptions import Error
import pywikibot
_logger = "wiki"
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 2121d66..8aedee8 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -2962,7 +2962,7 @@
% (self.protocol(),
self.hostname(),
captcha["url"]))
- req['captchaword'] = cap_answerwikipedia.input(
+ req['captchaword'] = pywikibot.input(
"Please view CAPTCHA in your browser, "
"then type answer here:")
continue
@@ -3124,7 +3124,7 @@
token=token,
**kwargs)
try:
- result = req.submit()
+ req.submit()
except api.APIError as err:
errdata = {
'site': self,
@@ -3162,7 +3162,7 @@
title=page.title(withSection=False),
reason=summary)
try:
- result = req.submit()
+ req.submit()
except api.APIError as err:
errdata = {
'site': self,
@@ -3216,14 +3216,11 @@
if expiry:
req['expiry'] = expiry
try:
- result = req.submit()
+ req.submit()
except api.APIError as err:
errdata = {
'site': self,
- 'title': page.title(withSection=False),
'user': self.user(),
- 'level-edit': edit,
- 'level-move': move
}
if err.code in self._protect_errors:
raise Error(self._protect_errors[err.code] % errdata)
@@ -3322,16 +3319,6 @@
def linksearch(self, siteurl, limit=None):
"""Backwards-compatible interface to
exturlusage()"""
return self.exturlusage(siteurl, total=limit)
-
- @deprecated('Site().logevents(logtype="upload",...)')
- @deprecate_arg("repeat", None)
- def newimages(self, number=100, lestart=None, leend=None, leuser=None,
- letitle=None):
- """Yield ImagePages from most recent uploads"""
- if isinstance(letitle, basestring):
- letitle = pywikibot.Page(pywikibot.Link(letitle))
- return self.logevents(logtype="upload", total=number, start=lestart,
- end=leend, user=leuser, page=letitle)
def getFilesFromAnHash(self, hash_found=None):
"""Return all images that have the same hash.
@@ -3506,13 +3493,14 @@
"""
# TODO: update docstring
- for event in logevents(self, logtype="upload", user=user,
- start=start, end=end, reverse=reverse,
- step=step, total=total):
- image = pywikibot.ImagePage(self, event['title'])
- date = pywikibot.Timestamp.fromISOformat(event['timestamp'])
- user = event['user']
- comment = event['comment'] or u''
+ for event in self.logevents(logtype="upload", user=user,
+ start=start, end=end, reverse=reverse,
+ step=step, total=total):
+ # event.title() actually returns a Page
+ image = pywikibot.ImagePage(event.title())
+ date = event.timestamp()
+ user = event.user()
+ comment = event.comment() or u''
yield (image, date, user, comment)
@deprecate_arg("number", None)
--
To view, visit
https://gerrit.wikimedia.org/r/142897
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0010c878881e30822db6d7e928534ce15670584
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Hashar <hashar(a)free.fr>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Nullzero <nullzero.free(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>