Pywikibot-commits July 2014

pywikibot-commits@lists.wikimedia.org

1 participants
116 discussions

[Gerrit] Use test.wikidata as travis default site - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Use test.wikidata as travis default site ...................................................................... Use test.wikidata as travis default site Unit tests should not depend on config default site in order to function correctly. This change ensures that any tests which do depend on the config default site are identified and fixed quickly. The default needs to be a WMF wiki, and wikidata is the most different to the other WMF families as namespace 0 is not wikitext, which should help break tests which are assuming a default site of Wikipedia. Change-Id: Iad16d81f5e993ee320a4b56f670baf5649d16f93 --- M .travis.yml 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 9a89d86..2b8b3a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,9 @@ - touch ~/.pywikibot/user-config.py - echo "import os" >> ~/.pywikibot/user-config.py - - echo "mylang = 'en'" >> ~/.pywikibot/user-config.py - - echo "family = 'wikipedia'" >> ~/.pywikibot/user-config.py - - echo "usernames['wikipedia']['en'] = 'Pywikibot-test'" >> ~/.pywikibot/user-config.py + - echo "mylang = 'test'" >> ~/.pywikibot/user-config.py + - echo "family = 'wikidata'" >> ~/.pywikibot/user-config.py + - echo "usernames['wikidata']['test'] = 'Pywikibot-test'" >> ~/.pywikibot/user-config.py - echo "password_file = os.path.expanduser('~/.pywikibot/passwordfile')" >> ~/.pywikibot/user-config.py - touch ~/.pywikibot/passwordfile -- To view, visit https://gerrit.wikimedia.org/r/142508 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad16d81f5e993ee320a4b56f670baf5649d16f93 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> 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: jenkins-bot <>

9 years, 9 months

