Pywikibot-commits August 2014

pywikibot-commits@lists.wikimedia.org

1 participants
196 discussions

[Gerrit] backport Ibd85350cda6b511afd3b7a335abe20bd4ac0899e from core - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: backport Ibd85350cda6b511afd3b7a335abe20bd4ac0899e from core ...................................................................... backport Ibd85350cda6b511afd3b7a335abe20bd4ac0899e from core bug: 68694 Change-Id: I82c29bfecd8da017e205b4ca34a98eea61b05601 --- M category.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/category.py b/category.py index 659cae5..3f7043b 100644 --- a/category.py +++ b/category.py @@ -310,8 +310,8 @@ else: pywikibot.output(u"Page %s does not exist; skipping." % page.title(asLink=True)) - except pywikibot.IsRedirectPage as arg: - redirTarget = pywikibot.Page(self.site, arg.args[0]) + except pywikibot.IsRedirectPage: + redirTarget = page.getRedirectTarget() if self.follow_redirects: text = redirTarget.get() else: -- To view, visit https://gerrit.wikimedia.org/r/151811 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82c29bfecd8da017e205b4ca34a98eea61b05601 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 10 months

[Gerrit] standardize delete.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: standardize delete.py ...................................................................... standardize delete.py - DeletionRobot extends pywikibot.Bot with an options dict and built-in 'always' option - Bug 63800: call handleArgs before GeneratorFactory per I134529f3a914225d3473b95ca771cf7e7be01a36 Change-Id: I7ded2d3e2ab2ce3452f1a99819c1843dbfb33a8e --- M scripts/delete.py 1 file changed, 21 insertions(+), 18 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/delete.py b/scripts/delete.py index bbce21b..8b023ac 100644 --- a/scripts/delete.py +++ b/scripts/delete.py @@ -33,8 +33,7 @@ # import pywikibot -from pywikibot import i18n -from pywikibot import pagegenerators +from pywikibot import i18n, pagegenerators, Bot # This is required for the text that is shown when you run this script # with the parameter -help. @@ -43,20 +42,25 @@ } -class DeletionRobot: +class DeletionRobot(Bot): """ This robot allows deletion of pages en masse. """ - def __init__(self, generator, summary, always=False, undelete=True): + def __init__(self, generator, summary, **kwargs): """ - Arguments: - * generator - A page generator. - * always - Delete without prompting? + Constructor. + @param generator: the pages to work on + @type generator: iterable + @param summary: the reason for the (un)deletion + @type summary: unicode """ + self.availableOptions.update({ + 'undelete': False, + }) + super(DeletionRobot, self).__init__(**kwargs) + self.generator = generator self.summary = summary - self.prompt = not always - self.undelete = undelete def run(self): """ Start the robot's action: @@ -65,27 +69,26 @@ """ for page in self.generator: pywikibot.output(u'Processing page %s' % page.title()) - if self.undelete: + if self.getOption('undelete'): page.undelete(self.summary) else: - page.delete(self.summary, self.prompt) + page.delete(self.summary, not self.getOption('always')) def main(): - genFactory = pagegenerators.GeneratorFactory() pageName = '' summary = None - always = False - undelete = False generator = None + options = {} # read command line parameters local_args = pywikibot.handleArgs() + genFactory = pagegenerators.GeneratorFactory() mysite = pywikibot.Site() for arg in local_args: if arg == '-always': - always = True + options['always'] = True elif arg.startswith('-summary'): if len(arg) == len('-summary'): summary = pywikibot.input(u'Enter a reason for the deletion:') @@ -96,7 +99,7 @@ 'Please use -imageused instead.\03{default}\n') local_args.append('-imageused' + arg[7:]) elif arg.startswith('-undelete'): - undelete = True + options['undelete'] = True else: genFactory.handleArg(arg) found = arg.find(':') + 1 @@ -125,8 +128,8 @@ if generator: if summary is None: summary = pywikibot.input(u'Enter a reason for the %sdeletion:' - % ['', 'un'][undelete]) - bot = DeletionRobot(generator, summary, always, undelete) + % ['', 'un'][options.get('undelete', False)]) + bot = DeletionRobot(generator, summary, **options) bot.run() else: # Show help text from the top of this file -- To view, visit https://gerrit.wikimedia.org/r/149021 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ded2d3e2ab2ce3452f1a99819c1843dbfb33a8e Gerrit-PatchSet: 3 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: jenkins-bot <>

