Pywikibot-commits February 2014

pywikibot-commits@lists.wikimedia.org

1 participants
75 discussions

[Gerrit] (bug 55127) Implement network timeouts - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: (bug 55127) Implement network timeouts ...................................................................... (bug 55127) Implement network timeouts A hung connection will now raise an SSLError (or equivalent for HTTP connections) after 120 seconds (config.socket_timeout) Change-Id: Ief38beaf912d4dd1c267eff46e2b73bff8edc447 --- M pywikibot/comms/threadedhttp.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py index 90d4de7..0447b77 100644 --- a/pywikibot/comms/threadedhttp.py +++ b/pywikibot/comms/threadedhttp.py @@ -150,6 +150,8 @@ will be used when not supplied. @param max_redirects: (optional) The maximum number of redirects to follow. 5 is default. + @param timeout: (optional) Socket timeout in seconds. Default is + config.socket_timeout. Disable with None. """ try: @@ -163,6 +165,7 @@ self.max_redirects = kwargs.pop('max_redirects', 5) if len(args) < 3: kwargs.setdefault('proxy_info', config.proxy) + kwargs.setdefault('timeout', config.socket_timeout) httplib2.Http.__init__(self, *args, **kwargs) def request(self, uri, method="GET", body=None, headers=None, -- To view, visit https://gerrit.wikimedia.org/r/110853 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ief38beaf912d4dd1c267eff46e2b73bff8edc447 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

10 years, 2 months

[Gerrit] Revert "convert html text to unicode, read charset, use utf-... - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Revert "convert html text to unicode, read charset, use utf-8 by default" ...................................................................... Revert "convert html text to unicode, read charset, use utf-8 by default" New bug: Retrieving 50 pages from wikipedia:en. ERROR: Traceback (most recent call last): File "C:\pwb\core\pywikibot\data\api.py", line 291, in submit body=paramstring) File "C:\pwb\core\pywikibot\comms\http.py", line 156, in request text = unicode(text, charset, errors='strict') LookupError: unknown encoding: \ WARNING: Waiting 5 seconds before retrying. ERROR: Traceback (most recent call last): File "C:\pwb\core\pywikibot\data\api.py", line 291, in submit body=paramstring) File "C:\pwb\core\pywikibot\comms\http.py", line 156, in request text = unicode(text, charset, errors='strict') LookupError: unknown encoding: \ WARNING: Waiting 10 seconds before retrying. This reverts commit 3a258d28d608c55e9113c4aa36061927d0b054fa. Change-Id: Ife8f24b20eeb22302c915b32d0cd106d83903e1d --- M pywikibot/comms/http.py 1 file changed, 3 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index e9bc57f..6a4c287 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -13,7 +13,7 @@ """ # -# (C) Pywikipedia bot team, 2008-2014 +# (C) Pywikipedia bot team, 2007 # # Distributed under the terms of the MIT license. # @@ -24,7 +24,6 @@ import urllib import logging import atexit -import re try: from httplib2 import SSLHandshakeError @@ -147,11 +146,5 @@ if request.data[0].status != 200: pywikibot.warning(u"Http response status %(status)s" % {'status': request.data[0].status}) - text = request.data[1] - # Convert text to Unicode - try: - charset = re.findall('charset=([^\'\";]+)', text)[0] - except IndexError: - charset = 'utf-8' # default - text = unicode(text, charset, errors='strict') - return text + + return request.data[1] -- To view, visit https://gerrit.wikimedia.org/r/110852 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife8f24b20eeb22302c915b32d0cd106d83903e1d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

10 years, 2 months