[Gerrit] WikibasePage.text causes a TypeError - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: WikibasePage.text causes a TypeError ...................................................................... WikibasePage.text causes a TypeError - WikibasePage.get must accept keyword arguments to match interface of Page.get - add tests for the basic semantics of Page methods when called from ItemPage. Bug: 66120 Change-Id: Ic0e5ffd7526d71ca8d460f29ed37747a0b255930 --- M pywikibot/page.py M tests/wikibase_tests.py 2 files changed, 19 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 917a1bb..87636e4 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2637,7 +2637,7 @@ return False return 'lastrevid' in self._content - def get(self, force=False, *args): + def get(self, force=False, *args, **kwargs): """ Fetch all page data, and cache it. @@ -2839,7 +2839,7 @@ i._title = page.title() return i - def get(self, force=False, *args): + def get(self, force=False, *args, **kwargs): """ Fetch all item data, and cache it. @@ -2847,7 +2847,7 @@ @type force: bool @param args: values of props """ - super(ItemPage, self).get(force=force, *args) + super(ItemPage, self).get(force=force, *args, **kwargs) # claims self.claims = {} diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 5a29ca6..ae2aab9 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -21,6 +21,7 @@ site = pywikibot.Site('en', 'wikipedia') mainpage = pywikibot.Page(pywikibot.page.Link("Main Page", site)) wikidata = site.data_repository() +wikidatatest = pywikibot.Site('test', 'wikidata').data_repository() # fetch a page which is very likely to be unconnected, which doesnt have @@ -303,6 +304,21 @@ self.assertRaises(ValueError, claim.setTarget, pywikibot.WbTime(2001)) +class TestPageMethods(PywikibotTestCase): + """Test cases to test methods of Page() behave correctly with Wikibase""" + + def test_item_save(self): + self.wdp = pywikibot.ItemPage(wikidatatest, 'Q6') + item = self.wdp.data_item() + self.assertRaises(APIError, item.title) + self.assertRaises(pywikibot.PageNotSaved, self.wdp.save) + self.wdp.previousRevision() + self.assertEquals(self.wdp.langlinks(), []) + self.assertEquals(self.wdp.templates(), []) + self.assertFalse(self.wdp.isCategoryRedirect()) + self.wdp.templatesWithParams() + + class TestLinks(PywikibotTestCase): """Test cases to test links stored in Wikidata""" def setUp(self): -- To view, visit https://gerrit.wikimedia.org/r/137310 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic0e5ffd7526d71ca8d460f29ed37747a0b255930 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: 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: jenkins-bot <>

9 years, 9 months

[Gerrit] Fix httplib2 0.6.0 support - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix httplib2 0.6.0 support ...................................................................... Fix httplib2 0.6.0 support - fix httplib2 0.6.0 version string, otherwise StrictVersion fails - add missing SSLHandshakeError Change-Id: Idc58f303ca873075b96f3c78beb73dc11e8f24ab --- M pwb.py M pywikibot/comms/http.py 2 files changed, 15 insertions(+), 3 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/pwb.py b/pwb.py index a375826..c8f0cf8 100644 --- a/pwb.py +++ b/pwb.py @@ -109,15 +109,19 @@ except ImportError as e: print("ImportError: %s" % e) print("Python module httplib2 >= 0.6.0 is required.") - print("Did you clone without --recursive?" + print("Did you clone without --recursive?\n" "Try running 'git submodule update --init'.") sys.exit(1) +# httplib2 0.6.0 was released with __version__ as '$Rev$' +# and no module variable CA_CERTS. +if httplib2.__version__ == '$Rev$' and 'CA_CERTS' not in httplib2.__dict__: + httplib2.__version__ = '0.6.0' from distutils.version import StrictVersion if StrictVersion(httplib2.__version__) < StrictVersion("0.6.0"): print("Python module httplib2 (%s) needs to be 0.6.0 or greater." % httplib2.__file__) - print("Did you clone without --recursive?" + print("Did you clone without --recursive?\n" "Try running 'git submodule update --init'.") sys.exit(1) diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index cae3ab0..95d0cdc 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -33,13 +33,21 @@ sys.exit(1) from distutils.version import StrictVersion +# httplib2 0.6.0 was released with __version__ as '$Rev$' +# and no module variable CA_CERTS. +if httplib2.__version__ == '$Rev$' and 'CA_CERTS' not in httplib2.__dict__: + httplib2.__version__ = '0.6.0' if StrictVersion(httplib2.__version__) < StrictVersion("0.6.0"): print("Error: Python module httplib2 (%s) is not 0.6.0 or greater." % httplib2.__file__) sys.exit(1) if sys.version_info[0] == 2: - from httplib2 import SSLHandshakeError + if 'SSLHandshakeError' in httplib2.__dict__: + from httplib2 import SSLHandshakeError + elif httplib2.__version__ == '0.6.0': + from httplib2 import ServerNotFoundError as SSLHandshakeError + import Queue import urlparse import cookielib -- To view, visit https://gerrit.wikimedia.org/r/141639 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc58f303ca873075b96f3c78beb73dc11e8f24ab Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mineo <themineo(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

[Gerrit] Major pyflakes in pywikibot/ - change (pywikibot/core)

by jenkins-bot (Code Review)

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 <>

9 years, 9 months

[Gerrit] Basic tests for the http module - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Basic tests for the http module ...................................................................... Basic tests for the http module Check to verify that gzip is occurring in the background. Change-Id: I64031f3233174f3d9a59a372e3404742d7bdcfc3 --- A tests/http_tests.py 1 file changed, 53 insertions(+), 0 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/tests/http_tests.py b/tests/http_tests.py new file mode 100644 index 0000000..0063774 --- /dev/null +++ b/tests/http_tests.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +""" +Tests for http module. +""" +# +# (C) Pywikibot team, 2014 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' + + +from pywikibot.comms import http, threadedhttp +from tests.utils import unittest + + +class HttpTestCase(unittest.TestCase): + + def test_get(self): + r = http.request(site=None, uri='http://www.wikipedia.org/') + self.assertIsInstance(r, str) + self.assertTrue('<html lang="mul"' in r) + + def test_request(self): + o = threadedhttp.Http() + r = o.request('http://www.wikipedia.org/') + self.assertIsInstance(r, tuple) + self.assertIsInstance(r[0], dict) + self.assertTrue('status' in r[0]) + self.assertIsInstance(r[0]['status'], str) + self.assertEquals(r[0]['status'], '200') + + self.assertIsInstance(r[1], str) + self.assertTrue('<html lang="mul"' in r[1]) + self.assertEquals(int(r[0]['content-length']), len(r[1])) + + def test_gzip(self): + o = threadedhttp.Http() + r = o.request('http://www.wikipedia.org/') + self.assertTrue('-content-encoding' in r[0]) + self.assertEquals(r[0]['-content-encoding'], 'gzip') + + url = 'https://test.wikidata.org/w/api.php?action=query&meta=siteinfo' + r = o.request(url) + self.assertTrue('-content-encoding' in r[0]) + self.assertEquals(r[0]['-content-encoding'], 'gzip') + + +if __name__ == '__main__': + try: + unittest.main() + except SystemExit: + pass -- To view, visit https://gerrit.wikimedia.org/r/144850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64031f3233174f3d9a59a372e3404742d7bdcfc3 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> 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: jenkins-bot <>

9 years, 9 months

[Gerrit] Refactor common waiting code in throttle.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Refactor common waiting code in throttle.py ...................................................................... Refactor common waiting code in throttle.py Both lag() and __call__() shared the exact same code to wait for some seconds and eventually announce the delay. Refactor the code to a new method throttle.wait(seconds). Change-Id: Id1d34357ec04caac17bea120c0d079ce8a5a3dbe --- M pywikibot/throttle.py 1 file changed, 26 insertions(+), 33 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/throttle.py b/pywikibot/throttle.py index df1fd71..ffd4367 100644 --- a/pywikibot/throttle.py +++ b/pywikibot/throttle.py @@ -229,6 +229,27 @@ return f.close() + def wait(self, seconds): + """Wait for seconds seconds. + + Announce the delay if it exceeds a preset limit. + + """ + if seconds <= 0: + return + + message = (u"Sleeping for %(seconds).1f seconds, %(now)s" % { + 'seconds': seconds, + 'now': time.strftime("%Y-%m-%d %H:%M:%S", + time.localtime()) + }) + if seconds > config.noisysleep: + pywikibot.output(message) + else: + pywikibot.log(message) + + time.sleep(seconds) + def __call__(self, requestsize=1, write=False): """Block the calling program if the throttle time has not expired. @@ -248,24 +269,9 @@ # size of the request. Getting 64 pages at once allows 6 times # the delay time for the server. self.next_multiplicity = math.log(1 + requestsize) / math.log(2.0) - # Announce the delay if it exceeds a preset limit - if wait > 0: - if wait > config.noisysleep: - pywikibot.output( - u"Sleeping for %(wait).1f seconds, %(now)s" - % {'wait': wait, - 'now': time.strftime("%Y-%m-%d %H:%M:%S", - time.localtime()) - }) - else: - pywikibot.log( - u"Sleeping for %(wait).1f seconds, %(now)s" - % {'wait': wait, - 'now': time.strftime("%Y-%m-%d %H:%M:%S", - time.localtime()) - }) - time.sleep(wait) + self.wait(wait) + if write: self.last_write = time.time() else: @@ -287,21 +293,8 @@ delay = min(max(5, lagtime // 2), 120) # account for any time we waited while acquiring the lock wait = delay - (time.time() - started) - if wait > 0: - if wait > config.noisysleep: - pywikibot.output( - u"Sleeping for %(wait).1f seconds, %(now)s" - % {'wait': wait, - 'now': time.strftime("%Y-%m-%d %H:%M:%S", - time.localtime()) - }) - else: - pywikibot.log( - u"Sleeping for %(wait).1f seconds, %(now)s" - % {'wait': wait, - 'now': time.strftime("%Y-%m-%d %H:%M:%S", - time.localtime()) - }) - time.sleep(wait) + + self.wait(wait) + finally: self.lock.release() -- To view, visit https://gerrit.wikimedia.org/r/144323 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id1d34357ec04caac17bea120c0d079ce8a5a3dbe Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Hashar <hashar(a)free.fr> 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: jenkins-bot <>