9 years, 10 months

[Gerrit] User-agent should work when the site is None - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: User-agent should work when the site is None ...................................................................... User-agent should work when the site is None Change-Id: I802bd54def87069b1a205cd0f563081a629ac1fb --- M pywikibot/comms/http.py 1 file changed, 17 insertions(+), 9 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index d5bbd20..0390486 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -144,15 +144,23 @@ baseuri = urlparse.urljoin("%(proto)s://%(host)s" % locals(), uri) else: baseuri = uri - username = site.username() - if not username: - username = "" - kwargs["headers"]["user-agent"] = config.USER_AGENT_FORMAT.format( - script=pywikibot.calledModuleName(), - version=pywikibot.version.getversiondict()['rev'], - username=quote(username), - lang=site.code, - family=site.family.name) + if "headers" not in kwargs: + kwargs["headers"] = {} + if site: + username = site.username() + if not username: + username = "" + kwargs["headers"]["user-agent"] = config.USER_AGENT_FORMAT.format( + script=pywikibot.calledModuleName(), + version=pywikibot.version.getversiondict()['rev'], + username=quote(username), + lang=site.code, + family=site.family.name) + else: + USER_AGENT_FORMAT = '{script}/{version} Pywikibot/2.0' + kwargs["headers"]["user-agent"] = USER_AGENT_FORMAT.format( + script=pywikibot.calledModuleName(), + version=pywikibot.version.getversiondict()['rev']) request = threadedhttp.HttpRequest(baseuri, *args, **kwargs) http_queue.put(request) while not request.lock.acquire(False): -- To view, visit https://gerrit.wikimedia.org/r/151696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I802bd54def87069b1a205cd0f563081a629ac1fb Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> 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: jenkins-bot <>

9 years, 10 months

[Gerrit] Replace site.lang with site.code in http.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Replace site.lang with site.code in http.py ...................................................................... Replace site.lang with site.code in http.py Change-Id: Iefc4c68ab3088e34079c21712ceed2fee9bfc465 --- M pywikibot/comms/http.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 73b3c70..d5bbd20 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -151,7 +151,7 @@ script=pywikibot.calledModuleName(), version=pywikibot.version.getversiondict()['rev'], username=quote(username), - lang=site.lang, + lang=site.code, family=site.family.name) request = threadedhttp.HttpRequest(baseuri, *args, **kwargs) http_queue.put(request) -- To view, visit https://gerrit.wikimedia.org/r/151689 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iefc4c68ab3088e34079c21712ceed2fee9bfc465 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

9 years, 10 months

[Gerrit] Fixup user_agent patch - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fixup user_agent patch ...................................................................... Fixup user_agent patch Change-Id: I60014b97b605439c46b0eec730f15aea568845db --- M pywikibot/comms/http.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index d8adef3..73b3c70 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -144,11 +144,13 @@ baseuri = urlparse.urljoin("%(proto)s://%(host)s" % locals(), uri) else: baseuri = uri - + username = site.username() + if not username: + username = "" kwargs["headers"]["user-agent"] = config.USER_AGENT_FORMAT.format( script=pywikibot.calledModuleName(), version=pywikibot.version.getversiondict()['rev'], - username=quote(site.username()), + username=quote(username), lang=site.lang, family=site.family.name) request = threadedhttp.HttpRequest(baseuri, *args, **kwargs) -- To view, visit https://gerrit.wikimedia.org/r/151682 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I60014b97b605439c46b0eec730f15aea568845db Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

9 years, 10 months