[Gerrit] (Bug 60406) - site.loadrevisions(): None is returned if no P... - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: (Bug 60406) - site.loadrevisions(): None is returned if no Page param is passed ...................................................................... (Bug 60406) - site.loadrevisions(): None is returned if no Page param is passed API params passed to API.Generator in keywd dict instead of modifying gen.request.param. Change-Id: Ia6bd0f191070c51ae0f7c0e945870a462f1640ec --- M pywikibot/site.py M tests/site_tests.py 2 files changed, 74 insertions(+), 49 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index e3b505b..20ee4bb 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -1833,14 +1833,14 @@ **cmargs) return cmgen - def loadrevisions(self, page=None, getText=False, revids=None, + def loadrevisions(self, page, getText=False, revids=None, startid=None, endid=None, starttime=None, endtime=None, rvdir=None, user=None, excludeuser=None, section=None, sysop=False, step=None, total=None): """Retrieve and store revision information. By default, retrieves the last (current) revision of the page, - I{unless} any of the optional parameters revids, startid, endid, + unless any of the optional parameters revids, startid, endid, starttime, endtime, rvdir, user, excludeuser, or limit are specified. Unless noted below, all parameters not specified default to False. @@ -1857,9 +1857,9 @@ (getText must be True); section must be given by number (top of the article is section 0), not name @type section: int - @param revids: retrieve only the specified revision ids (required - unless page is specified) - @type revids: list of ints + @param revids: retrieve only the specified revision ids (raise + Exception if any of revids does not correspond to page + @type revids: an int, a str or a list of ints or strings @param startid: retrieve revisions starting with this revid @param endid: stop upon retrieving this revid @param starttime: retrieve revisions starting at this Timestamp @@ -1884,9 +1884,6 @@ total is None) # if True, retrieving current revision # check for invalid argument combinations - if page is None and revids is None: - raise ValueError( - "loadrevisions: either page or revids argument required") if (startid is not None or endid is not None) and \ (starttime is not None or endtime is not None): raise ValueError( @@ -1906,54 +1903,56 @@ raise ValueError( "loadrevisions: endid > startid with rvdir=False") - # assemble API request + rvargs = dict(type_arg=u"info|revisions") + + if getText: + rvargs[u"rvprop"] = u"ids|flags|timestamp|user|comment|content" + if section is not None: + rvargs[u"rvsection"] = unicode(section) + if revids is None: rvtitle = page.title(withSection=False).encode(self.encoding()) - rvgen = self._generator(api.PropertyGenerator, - type_arg=u"info|revisions", - titles=rvtitle, step=step, total=total) + rvargs[u"titles"] = rvtitle else: if isinstance(revids, (int, basestring)): ids = unicode(revids) else: ids = u"|".join(unicode(r) for r in revids) - rvgen = self._generator(api.PropertyGenerator, - type_arg=u"info|revisions", revids=ids, - step=step, total=total) - if getText: - rvgen.request[u"rvprop"] = u"ids|flags|timestamp|user|comment|content" - if section is not None: - rvgen.request[u"rvsection"] = unicode(section) + rvargs[u"revids"] = ids + + if rvdir: + rvargs[u"rvdir"] = u"newer" + elif rvdir is not None: + rvargs[u"rvdir"] = u"older" + if startid: + rvargs[u"rvstartid"] = startid + if endid: + rvargs[u"rvendid"] = endid + if starttime: + rvargs[u"rvstart"] = str(starttime) + if endtime: + rvargs[u"rvend"] = str(endtime) + if user: + rvargs[u"rvuser"] = user + elif excludeuser: + rvargs[u"rvexcludeuser"] = excludeuser + # TODO if sysop: something + + # assemble API request + rvgen = self._generator(api.PropertyGenerator, + step=step, total=total, **rvargs) + if latest or "revids" in rvgen.request: rvgen.set_maximum_items(-1) # suppress use of rvlimit parameter - if rvdir: - rvgen.request[u"rvdir"] = u"newer" - elif rvdir is not None: - rvgen.request[u"rvdir"] = u"older" - if startid: - rvgen.request[u"rvstartid"] = startid - if endid: - rvgen.request[u"rvendid"] = endid - if starttime: - rvgen.request[u"rvstart"] = str(starttime) - if endtime: - rvgen.request[u"rvend"] = str(endtime) - if user: - rvgen.request[u"rvuser"] = user - elif excludeuser: - rvgen.request[u"rvexcludeuser"] = excludeuser - # TODO if sysop: something + for pagedata in rvgen: - if page is not None: - if not self.sametitle(pagedata['title'], - page.title(withSection=False)): - raise Error( - u"loadrevisions: Query on %s returned data on '%s'" - % (page, pagedata['title'])) - if "missing" in pagedata: - raise NoPage(page) - else: - page = pywikibot.Page(self, pagedata['title']) + if not self.sametitle(pagedata['title'], + page.title(withSection=False)): + raise Error( + u"loadrevisions: Query on %s returned data on '%s'" + % (page, pagedata['title'])) + if "missing" in pagedata: + raise NoPage(page) api.update_page(page, pagedata) def pageinterwiki(self, page): diff --git a/tests/site_tests.py b/tests/site_tests.py index 8b8498e..6c93c0c 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1003,6 +1003,32 @@ self.assertTrue(hasattr(self.mainpage, "_revisions")) self.assertTrue(self.mainpage._revid in self.mainpage._revisions) self.assertEqual(len(self.mainpage._revisions), 15) + self.assertEqual(self.mainpage._text, None) + + def testLoadRevisions_getText(self): + """Test the site.loadrevisions() method with getText=True""" + + self.mysite.loadrevisions(self.mainpage, getText=True, total=5) + self.assertTrue(len(self.mainpage._text) > 0) + + def testLoadRevisions_revids(self): + """Test the site.loadrevisions() method, listing based on revid.""" + + #revids as list of int + self.mysite.loadrevisions(self.mainpage, revids=[139992, 139993]) + self.assertTrue(all(rev in self.mainpage._revisions for rev in [139992, 139993])) + #revids as list of str + self.mysite.loadrevisions(self.mainpage, revids=['139994', '139995']) + self.assertTrue(all(rev in self.mainpage._revisions for rev in [139994, 139995])) + #revids as int + self.mysite.loadrevisions(self.mainpage, revids=140000) + self.assertTrue(140000 in self.mainpage._revisions) + #revids as str + self.mysite.loadrevisions(self.mainpage, revids='140001') + self.assertTrue(140001 in self.mainpage._revisions) + #revids belonging to a different page raises Exception + self.assertRaises(pywikibot.Error, self.mysite.loadrevisions, + self.mainpage, revids=130000) def testLoadRevisions_querycontinue(self): """Test the site.loadrevisions() method with query-continue""" @@ -1017,7 +1043,7 @@ self.assertEqual(len(self.mainpage._revisions), 15) def testLoadRevisions_timestamp(self): - """Test the site.loadrevisions() method, listing based con timestamp.""" + """Test the site.loadrevisions() method, listing based on timestamp.""" self.mysite.loadrevisions(self.mainpage, rvdir=True, total=15) self.assertEqual(len(self.mainpage._revisions), 15) @@ -1037,8 +1063,8 @@ self.mainpage, rvdir=False, starttime="2002-01-01T00:00:00Z", endtime="2002-02-01T000:00:00Z") - def testLoadRevisions_revid(self): - """Test the site.loadrevisions() method, listing based con revid.""" + def testLoadRevisions_rev_id(self): + """Test the site.loadrevisions() method, listing based on rev_id.""" self.mysite.loadrevisions(self.mainpage, rvdir=True, total=15) self.assertEqual(len(self.mainpage._revisions), 15) -- To view, visit https://gerrit.wikimedia.org/r/109955 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6bd0f191070c51ae0f7c0e945870a462f1640ec Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(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 <>

10 years, 2 months

[Gerrit] Test {{PLURAL:}} support - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Test {{PLURAL:}} support ...................................................................... Test {{PLURAL:}} support Change-Id: Ia5009747542711e795b5520687e47d4471b45122 --- M tests/i18n_tests.py 1 file changed, 59 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified Objections: Merlijn van Deen: There's a problem with this change, please improve diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 104f308..e996fbb 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -58,7 +58,7 @@ u'test-no-english JA') -class TestTWTranslate(unittest.TestCase): +class TestTWN(unittest.TestCase): def setUp(self): self.path = os.path.split(os.path.realpath(__file__))[0] shutil.copyfile(os.path.join(self.path, 'i18n', 'test.py'), @@ -66,6 +66,9 @@ def tearDown(self): os.remove(os.path.join(self.path, '..', 'scripts', 'i18n', 'test.py')) + + +class TestTWTranslate(TestTWN): def testLocalized(self): self.assertEqual(i18n.twtranslate('en', 'test-localized'), @@ -97,6 +100,61 @@ self.assertRaises(i18n.TranslationError, i18n.twtranslate, 'en', 'test-no-english') +class TestTWNTranslate(TestTWN): + " Test {{PLURAL:}} support " + + def testNumber(self): + """ use a number """ + self.assertEqual( + i18n.twntranslate('de', 'test-plural', 0) % {'num': 0}, + u'Bot: Ändere 0 Seiten.') + self.assertEqual( + i18n.twntranslate('de', 'test-plural', 1) % {'num': 1}, + u'Bot: Ändere 1 Seite.') + self.assertEqual( + i18n.twntranslate('de', 'test-plural', 2) % {'num': 2}, + u'Bot: Ändere 2 Seiten.') + self.assertEqual( + i18n.twntranslate('de', 'test-plural', 3) % {'num': 3}, + u'Bot: Ändere 3 Seiten.') + self.assertEqual( + i18n.twntranslate('en', 'test-plural', 0) % {'num': 'no'}, + u'Bot: Changing no pages.') + self.assertEqual( + i18n.twntranslate('en', 'test-plural', 1) % {'num': 'one'}, + u'Bot: Changing one page.') + self.assertEqual( + i18n.twntranslate('en', 'test-plural', 2) % {'num': 'two'}, + u'Bot: Changing two pages.') + self.assertEqual( + i18n.twntranslate('en', 'test-plural', 3) % {'num': 'three'}, + u'Bot: Changing three pages.') + + def testString(self): + """ use a string """ + self.assertEqual( + i18n.twntranslate('en', 'test-plural', '1') % {'num': 'one'}, + u'Bot: Changing one page.') + + def testDict(self): + """ use a dictionary """ + self.assertEqual( + i18n.twntranslate('en', 'test-plural', {'num': 2}), + u'Bot: Changing 2 pages.') + + def testExtended(self): + """ use additional format strings """ + self.assertEqual( + i18n.twntranslate('fr', 'test-plural', {'num': 1, 'descr': 'seulement'}), + u'Robot: Changer seulement une page.') + + def testExtendedOutside(self): + """ use additional format strings also outside """ + self.assertEqual( + i18n.twntranslate('fr', 'test-plural', 1) % {'descr': 'seulement'}, + u'Robot: Changer seulement une page.') + + if __name__ == '__main__': try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/110591 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5009747542711e795b5520687e47d4471b45122 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

10 years, 2 months

[Gerrit] [i18n] add test samples from i18n library (test comming soon) - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [i18n] add test samples from i18n library (test comming soon) ...................................................................... [i18n] add test samples from i18n library (test comming soon) Change-Id: I3ea93802ee8d1c8bb0d725a95b99415021c8fe9b --- M tests/i18n/test.py 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved Merlijn van Deen: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/tests/i18n/test.py b/tests/i18n/test.py index e82bcd0..9e030ca 100644 --- a/tests/i18n/test.py +++ b/tests/i18n/test.py @@ -1,13 +1,21 @@ -# -*- coding=utf-8 -*- +# -*- coding: utf-8 -*- msg = { + 'de': { + 'test-plural': u'Bot: Ändere %(num)d {{PLURAL:num|Seite|Seiten}}.', + }, 'en': { 'test-localized': u'test-localized EN', 'test-semi-localized': u'test-semi-localized EN', - 'test-non-localized': u'test-non-localized EN' + 'test-non-localized': u'test-non-localized EN', + 'test-plural': u'Bot: Changing %(num)s {{PLURAL:%(num)d|page|pages}}.', }, 'nl': { 'test-localized': u'test-localized NL', 'test-semi-localized': u'test-semi-localized NL', + 'test-plural': u'Bot: Pas {{PLURAL:num|1 pagina|%(num)d pagina\'s}} aan.', + }, + 'fr': { + 'test-plural': u'Robot: Changer %(descr)s {{PLURAL:num|une page|quelques pages}}.', }, 'fy': { 'test-localized': u'test-localized FY' -- To view, visit https://gerrit.wikimedia.org/r/110588 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ea93802ee8d1c8bb0d725a95b99415021c8fe9b Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

10 years, 2 months

[Gerrit] Fix translations in i18n example - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix translations in i18n example ...................................................................... Fix translations in i18n example Change-Id: I93005d0314af89623ac03752c6f681991934c311 --- M pywikibot/i18n.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index e44d3f7..56fb9da 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -401,11 +401,11 @@ }, 'nl': { # format sting inside PLURAL tag is allowed - 'test-changing': u'Bot: Endrer {{PLURAL:num|1 pagina|%(num)d pagina\'s}}.', + 'test-changing': u'Bot: Pas {{PLURAL:num|1 pagina|%(num)d pagina\'s}} aan.', }, 'fr': { # additional sting inside or outside PLURAL tag is allowed - 'test-changing': u'Robot: Changer %(descr)s {{PLURAL:num|une page|un peu pages}}.', + 'test-changing': u'Robot: Changer %(descr)s {{PLURAL:num|une page|quelques pages}}.', }, } #use a number @@ -422,7 +422,7 @@ Robot: Changer seulement une pages. #use format strings also outside >>> i18n.twntranslate('fr', 'test-changing', 10) % {'descr': 'seulement'} - Robot: Changer seulement un peu pages. + Robot: Changer seulement quelques pages. The translations are retrieved from i18n.<package>, based on the callers import table. -- To view, visit https://gerrit.wikimedia.org/r/110692 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93005d0314af89623ac03752c6f681991934c311 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

10 years, 2 months

[Gerrit] [bug 60564] Re-enable pageName for summary message - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [bug 60564] Re-enable pageName for summary message ...................................................................... [bug 60564] Re-enable pageName for summary message - pageName is extracted from command option handled by pagegenerators if availlable. Otherwise we ask for the message. - -images option is deprecated. -imagelinks from pagegenerators is used. We just append the right option command to the option list - deprecated setAction() is removed - docu replacement from pagegenerators Change-Id: Ie65f05430e14d4b18060b26577232a47ea51b78d --- M scripts/delete.py 1 file changed, 47 insertions(+), 44 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/delete.py b/scripts/delete.py index cf8c3d4..60c9ed8 100644 --- a/scripts/delete.py +++ b/scripts/delete.py @@ -3,20 +3,20 @@ This script can be used to delete and undelete pages en masse. Of course, you will need an admin account on the relevant wiki. -Syntax: python delete.py [-category categoryName] +These command line parameters can be used to specify which pages to work on: -Command line options: +&params; --page: Delete specified page --cat: Delete all pages in the given category. --links: Delete all pages linked from a given page. --file: Delete all pages listed in a text file. --ref: Delete all pages referring from a given page. --images: Delete all images used on a given page. --always: Don't prompt to delete pages, just do it. --summary: Supply a custom edit summary. --undelete: Actually undelete pages instead of deleting. - Obviously makes sense only with -page and -file. +Furthermore, the following command line parameters are supported: + +-always: Don't prompt to delete pages, just do it. + +-summary: Supply a custom edit summary. + +-undelete: Actually undelete pages instead of deleting. + Obviously makes sense only with -page and -file. + +Usage: python delete.py [-category categoryName] Examples: @@ -25,7 +25,7 @@ python delete.py -cat:"To delete" -always """ # -# (C) Pywikibot team, 2013 +# (c) Pywikibot team, 2014 # # Distributed under the terms of the MIT license. # @@ -36,36 +36,45 @@ from pywikibot import i18n from pywikibot import pagegenerators +# This is required for the text that is shown when you run this script +# with the parameter -help. +docuReplacements = { + '&params;': pagegenerators.parameterHelp, +} + class DeletionRobot: """ This robot allows deletion of pages en masse. """ def __init__(self, generator, summary, always=False, undelete=True): - """ Arguments: - * generator - A page generator. - * always - Delete without prompting? + """ + Arguments: + * generator - A page generator. + * always - Delete without prompting? """ self.generator = generator self.summary = summary - self.always = always + self.prompt = not always self.undelete = undelete def run(self): - """ Starts the robot's action. """ - #Loop through everything in the page generator and delete it. + """ Starts the robot's action: + Loop through everything in the page generator and delete it. + + """ for page in self.generator: pywikibot.output(u'Processing page %s' % page.title()) if self.undelete: - page.undelete(self.summary, throttle=True) + page.undelete(self.summary) else: - page.delete(self.summary, not self.always, throttle=True) + page.delete(self.summary, self.prompt) def main(): genFactory = pagegenerators.GeneratorFactory() pageName = '' - summary = '' + summary = None always = False doImages = False undelete = False @@ -84,17 +93,18 @@ else: summary = arg[len('-summary:'):] elif arg.startswith('-images'): - doImages = True - if len(arg) == len('-images'): - pageName = pywikibot.input( - u'Enter the page with the images to delete:') - else: - pageName = arg[len('-images'):] + pywikibot.output('\n\03{lightred}-image option is deprecated. ' + 'Please use -imagelinks instead.\03{default}\n') + localargs.append('-imagelinks' + arg[7:]) elif arg.startswith('-undelete'): undelete = True else: genFactory.handleArg(arg) - if not summary: + found = arg.find(':') + 1 + if found: + pageName = arg[found:] + + if pageName and not summary: if arg.startswith('-category'): summary = i18n.twtranslate(mysite, 'delete-from-category', {'page': pageName}) @@ -104,30 +114,23 @@ elif arg.startswith('-ref'): summary = i18n.twtranslate(mysite, 'delete-referring-pages', {'page': pageName}) + elif arg.startswith('-imagelinks'): + summary = i18n.twtranslate(mysite, 'delete-images', + {'page': pageName}) elif arg.startswith('-file'): summary = i18n.twtranslate(mysite, 'delete-from-file') - - if doImages: - if not summary: - summary = i18n.twtranslate(mysite, 'delete-images', - {'page': pageName}) - page = pywikibot.Page(mysite, pageName) - generator = pagegenerators.ImagesPageGenerator(page) - if not summary: + if summary is None: summary = pywikibot.input(u'Enter a reason for the %sdeletion:' % ['', 'un'][undelete]) - if not generator: - generator = genFactory.getCombinedGenerator() - if not generator: - # syntax error, show help text from the top of this file - pywikibot.showHelp('delete') - return + generator = genFactory.getCombinedGenerator() if generator: - pywikibot.setAction(summary) # We are just deleting pages, so we have no need of using a preloading # page generator to actually get the text of those pages. bot = DeletionRobot(generator, summary, always, undelete) bot.run() + else: + # Show help text from the top of this file + pywikibot.showHelp() if __name__ == "__main__": -- To view, visit https://gerrit.wikimedia.org/r/110153 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie65f05430e14d4b18060b26577232a47ea51b78d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Pyfisch <pyfisch(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

10 years, 2 months

[Gerrit] remove obsolete imports, remove old code stuff - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: remove obsolete imports, remove old code stuff ...................................................................... remove obsolete imports, remove old code stuff Change-Id: I3d9d68c1736fd5c3a0e675b555d0b7743f3e5232 --- M scripts/welcome.py 1 file changed, 0 insertions(+), 16 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/welcome.py b/scripts/welcome.py index ba0a274..5840eb4 100644 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -185,13 +185,11 @@ import re import locale import codecs -from datetime import timedelta from random import choice from string import capitalize import pywikibot from pywikibot import i18n from pywikibot import config -import query locale.setlocale(locale.LC_ALL, '') @@ -829,21 +827,7 @@ else: raise KeyboardInterrupt except KeyboardInterrupt: - #if globalvar.makeWelcomeLog and len(self.welcomed_users) > 0: - # pywikibot.output("Update log before qutting script.") - # self.makelogpage(self.welcomed_users) - #if hasattr(self, '_BAQueue') and len(self._BAQueue) > 0 and globalvar.filtBadName: - # self.reportBadAccount(None, final = True) break - #if __name__ != '__main__': - # globalvar.offset = int(time.strftime("%Y%m%d%H%M%S", time.gmtime())) - # - # def putName(nm): - # - # self._checkQueue.append(name) - # if len(self._checkQueue) >= globalvar.dumpToLog: - # self.run() - # self._checkQueue = [] def showStatus(n=0): -- To view, visit https://gerrit.wikimedia.org/r/110333 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d9d68c1736fd5c3a0e675b555d0b7743f3e5232 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Alex S.H. Lin <alexsh(a)mail2000.com.tw> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

10 years, 2 months

[Gerrit] remove obsolete imports - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: remove obsolete imports ...................................................................... remove obsolete imports Change-Id: Iacfcfe99b35adadce0c9ab1939734a0cab9043a1 --- M scripts/create_categories.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/create_categories.py b/scripts/create_categories.py index 2a9cca2..ae043be 100755 --- a/scripts/create_categories.py +++ b/scripts/create_categories.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- """ Program to batch create categories. @@ -32,9 +32,9 @@ # Distributed under the terms of the MIT license. # # -import pywikibot -from pywikibot import catlib, config, pagegenerators import sys +import pywikibot +from pywikibot import pagegenerators def createCategory(page, parent, basename): -- To view, visit https://gerrit.wikimedia.org/r/110370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iacfcfe99b35adadce0c9ab1939734a0cab9043a1 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: jenkins-bot <>

10 years, 2 months

[Gerrit] (bug 54686) re-enable support for svn repo revision detectio... - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: (bug 54686) re-enable support for svn repo revision detection (from compat) ...................................................................... (bug 54686) re-enable support for svn repo revision detection (from compat) * re-enable old code still there * add support for git sha hash (cf. change 85523) * try to avoid to excessive use of try...except structures * hash is primary identifier thus swapped with revision number * revision number for git prefixed with "g" for svn with "s" * some PEP8 Change-Id: Ia5b6c30715b1ef4e103701e159987fe9b506660d --- M pywikibot/version.py 1 file changed, 34 insertions(+), 26 deletions(-) Approvals: Xqt: Looks good to me, but someone else must approve Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/version.py b/pywikibot/version.py index 13b86b4..1a63073 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- """ Module to determine the pywikipedia version (tag, revision and date) """ # -# (C) Merlijn 'valhallasw' van Deen, 2007-2008 -# (C) xqt, 2010-2012 +# (C) Merlijn 'valhallasw' van Deen, 2007-2014 +# (C) xqt, 2010-2014 # (C) Pywikibot team, 2007-2013 # # Distributed under the terms of the MIT license. @@ -25,22 +25,19 @@ def _get_program_dir(): _program_dir = os.path.normpath(os.path.split(os.path.dirname(__file__))[0]) -# _program_dir = _program_dir.rstrip(os.path.basename(_program_dir)) -## 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 = dict(getversiondict()) # copy dict to prevent changes in 'chache' + data = dict(getversiondict()) # copy dict to prevent changes in 'chache' try: hsh2 = getversion_onlinerepo() hsh1 = data['hsh'] data['cmp_ver'] = 'OUTDATED' if hsh1 != hsh2 else 'ok' except Exception: data['cmp_ver'] = 'n/a' - data['hsh'] = data['hsh'][:7] # make short hash from full hash - return '%(tag)s (r%(rev)s, %(hsh)s, %(date)s, %(cmp_ver)s)' % data + data['hsh'] = data['hsh'][:7] # make short hash from full hash + return '%(tag)s (%(hsh)s, %(rev)s, %(date)s, %(cmp_ver)s)' % data def getversiondict(): @@ -48,11 +45,15 @@ if cache: return cache try: - (tag, rev, date, hsh) = getversion_git() - except Exception: + _program_dir = _get_program_dir() + if os.path.isdir(os.path.join(_program_dir, '.svn')): + (tag, rev, date, hsh) = getversion_svn(_program_dir) + else: + (tag, rev, date, hsh) = getversion_git(_program_dir) + except ParseError: try: (tag, rev, date, hsh) = getversion_nightly() - except Exception: + except ParseError: try: version = getfileversion('pywikibot/__init__.py') if not version: @@ -79,6 +80,8 @@ def getversion_svn(path=None): + import httplib + import xml.dom.minidom _program_dir = path or _get_program_dir() entries = open(os.path.join(_program_dir, '.svn/entries')) version = entries.readline().strip() @@ -88,10 +91,14 @@ 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''') - name, tag, rev, date = cur.fetchone() + cur.execute("""select +local_relpath, repos_path, revision, changed_date, checksum from nodes +order by revision desc, changed_date desc""") + name, tag, rev, date, checksum = cur.fetchone() + cur.execute("select root from repository") + tag, = cur.fetchone() con.close() - tag = tag[:-len(name)] + tag = os.path.split(tag)[1] date = time.gmtime(date / 1000000) else: for i in range(3): @@ -105,9 +112,18 @@ date = time.strptime(entries.readline()[:19], '%Y-%m-%dT%H:%M:%S') rev = entries.readline()[:-1] entries.close() + conn = httplib.HTTPSConnection('github.com') + conn.request('PROPFIND', '/wikimedia/%s/!svn/vcc/default' % tag, + "<?xml version='1.0' encoding='utf-8'?>" + "<propfind xmlns=\"DAV:\"><allprop/></propfind>", + {'Label': rev, 'User-Agent': 'SVN/1.7.5-pywikibot1'}) + resp = conn.getresponse() + dom = xml.dom.minidom.parse(resp) + hsh = dom.getElementsByTagName("C:git-commit")[0].firstChild.nodeValue + rev = 's%s' % rev if (not date or not tag or not rev) and not path: raise ParseError - return (tag, rev, date) + return (tag, rev, date, hsh) def getversion_git(path=None): @@ -119,16 +135,12 @@ # some windows git versions provide git.cmd instead of git.exe cmd = 'git.cmd' - #(try to use .git directory for new entries format) - #tag = subprocess.Popen('git config --get remote.origin.url', - # shell=True, - # stdout=subprocess.PIPE).stdout.read() tag = open(os.path.join(_program_dir, '.git/config'), 'r').read() s = tag.find('url = ', tag.find('[remote "origin"]')) e = tag.find('\n', s) tag = tag[(s + 6):e] t = tag.strip().split('/') - tag = '[%s] %s' % (t[0][:-1], '/'.join(t[3:])[:-4]) + tag = '[%s] %s' % (t[0][:-1], '-'.join(t[3:])) info = subprocess.Popen([cmd, '--no-pager', 'log', '-1', '--pretty=format:"%ad|%an|%h|%H|%d"' @@ -142,8 +154,8 @@ rev = subprocess.Popen([cmd, 'rev-list', 'HEAD'], cwd=_program_dir, stdout=subprocess.PIPE).stdout.read() - rev = len(rev.splitlines()) - hsh = info[3] # also stored in '.git/refs/heads/master' + rev = 'g%s' % len(rev.splitlines()) + hsh = info[3] # also stored in '.git/refs/heads/master' if (not date or not tag or not rev) and not path: raise ParseError return (tag, rev, date, hsh) @@ -169,10 +181,6 @@ except: raise ParseError return hsh - -## Simple version comparison -# -cmp_ver = lambda a, b, tol=1: {-1: '<', 0: '~', 1: '>'}[cmp((a - b) // tol, 0)] def getfileversion(filename): -- To view, visit https://gerrit.wikimedia.org/r/86375 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5b6c30715b1ef4e103701e159987fe9b506660d Gerrit-PatchSet: 7 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

10 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2014