9 years, 9 months

[Gerrit] Remove warning from docstring in blockpageschecker - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Remove warning from docstring in blockpageschecker ...................................................................... Remove warning from docstring in blockpageschecker The warning is not valid as the necessary 'preferences' are not user preferences, but are per wiki configuration, and that configuration is in place for six wikis which are listed in variable 'project_inserted'. A warning is given when the script is run with a different language code. The IRC channel name is out of date, and directions on where to seek help should be provided for the entire package rather than in an individual script docstring. Change-Id: I2a76b4e813ba3bc5d9cb00a89075a4f095c586fa --- M scripts/blockpageschecker.py 1 file changed, 0 insertions(+), 7 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/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index 44a595a..770d906 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -37,13 +37,6 @@ -move The bot will check if the page is blocked also for the move option, not only for edit ---- Warning! --- -You have to edit this script in order to add your preferences -otherwise the script won't work! - -If you have problems, ask on botwiki ( http://botwiki.sno.cc/wiki/Main_Page ) -or on IRC (#pywikipediabot) - --- Example of how to use the script --- python blockpageschecker.py -always -- To view, visit https://gerrit.wikimedia.org/r/147019 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2a76b4e813ba3bc5d9cb00a89075a4f095c586fa Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> 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: jenkins-bot <>