[Gerrit] Add option of user_agent in user-config.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add option of user_agent in user-config.py ...................................................................... Add option of user_agent in user-config.py It will use a format string and people can change it Change-Id: If1bfcbb62e0bf126abc2b5847d03e7e004c7bfe4 --- M pywikibot/comms/http.py M pywikibot/config2.py 2 files changed, 16 insertions(+), 9 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index 4f69291..d8adef3 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -43,11 +43,13 @@ import Queue import urlparse import cookielib + from urllib2 import quote else: from ssl import SSLError as SSLHandshakeError import queue as Queue import urllib.parse as urlparse from http import cookiejar as cookielib + from urlparse import quote from pywikibot import config from pywikibot.exceptions import FatalServerError, Server504Error @@ -65,12 +67,7 @@ # cf. `openssl errstr 14090086` SSL_CERT_VERIFY_FAILED = ":14090086:" -# the User-agent: header. The default is -# '<script>/<revision> Pywikibot/2.0', where '<script>' is the currently -# executing script and version is the Git revision of Pywikibot. -USER_AGENT_FORMAT = '{script}/r{version[rev]} Pywikibot/2.0' -useragent = USER_AGENT_FORMAT.format(script=pywikibot.calledModuleName(), - version=pywikibot.version.getversiondict()) + numthreads = 1 threads = [] @@ -148,9 +145,12 @@ else: baseuri = uri - # set default user-agent string - kwargs.setdefault("headers", {}) - kwargs["headers"].setdefault("user-agent", useragent) + kwargs["headers"]["user-agent"] = config.USER_AGENT_FORMAT.format( + script=pywikibot.calledModuleName(), + version=pywikibot.version.getversiondict()['rev'], + username=quote(site.username()), + lang=site.lang, + family=site.family.name) request = threadedhttp.HttpRequest(baseuri, *args, **kwargs) http_queue.put(request) while not request.lock.acquire(False): diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 2d3ce38..eadcf88 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -57,6 +57,13 @@ sysopnames = {} disambiguation_comment = {} +# User agent format. +# For the meaning and more help in customization see: +# https://www.mediawiki.org/wiki/Manual:Pywikibot/User-agent +# The default is script, revision number and user name +# For more information see https://meta.wikimedia.org/wiki/User-agent_policy +USER_AGENT_FORMAT = '{script}/{version} Pywikibot/2.0 (User:{username})' + # The default interface for communicating with the site # currently the only defined interface is 'APISite', so don't change this! site_interface = 'APISite' -- To view, visit https://gerrit.wikimedia.org/r/147381 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1bfcbb62e0bf126abc2b5847d03e7e004c7bfe4 Gerrit-PatchSet: 15 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Bináris <wikiposta(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: Nullzero <nullzero.free(a)gmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 10 months

[Gerrit] Flakes - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Flakes ...................................................................... Flakes Fix unused imports, redefined methods, and a comment not compliant with pep8 Change-Id: Ia1be0e7170b2b6519dfefed57f4bc39148d3e377 --- M tests/__init__.py M tests/dry_api_tests.py M tests/ui_tests.py M tests/wikibase_tests.py 4 files changed, 10 insertions(+), 5 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/__init__.py b/tests/__init__.py index 6f85ad7..99fd1da 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -9,6 +9,9 @@ import os import sys +__all__ = ['httplib2', 'OrderedDict', '_cache_dir', 'TestRequest', + 'patch_request', 'unpatch_request'] + # Verify that the unit tests have a base working environment: # - httplib2 is mandatory # - ordereddict is only needed as a fallback for python 2.6 @@ -73,6 +76,9 @@ return super(TestRequest, self)._write_cache(data) +original_expired = None + + def patch_request(): global original_expired pywikibot.data.api.Request = TestRequest diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index 1714b59..95fb173 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -8,7 +8,6 @@ # import datetime -import hashlib import pywikibot from pywikibot.data.api import CachedRequest, QueryGenerator from utils import unittest diff --git a/tests/ui_tests.py b/tests/ui_tests.py index c072d32..76736b6 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -49,6 +49,7 @@ class pywikibotWrapper(object): def init(self): import pywikibot + pywikibot.version._get_program_dir() def output(self, *args, **kwargs): import pywikibot @@ -181,7 +182,7 @@ self.assertEqual(newstdout.getvalue(), "") self.assertEqual(newstderr.getvalue(), "output\n") - def test_output(self): + def test_output_stdout(self): pywikibot.output("output", toStdout=True) self.assertEqual(newstdout.getvalue(), "output\n") self.assertEqual(newstderr.getvalue(), "") @@ -221,7 +222,7 @@ self.assertEqual(newstdout.getvalue(), "") self.assertEqual(newstderr.getvalue(), "ERROR: TestException: Testing Exception\n") - def test_exception(self): + def test_exception_tb(self): class TestException(Exception): pass try: @@ -462,7 +463,6 @@ class TestWindowsTerminalUnicodeArguments(WindowsTerminalTestCase): @classmethod def setUpClass(cls): - import inspect cls.setUpProcess(["cmd", "/k", "echo off"]) @classmethod diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index aca60b3..b888f77 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -205,7 +205,7 @@ # The labels are not updated; assertion showing undesirable behaviour: self.assertEquals(item.labels['en'], 'New York City') # TODO: This is the assertion that this test should be using: - #self.assertTrue(item.labels['en'].lower().endswith('main page')) + # self.assertTrue(item.labels['en'].lower().endswith('main page')) def test_empty_item(self): # should not raise an error as the constructor only requires -- To view, visit https://gerrit.wikimedia.org/r/151597 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1be0e7170b2b6519dfefed57f4bc39148d3e377 Gerrit-PatchSet: 1 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

9 years, 10 months

[Gerrit] Add support for nosetests - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add support for nosetests ...................................................................... Add support for nosetests nosetests finds tests automatically, including test_data_ingestion.py which fails on the import. It has slightly different rules for auto-detecting tests, and it tries to use get_test_unconnected_page as a test. Change-Id: I49fc3cbda3f1f3b42c795b4f007e59d9bb1d6cf5 --- M scripts/tests/test_data_ingestion.py M tests/wikibase_tests.py 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/tests/test_data_ingestion.py b/scripts/tests/test_data_ingestion.py index 36fa0fb..c34033d 100644 --- a/scripts/tests/test_data_ingestion.py +++ b/scripts/tests/test_data_ingestion.py @@ -6,7 +6,7 @@ import os import unittest -import data_ingestion +from scripts import data_ingestion class TestPhoto(unittest.TestCase): diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index aca60b3..b5f5780 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -26,7 +26,7 @@ # fetch a page which is very likely to be unconnected, which doesnt have # a generator, and unit tests may be used to test old versions of pywikibot -def get_test_unconnected_page(site): +def _get_test_unconnected_page(site): gen = pagegenerators.NewpagesPageGenerator(site=site, total=10, namespaces=[1, ]) for page in gen: @@ -348,7 +348,7 @@ def test_fromPage_noitem(self): # this is a new page, and should not have a wikidata item yet - page = get_test_unconnected_page(site) + page = _get_test_unconnected_page(site) link = page._link self._test_fromPage_noitem(link) -- To view, visit https://gerrit.wikimedia.org/r/151591 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49fc3cbda3f1f3b42c795b4f007e59d9bb1d6cf5 Gerrit-PatchSet: 4 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

9 years, 10 months