9 years, 9 months

[Gerrit] document changes in standards for command-line arguments - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: document changes in standards for command-line arguments ...................................................................... document changes in standards for command-line arguments scripts that use unnamed arguments to build page titles (often through lists named titleParts or pageTitle) are going to change: http://lists.wikimedia.org/pipermail/pywikipedia-l/2014-June/008905.html also fixed a typo Change-Id: I3d0c64bd0f4aac2a2c3cf375d84e77cb364868ad --- M README-conversion.txt 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/README-conversion.txt b/README-conversion.txt index c034db8..b344c33 100644 --- a/README-conversion.txt +++ b/README-conversion.txt @@ -42,7 +42,7 @@ pwb.py maintenance/compat2core [<script to convert>] and follow the instructions and hints. -== Python librairies == +== Python libraries == [Note: the goal will be to package pywikibot with setuptools easy_install, so that these dependencies will be loaded automatically when the package is @@ -128,4 +128,16 @@ - contributions(): returns a pywikibot.Timestamp object instead of a Mediawiki one +=== Command-line arguments === + +Scripts that supported unnamed arguments as titles of pages on which to work, +now require that those titles be written as standard pagegenerators, e.g.: + + python script.py -page:"A title" + +while unlink.py and other scripts that required page titles as main arguments +now need only that the titles be wrapped in quotes, as: + + python unlink.py "A title" + # MORE TO COME # -- To view, visit https://gerrit.wikimedia.org/r/147420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d0c64bd0f4aac2a2c3cf375d84e77cb364868ad Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

[Gerrit] initialize Property directly with datatype - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: initialize Property directly with datatype ...................................................................... initialize Property directly with datatype the datatype is requested to the API only if the serialized snak doesn't contain one, to speed things up. since Claim.fromJSON() tries to detect the datatype from the snak, snaks that reference deleted properties can be serialized correctly bug: 54235 Change-Id: I9a36503d165f66fbb6f47985db9798dc1bb9a9a7 --- M pywikibot/page.py 1 file changed, 14 insertions(+), 5 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index c45d5b4..eb6de8c 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -3021,10 +3021,18 @@ 'quantity': pywikibot.WbQuantity, } - def __init__(self, site, id=None): - """Constructor.""" + def __init__(self, site, id=None, datatype=None): + """ + Constructor. + + @param datatype: datatype of the property; + if not given, it will be queried via the API + @type datatype: basestring + """ self.repo = site self.id = id.upper() + if datatype: + self._type = datatype @property def type(self): @@ -3132,7 +3140,7 @@ """ def __init__(self, site, pid, snak=None, hash=None, isReference=False, - isQualifier=False): + isQualifier=False, **kwargs): """ Constructor. @@ -3146,7 +3154,7 @@ @param isReference: whether specified claim is a reference @param isQualifier: whether specified claim is a qualifier """ - Property.__init__(self, site, pid) + Property.__init__(self, site, pid, **kwargs) self.snak = snak self.hash = hash self.isReference = isReference @@ -3170,7 +3178,8 @@ @return: Claim """ - claim = Claim(site, data['mainsnak']['property']) + claim = Claim(site, data['mainsnak']['property'], + datatype=data['mainsnak'].get('datatype', None)) if 'id' in data: claim.snak = data['id'] elif 'hash' in data: -- To view, visit https://gerrit.wikimedia.org/r/137737 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9a36503d165f66fbb6f47985db9798dc1bb9a9a7 Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> 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: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