[Gerrit] Misc script flakes - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Misc script flakes ...................................................................... Misc script flakes Remove unused variables, remove globals, and in replace.py avoid re-using old & new. Change-Id: Idf4ff0f72b9b625f3441754d66272b2315b2fd78 --- M scripts/category.py M scripts/commons_link.py M scripts/flickrripper.py M scripts/nowcommons.py M scripts/reflinks.py M scripts/replace.py M scripts/tests/test_data_ingestion.py M scripts/welcome.py 8 files changed, 31 insertions(+), 41 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category.py b/scripts/category.py index f0b0ebf..6f143fe 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -953,8 +953,6 @@ def main(*args): - global catDB - fromGiven = False toGiven = False batchMode = False @@ -1035,10 +1033,15 @@ depth = int(arg[len('-depth:'):]) else: genFactory.handleArg(arg) + pywikibot.Site().login() + + catDB = None + bot = None catDB = CategoryDatabase(rebuild=rebuild) gen = genFactory.getCombinedGenerator() + if action == 'add': if not gen: # default for backwards compatibility @@ -1049,7 +1052,6 @@ gen = pagegenerators.PreloadingGenerator(gen) bot = AddCategory(gen, sort_by_last_name, create_pages, editSummary, follow_redirects) - bot.run() elif action == 'remove': if not fromGiven: oldCatTitle = pywikibot.input(u'Please enter the name of the ' @@ -1063,7 +1065,6 @@ history=withHistory, pagesonly=pagesonly, deletion_comment=useSummaryForDeletion) - bot.run() elif action == 'move': if not fromGiven: oldCatTitle = pywikibot.input( @@ -1085,11 +1086,9 @@ history=withHistory, pagesonly=pagesonly, deletion_comment=deletion_comment) - bot.run() elif action == 'tidy': catTitle = pywikibot.input(u'Which category do you want to tidy up?') bot = CategoryTidyRobot(catTitle, catDB) - bot.run() elif action == 'tree': catTitle = pywikibot.input( u'For which category do you want to create a tree view?') @@ -1097,7 +1096,6 @@ u'Please enter the name of the file where the tree should be saved,' u'\nor press enter to simply show the tree:') bot = CategoryTreeRobot(catTitle, catDB, filename, depth) - bot.run() elif action == 'listify': if not fromGiven: oldCatTitle = pywikibot.input( @@ -1108,16 +1106,18 @@ bot = CategoryListifyRobot(oldCatTitle, newCatTitle, editSummary, overwrite, showImages, subCats=True, talkPages=talkPages, recurse=recurse) - bot.run() + + if bot: + try: + bot.run() + except pywikibot.Error: + pywikibot.error("Fatal error:", exc_info=True) + finally: + if catDB: + catDB.dump() else: pywikibot.showHelp() if __name__ == "__main__": - try: - main() - except pywikibot.Error: - pywikibot.error("Fatal error:", exc_info=True) - finally: - if 'catDB' in globals(): - catDB.dump() + main() diff --git a/scripts/commons_link.py b/scripts/commons_link.py index 34a7721..ec761ce 100644 --- a/scripts/commons_link.py +++ b/scripts/commons_link.py @@ -66,7 +66,7 @@ ('Page', 'Category')[catmode] )(commons, page.title()) try: - getcommons = commonspage.get(get_redirect=True) + commonspage.get(get_redirect=True) pagetitle = commonspage.title(withNamespace=not catmode) if page.title() == pagetitle: oldText = page.get() diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index e9816b9..7446331 100644 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -43,7 +43,10 @@ import upload import flickrapi # see: http://stuvel.eu/projects/flickrapi -from Tkinter import * +from Tkinter import ( + Tk, Label, Entry, Scrollbar, Text, Button, + END, VERTICAL, NORMAL, WORD +) from PIL import Image, ImageTk # see: http://www.pythonware.com/products/pil/ flickr_allowed_license = { @@ -66,19 +69,16 @@ TODO: Add exception handling """ - gotPhoto = False - while not gotPhoto: + while True: try: photoInfo = flickr.photos_getInfo(photo_id=photo_id) #xml.etree.ElementTree.dump(photoInfo) photoSizes = flickr.photos_getSizes(photo_id=photo_id) #xml.etree.ElementTree.dump(photoSizes) - gotPhoto = True + return photoInfo, photoSizes except flickrapi.exceptions.FlickrError: - gotPhotos = False pywikibot.output(u'Flickr api problem, sleeping') time.sleep(30) - return photoInfo, photoSizes def isAllowedLicense(photoInfo=None): @@ -391,8 +391,6 @@ def getPhotos(flickr=None, user_id=u'', group_id=u'', photoset_id=u'', start_id='', end_id='', tags=u''): """ Loop over a set of Flickr photos. """ - result = [] - retry = False found_start_id = not start_id # https://www.flickr.com/services/api/flickr.groups.pools.getPhotos.html @@ -504,9 +502,6 @@ def main(): - site = pywikibot.Site(u'commons', u'commons') - #imagerecat.initLists() - #Get the api key if not config.flickr['api_key']: pywikibot.output('Flickr api key not found! Get yourself an api key') diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py index 3f2c60e..19de9ac 100644 --- a/scripts/nowcommons.py +++ b/scripts/nowcommons.py @@ -59,7 +59,7 @@ import sys import re import webbrowser -import urllib + import pywikibot from pywikibot import i18n, Bot from pywikibot import pagegenerators as pg @@ -239,8 +239,8 @@ % image_local) pywikibot.output(u'Local: %s\nCommons: %s\n' % (url_local, url_commons)) - result1 = webbrowser.open(url_local, 0, 1) - result2 = webbrowser.open(url_commons, 0, 1) + webbrowser.open(url_local, 0, 1) + webbrowser.open(url_commons, 0, 1) if image_local.split('Image:')[1] == image_commons: choice = pywikibot.inputChoice( u'The local and the commons images have the same name, continue?', diff --git a/scripts/reflinks.py b/scripts/reflinks.py index b62565a..f1fb419 100644 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -681,7 +681,7 @@ elif u'.zh' in ref.link: enc.append("gbk") - if not 'utf-8' in enc: + if 'utf-8' not in enc: enc.append('utf-8') u = linkedpagetext.decode(enc[0]) # Bug 67410 diff --git a/scripts/replace.py b/scripts/replace.py index dbac5f8..3bd916a 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -654,8 +654,8 @@ replacements, exceptions) elif useSql: whereClause = 'WHERE (%s)' % ' OR '.join( - ["old_text RLIKE '%s'" % prepareRegexForMySQL(old.pattern) - for (old, new) in replacements]) + ["old_text RLIKE '%s'" % prepareRegexForMySQL(old_regexp.pattern) + for (old_regexp, new_text) in replacements]) if exceptions: exceptClause = 'AND NOT (%s)' % ' OR '.join( ["old_text RLIKE '%s'" % prepareRegexForMySQL(exc.pattern) diff --git a/scripts/tests/test_data_ingestion.py b/scripts/tests/test_data_ingestion.py index 835f04b..36fa0fb 100644 --- a/scripts/tests/test_data_ingestion.py +++ b/scripts/tests/test_data_ingestion.py @@ -6,7 +6,6 @@ import os import unittest -import test_utils import data_ingestion diff --git a/scripts/welcome.py b/scripts/welcome.py index d7db434..9ea90ea 100644 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -862,8 +862,6 @@ return list_loaded globalvar = Global() -global bot -global filename def main(): @@ -959,11 +957,6 @@ pywikibot.output("Put welcomed users before quit...") bot.makelogpage(bot.welcomed_users) pywikibot.output("\nQuitting...") - - -if __name__ == "__main__": - try: - main() finally: # If there is the savedata, the script must save the number_user. if globalvar.randomSign and globalvar.saveSignIndex and \ @@ -972,3 +965,6 @@ f = file(filename, 'w') cPickle.dump(bot.welcomed_users, f) f.close() + +if __name__ == "__main__": + main() -- To view, visit https://gerrit.wikimedia.org/r/151433 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf4ff0f72b9b625f3441754d66272b2315b2fd78 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

9 years, 10 months

[Gerrit] Fix support for site where lang != code - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix support for site where lang != code ...................................................................... Fix support for site where lang != code APISite.lang may change based on the siteinfo. For local files, the family 'lang' code should be used. e.g. This code may be 'wikidata' or 'commons'. Change-Id: If71b3ab3e7ad14f873862954457b0cd7f0efb646 --- M scripts/watchlist.py M tests/script_tests.py 2 files changed, 5 insertions(+), 10 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/watchlist.py b/scripts/watchlist.py index 34f8590..31236ad 100755 --- a/scripts/watchlist.py +++ b/scripts/watchlist.py @@ -45,7 +45,7 @@ else: fn = config.datafilepath('watchlists', 'watchlist-%s-%s.dat' - % (site.family.name, site.lang)) + % (site.family.name, site.code)) try: # find out how old our saved dump is (in seconds) file_age = time.time() - os.path.getmtime(fn) @@ -98,16 +98,11 @@ else: break - if site.family.name == 'wikidata': - lang = 'wikidata' - else: - lang = site.lang - # Save the watchlist to disk # The file is stored in the watchlists subdir. Create if necessary. f = open(config.datafilepath('watchlists', 'watchlist-%s-%s%s.dat' - % (site.family.name, lang, + % (site.family.name, site.code, '-sysop' if sysop else '')), 'w') pickle.dump(watchlist, f) @@ -158,9 +153,10 @@ elif new: refresh_all(new, sysop=sysop) else: - refresh(pywikibot.Site(), sysop=sysop) + site = pywikibot.Site() + refresh(site, sysop=sysop) - watchlist = get(pywikibot.Site()) + watchlist = get(site) pywikibot.output(u'%i pages in the watchlist.' % len(watchlist)) for pageName in watchlist: pywikibot.output(pageName, toStdout=True) diff --git a/tests/script_tests.py b/tests/script_tests.py index ef151ed..0651c63 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -55,7 +55,6 @@ and check_script_deps(name) and name != 'login.py' # this is moved to be first and name != 'imageuncat.py' # this halts indefinitely - and name != 'watchlist.py' # result depends on speed and name != 'welcome.py' # result depends on speed and name != 'script_wui.py' # depends on lua compiling ] -- To view, visit https://gerrit.wikimedia.org/r/151040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If71b3ab3e7ad14f873862954457b0cd7f0efb646 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 10 months

← Newer
1
...
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2014