[Gerrit] hugely refactor commons_link.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: hugely refactor commons_link.py ...................................................................... hugely refactor commons_link.py - use default GeneratorFactory - reduce code repetitions by merging .pages() and .categories() - (bugfix) do not add implicit categories back into the text - CommonsLinkBot extends pywikibot.Bot and uses self.userPut() (with built-in 'always' option) - translated edit summaries now follow the page language - remove obsolete script name from showHelp Change-Id: Iad89d280890938b2d2dbaf1a127e62bb41ea618e --- M scripts/commons_link.py 1 file changed, 75 insertions(+), 146 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/commons_link.py b/scripts/commons_link.py index acc34cc..fdc0950 100644 --- a/scripts/commons_link.py +++ b/scripts/commons_link.py @@ -1,8 +1,7 @@ #!/usr/bin/python -# coding: utf-8 - +# -*- coding: utf-8 -*- """ -Include commons template in home wiki. +Include Commons template in home wiki. This bot functions mainly in the en.wikipedia, because it compares the names of articles and category in English @@ -11,18 +10,14 @@ redirect, this also functions. Run: -Syntax: python commons_link.py action [-option] +Syntax: python commons_link.py [action] [pagegenerator] where action can be one of these: * pages : Run over articles, include {{commons}} * categories : Run over categories, include {{commonscat}} -and option can be one of these: - * -cat : Work on all pages which are in a specific category. - * -ref : Work on all pages that link to a certain page. - * -link : Work on all pages that are linked from a certain page. - * -start : Work on all pages on the home wiki, starting at the named page. - * -page : Work on one page. +and pagegenerator can be one of these: +&params; """ # @@ -34,172 +29,106 @@ # Ported by Geoffrey "GEOFBOT" Mon for Google Code-In 2013 # User:Sn1per # + + __version__ = '$Id$' import re import pywikibot -from pywikibot import pagegenerators, i18n +from pywikibot import textlib, pagegenerators, i18n, Bot + +docuReplacements = { + '&params;': pagegenerators.parameterHelp, +} -class CommonsLinkBot: - def __init__(self, generator, acceptall=False): +class CommonsLinkBot(Bot): + def __init__(self, generator, **kwargs): + self.availableOptions.update({ + 'action': None, + }) + super(CommonsLinkBot, self).__init__(**kwargs) + self.generator = generator - self.acceptall = acceptall + self.findTemplate = re.compile(ur'\{\{[Ss]isterlinks') + self.findTemplate2 = re.compile(ur'\{\{[Cc]ommonscat') + self.findTemplate3 = re.compile(ur'\{\{[Cc]ommons') - def pages(self): + def run(self): + if not all((self.getOption('action'), self.generator)): + return + catmode = (self.getOption('action') == 'categories') for page in self.generator: try: pywikibot.output(u'\n>>>> %s <<<<' % page.title()) - commons = pywikibot.Site().image_repository() - commonspage = pywikibot.Page(commons, page.title()) + commons = page.site.image_repository() + commonspage = getattr(pywikibot, + ('Page', 'Category')[catmode] + )(commons, page.title()) try: - getcommons = commonspage.text - if page.title() == commonspage.title(): + getcommons = commonspage.get(get_redirect=True) + pagetitle = commonspage.title(withNamespace=not catmode) + if page.title() == pagetitle: oldText = page.get() text = oldText - # for commons template - findTemplate = re.compile(ur'\{\{[Cc]ommonscat') - s = findTemplate.search(text) - findTemplate2 = re.compile(ur'\{\{[Ss]isterlinks') - s2 = findTemplate2.search(text) + # for Commons/Commonscat template + s = self.findTemplate.search(text) + s2 = getattr(self, 'findTemplate%d' + % (2, 3)[catmode]).search(text) if s or s2: pywikibot.output(u'** Already done.') else: - text = pywikibot.replaceCategoryLinks( - text + u'{{commons|%s}}' % commonspage.title(), - list(page.categories())) - if oldText != text: - pywikibot.showDiff(oldText, text) - if not self.acceptall: - choice = pywikibot.inputChoice( - u'Do you want to accept these changes?', - ['Yes', 'No', 'All'], ['y', 'N', 'a'], - 'N') - if choice == 'a': - self.acceptall = True - if self.acceptall or choice == 'y': - try: - msg = i18n.twtranslate( - pywikibot.Site(), 'commons_link-template-added') - page.put(text, msg) - except pywikibot.EditConflict: - pywikibot.output( - u'Skipping %s because of edit ' - u'conflict' - % (page.title())) + cats = textlib.getCategoryLinks(text, site=page.site) + text = textlib.replaceCategoryLinks( + u'%s{{commons%s|%s}}' + % (text, ('', 'cat')[catmode], pagetitle), + cats) + comment = i18n.twtranslate(page.site, + 'commons_link%s-template-added' + % ('', '-cat')[catmode]) + try: + self.userPut(page, oldText, text, comment=comment) + except pywikibot.EditConflict: + pywikibot.output( + u'Skipping %s because of edit conflict' + % page.title()) except pywikibot.NoPage: - pywikibot.output(u'Page does not exist in Commons!') + pywikibot.output(u'%s does not exist in Commons' + % page.__class__.__name__) except pywikibot.NoPage: - pywikibot.output(u'Page %s does not exist?!' % page.title()) + pywikibot.output(u'Page %s does not exist' % page.title()) except pywikibot.IsRedirectPage: pywikibot.output(u'Page %s is a redirect; skipping.' % page.title()) except pywikibot.LockedPage: - pywikibot.output(u'Page %s is locked?!' % page.title()) - - def categories(self): - for page in self.generator: - try: - pywikibot.output(u'\n>>>> %s <<<<' % page.title()) - commons = pywikibot.Site().image_repository() - commonsCategory = pywikibot.Category(commons, - 'Category:%s' % page.title()) - try: - getcommonscat = commonsCategory.text - commonsCategoryTitle = commonsCategory.title() - categoryname = commonsCategoryTitle.split('Category:', 1)[1] - if page.title() == categoryname: - oldText = page.get() - text = oldText - - # for commonscat template - findTemplate = re.compile(ur'\{\{[Cc]ommons') - s = findTemplate.search(text) - findTemplate2 = re.compile(ur'\{\{[Ss]isterlinks') - s2 = findTemplate2.search(text) - if s or s2: - pywikibot.output(u'** Already done.') - else: - text = pywikibot.replaceCategoryLinks( - text + u'{{commonscat|%s}}' % categoryname, - list(page.categories())) - if oldText != text: - pywikibot.showDiff(oldText, text) - if not self.acceptall: - choice = pywikibot.inputChoice( - u'Do you want to accept these changes?', - ['Yes', 'No', 'All'], ['y', 'N', 'a'], - 'N') - if choice == 'a': - self.acceptall = True - if self.acceptall or choice == 'y': - try: - msg = i18n.twtranslate( - pywikibot.Site(), 'commons_link-cat-template-added') - page.put(text, msg) - except pywikibot.EditConflict: - pywikibot.output( - u'Skipping %s because of edit ' - u'conflict' - % (page.title())) - - except pywikibot.NoPage: - pywikibot.output(u'Category does not exist in Commons!') - - except pywikibot.NoPage: - pywikibot.output(u'Page %s does not exist?!' % page.title()) - except pywikibot.IsRedirectPage: - pywikibot.output(u'Page %s is a redirect; skipping.' - % page.title()) - except pywikibot.LockedPage: - pywikibot.output(u'Page %s is locked?!' % page.title()) + pywikibot.output(u'Page %s is locked' % page.title()) def main(): - singlepage = [] - gen = None - start = None - action = None - for arg in pywikibot.handleArgs(): - if arg == ('pages'): - action = 'pages' - elif arg == ('categories'): - action = 'categories' - elif arg.startswith('-start:'): - start = pywikibot.Page(pywikibot.Site(), arg[7:]) - gen = pagegenerators.AllpagesPageGenerator( - start.title(withNamespace=False), - namespace=start.namespace(), - includeredirects=False) - elif arg.startswith('-cat:'): - cat = pywikibot.Category(pywikibot.Site(), - 'Category:%s' % arg[5:]) - gen = pagegenerators.CategorizedPageGenerator(cat) - elif arg.startswith('-ref:'): - ref = pywikibot.Page(pywikibot.Site(), arg[5:]) - gen = pagegenerators.ReferringPageGenerator(ref) - elif arg.startswith('-link:'): - link = pywikibot.Page(pywikibot.Site(), arg[6:]) - gen = pagegenerators.LinkedPageGenerator(link) - elif arg.startswith('-page:'): - singlepage = pywikibot.Page(pywikibot.Site(), arg[6:]) - gen = iter([singlepage]) - #else: - #bug + options = {} - if action == 'pages': - preloadingGen = pagegenerators.PreloadingGenerator(gen) - bot = CommonsLinkBot(preloadingGen, acceptall=False) - bot.pages() - elif action == 'categories': - preloadingGen = pagegenerators.PreloadingGenerator(gen) - bot = CommonsLinkBot(preloadingGen, acceptall=False) - bot.categories() - else: - pywikibot.showHelp(u'commons_link') + local_args = pywikibot.handleArgs() + genFactory = pagegenerators.GeneratorFactory() + + for arg in local_args: + if arg in ('pages', 'categories'): + options['action'] = arg + elif arg == '-always': + options['always'] = True + else: + genFactory.handleArg(arg) + + if 'action' in options: + gen = genFactory.getCombinedGenerator() + if gen: + gen = pagegenerators.PreloadingGenerator(gen) + bot = CommonsLinkBot(gen, **options) + bot.run() + return + pywikibot.showHelp() if __name__ == "__main__": -- To view, visit https://gerrit.wikimedia.org/r/139036 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad89d280890938b2d2dbaf1a127e62bb41ea618e Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 9 months

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits July 2014