Pywikibot-commits December 2013

pywikibot-commits@lists.wikimedia.org

1 participants
235 discussions

[Gerrit] Bug 58053 - py3k: Fix various imports - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Bug 58053 - py3k: Fix various imports ...................................................................... Bug 58053 - py3k: Fix various imports Change-Id: I0e56a114bf387200442d97e0091a52b51e9e0ac1 --- M pywikibot/bot.py M pywikibot/comms/http.py M pywikibot/comms/threadedhttp.py M pywikibot/data/api.py M pywikibot/date.py M pywikibot/page.py M pywikibot/site.py 7 files changed, 36 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index b571fe7..9e28ab4 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -34,6 +34,8 @@ from pywikibot import config from pywikibot import version +if sys.version_info[0] > 2: + unicode = str # User interface initialization # search for user interface module in the 'userinterfaces' subdirectory diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index b6adccf..6a4c287 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -21,20 +21,24 @@ __version__ = '$Id$' __docformat__ = 'epytext' -import Queue import urllib -import urlparse import logging import atexit try: from httplib2 import SSLHandshakeError + import Queue + import urlparse + import cookielib except ImportError: from ssl import SSLError as SSLHandshakeError + import queue as Queue + import urllib as urlparse + from http import cookiejar as cookielib + from pywikibot import config from pywikibot.exceptions import FatalServerError, Server504Error import pywikibot -import cookielib from . import threadedhttp import pywikibot.version diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py index 800af44..2ceaf72 100644 --- a/pywikibot/comms/threadedhttp.py +++ b/pywikibot/comms/threadedhttp.py @@ -21,14 +21,18 @@ __docformat__ = 'epytext' # standard python libraries +import sys import re import threading import time import logging import urllib -import cookielib -import sys + +try: + import cookielib +except ImportError: + from http import cookiejar as cookielib import pywikibot from pywikibot import config diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 2d8c4d9..00f0eab 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -34,6 +34,10 @@ from pywikibot import config, login from pywikibot.exceptions import * +import sys +if sys.version_info[0] > 2: + basestring = (str, ) + _logger = "data.api" lagpattern = re.compile(r"Waiting for [\d.]+: (?P<lag>\d+) seconds? lagged") diff --git a/pywikibot/date.py b/pywikibot/date.py index 5f7cb8b..6e39e96 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -18,6 +18,11 @@ # import re +import sys + +if sys.version_info[0] > 2: + unicode = str + basestring = (str,) # # Different collections of well known formats diff --git a/pywikibot/page.py b/pywikibot/page.py index 759093a..f3807dc 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -17,17 +17,21 @@ import pywikibot.site import hashlib -import htmlentitydefs + +try: + import htmlentitydefs + from urllib.parse import quote_from_bytes, unquote_to_bytes +except ImportError: + unicode = str + from html import entities as htmlentitydefs + from urllib import quote as quote_from_bytes, unquote as unquote_to_bytes + import logging import re import unicodedata import collections import urllib -try: - from urllib.parse import quote_from_bytes, unquote_to_bytes -except ImportError: - from urllib import quote as quote_from_bytes, unquote as unquote_to_bytes logger = logging.getLogger("pywiki.wiki.page") diff --git a/pywikibot/site.py b/pywikibot/site.py index 9f36234..fe9fb16 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -34,6 +34,9 @@ from pywikibot.data import api from pywikibot.exceptions import * +if sys.version_info[0] > 2: + basestring = (str,) + _logger = "wiki.site" -- To view, visit https://gerrit.wikimedia.org/r/98387 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e56a114bf387200442d97e0091a52b51e9e0ac1 Gerrit-PatchSet: 5 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 6 months

[Gerrit] Bug 58053 - Use PY3 environment variable for setup.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Bug 58053 - Use PY3 environment variable for setup.py ...................................................................... Bug 58053 - Use PY3 environment variable for setup.py Change-Id: Ib2336d6b769b808890d70f63f91b868c59b29802 --- M setup.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index 1b21060..855c91b 100644 --- a/setup.py +++ b/setup.py @@ -11,6 +11,7 @@ # import sys +import os from ez_setup import use_setuptools use_setuptools() @@ -29,11 +30,10 @@ testcollector = "tests.utils.collector" if sys.version_info[0] == 3: - if "--python3ok" not in sys.argv: + if not os.environ.get('PY3', False): # use setup.py test --python3ok to run tests print("ERROR: Pywikipediabot only runs under Python 2") sys.exit(1) - sys.argv.remove('--python3ok') if sys.version_info[1] < 3: print("ERROR: Python 3.3 or higher is required!") sys.exit(1) -- To view, visit https://gerrit.wikimedia.org/r/99189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib2336d6b769b808890d70f63f91b868c59b29802 Gerrit-PatchSet: 4 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, 6 months

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

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [lint] remove obsolete imports ...................................................................... [lint] remove obsolete imports Change-Id: I878e30bcd85cb6895dd9cde576249f48dccedfad --- M scripts/category_redirect.py 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 961ca9d..afaff4d 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -23,10 +23,7 @@ # import cPickle -import math import re -import sys -import traceback import time from datetime import datetime, timedelta import pywikibot -- To view, visit https://gerrit.wikimedia.org/r/100125 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I878e30bcd85cb6895dd9cde576249f48dccedfad 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: Mdupont <jamesmikedupont(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, 6 months

[Gerrit] [LINT] import needed time module, ignore editor's result (+p... - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [LINT] import needed time module, ignore editor's result (+pep8) ...................................................................... [LINT] import needed time module, ignore editor's result (+pep8) - time.sleep() needs its module to be imported first - editarticle.Texeditor's result is not used. So we may call it as a procedure and not as a function - pep8 changes E501 Change-Id: Iab6d4a035a964189f3ad162bd47f926229911004 --- M scripts/blockpageschecker.py 1 file changed, 18 insertions(+), 9 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index d6f813f..1a55a99 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -64,6 +64,7 @@ __version__ = '$Id$' # +import time import re import webbrowser import pywikibot @@ -85,8 +86,10 @@ 'en': None, 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccoparziale(?:|[ _]scad\|.*?|\|.*?)\}\}', r'\{\{(?:[Tt]emplate:|)[Aa]bp(?:|[ _]scad\|(?:.*?))\}\}'], - 'fr': [r'\{\{(?:[Tt]emplate:|' + u'[Mm]odèle:' + r'|)[Ss]emi[- ]?protection(|[^\}]*)\}\}'], - 'ja': [r'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)' + u'半保護' + r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], + 'fr': [r'\{\{(?:[Tt]emplate:|' + u'[Mm]odèle:' + + r'|)[Ss]emi[- ]?protection(|[^\}]*)\}\}'], + 'ja': [r'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)' + + u'半保護' + r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], } # Regex to get the total-protection template templateTotalProtection = { @@ -94,23 +97,28 @@ 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisoblocco(?:|[ _]scad\|(?:.*?)|minaccia|cancellata)\}\}', r'\{\{(?:[Tt]emplate:|)(?:[Cc][Tt]|[Cc]anc fatte|[Cc][Ee])\}\}', r'<div class="toccolours[ _]itwiki[ _]template[ _]avviso">(?:\s|\n)*?[Qq]uesta pagina'], - 'fr': [r'\{\{(?:[Tt]emplate:|' + u'[Mm]odèle:' + r'|)[Pp]rotection(|[^\}]*)\}\}', - r'\{\{(?:[Tt]emplate:|' + u'[Mm]odèle:' + r'|)(?:[Pp]age|[Aa]rchive|' + u'[Mm]odèle) protégée' + r'?(|[^\}]*)\}\}'], - 'ja': [r'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)' + u'保護(?:性急|)' + r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], + 'fr': [r'\{\{(?:[Tt]emplate:|' + u'[Mm]odèle:' + + r'|)[Pp]rotection(|[^\}]*)\}\}', + r'\{\{(?:[Tt]emplate:|' + u'[Mm]odèle:' + r'|)(?:[Pp]age|[Aa]rchive|' + + u'[Mm]odèle) protégée' + r'?(|[^\}]*)\}\}'], + 'ja': [r'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)' + u'保護(?:性急|)' + + r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], } # Regex to get the semi-protection move template templateSemiMoveProtection = { 'en': None, 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?|\|.*?)\}\}'], - 'ja': [r'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)' + u'移動半保護' + r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], + 'ja': [r'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)' + u'移動半保護' + + r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], } # Regex to get the total-protection move template templateTotalMoveProtection = { 'en': None, 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccospostamento(?:|[ _]scad\|.*?|\|.*?)\}\}'], - 'ja': [r'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)' + u'移動保護' + r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], + 'ja': [r'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)' + u'移動保護' + + r'(?:[Ss]|)(?:\|.+|)\}\}(?!\<\/nowiki\>)\s*(?:\r\n|)*'], } # If you use only one template for all the type of protection, put it here. @@ -199,7 +207,7 @@ elif quest == 'g': from pywikibot import editor as editarticle editor = editarticle.TextEditor() - text = editor.edit(page.get()) + editor.edit(page.get()) def main(): @@ -290,7 +298,8 @@ # PreloadingGenerator cannot set correctly page.editRestriction # (see bug #1949476 ) if not page.canBeEdited(): - pywikibot.output("%s is sysop-protected : this account can't edit it! Skipping..." % pagename) + pywikibot.output("%s is sysop-protected : this account can't edit " + "it! Skipping..." % pagename) continue """ if 'edit' in restrictions.keys(): -- To view, visit https://gerrit.wikimedia.org/r/99717 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iab6d4a035a964189f3ad162bd47f926229911004 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: Mdupont <jamesmikedupont(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 6 months

[Gerrit] [SYNC] Remove fallback code 'fa' for ckb - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [SYNC] Remove fallback code 'fa' for ckb ...................................................................... [SYNC] Remove fallback code 'fa' for ckb Synchronized with compat Change-Id: I2db1a7d4cea81c849107fd2b87271b76ffd7f0bc --- M pywikibot/i18n.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 92d3eb1..8e818eb 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -177,7 +177,7 @@ if code == 'gag': return ['tr'] if code == 'ckb': - return ['ku', 'fa'] + return ['ku'] #Ukrainian if code in ['crh', 'rue']: return ['uk', 'ru'] -- To view, visit https://gerrit.wikimedia.org/r/99643 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2db1a7d4cea81c849107fd2b87271b76ffd7f0bc 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 6 months

[Gerrit] Change the second return of ckb from fa to en - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Change the second return of ckb from fa to en ...................................................................... Change the second return of ckb from fa to en I've received an e-mail from a prominent contributor of ckb projects complaining about the return and he said ckb contributors are divided to Iranian Kurds and Iraqi Kurds which Iraqi Kurds don't understand Persian and Iranian Kurds don't understand Arabic, even Iraqi Kurds can't understand Arabic well so as he said English is best return Change-Id: I8964c1a089ced42e0041619910f82da168553baf --- M pywikibot/i18n.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Calak: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 731bece..93b2518 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -175,7 +175,7 @@ if code == 'gag': return ['tr'] if code == 'ckb': - return ['ku', 'fa'] + return ['ku'] #Ukrainian if code in ['crh', 'rue']: return ['uk', 'ru'] -- To view, visit https://gerrit.wikimedia.org/r/99630 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8964c1a089ced42e0041619910f82da168553baf Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Calak <Calakwiki(a)yahoo.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 6 months

[Gerrit] Add option of data.setSitelink(page) to make the compat more... - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add option of data.setSitelink(page) to make the compat more like core and make it easier to use ...................................................................... Add option of data.setSitelink(page) to make the compat more like core and make it easier to use Change-Id: I7aa615af154998c57fe5d7e4f992263e5db8c603 --- M wikipedia.py 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia.py b/wikipedia.py index e5c9b2b..f5cf71e 100644 --- a/wikipedia.py +++ b/wikipedia.py @@ -4419,6 +4419,13 @@ items = self.get() return int(self.title()[1:]) + def setSitelink(self, page, summary=""): + """Set a Sitelink for a Datapage. + page - the site to link to + summary - edit summary""" + sitename = page.site().dbName().replace("_p","") + return self.setitem(summary=summary, items={'type': 'sitelink', 'site': sitename, 'title': page.title()}) + def setitem(self, summary=None, watchArticle=False, minorEdit=True, newPage=False, token=None, newToken=False, sysop=False, captcha=None, botflag=True, maxTries=-1, items={}): @@ -4457,7 +4464,10 @@ params['value'] = items['value'] params['language'] = items['language'] elif items['type'] == u'sitelink': - params['linksite'] = items['site'] + u'wiki' + if "wiki" in items['site']: + params['linksite'] = items['site'] + else: + params['linksite'] = items['site'] + u'wiki' params['linktitle'] = items['title'] elif items['type'] == u'label': raise NotImplementedError( -- To view, visit https://gerrit.wikimedia.org/r/97706 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7aa615af154998c57fe5d7e4f992263e5db8c603 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 6 months

[Gerrit] Bug 57971 - fix generate_user_files.py crash - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Bug 57971 - fix generate_user_files.py crash ...................................................................... Bug 57971 - fix generate_user_files.py crash Fixes the incorrect family file reading introduced in https://gerrit.wikimedia.org/r/#/c/81500/ Change-Id: I2ccb3bce82518f53a6aab6aa10c5135be6553e42 --- M generate_user_files.py 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_user_files.py b/generate_user_files.py index dfa2a0a..a2fada7 100644 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -165,7 +165,10 @@ "just enter the number not name", default='wikipedia') if fam not in single_wiki_families: - codesds = codecs.open("pywikibot/families/%s_family.py" % fam, + codesds = codecs.open(os.path.join(pywikibot_dir, + "pywikibot", + "families", + "%s_family.py" % fam), "r", "utf-8").read() rre = re.compile("self\.languages\_by\_size *\= *(.+?)\]", re.DOTALL) -- To view, visit https://gerrit.wikimedia.org/r/99471 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2ccb3bce82518f53a6aab6aa10c5135be6553e42 Gerrit-PatchSet: 2 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: jenkins-bot

10 years, 6 months

[Gerrit] [BUGFIX] site object or language code is necessary for trans... - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [BUGFIX] site object or language code is necessary for translation ...................................................................... [BUGFIX] site object or language code is necessary for translation Change-Id: Ia0c6f416a788b0726573c4c5091c354a1ff04c6d --- M scripts/basic.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/basic.py b/scripts/basic.py index 96285e6..9f191f2 100755 --- a/scripts/basic.py +++ b/scripts/basic.py @@ -49,6 +49,7 @@ what would have been changed. @type dry: boolean. """ + site = pywikibot.getSite() self.generator = generator self.dry = dry # Set the edit summary message -- To view, visit https://gerrit.wikimedia.org/r/99624 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia0c6f416a788b0726573c4c5091c354a1ff04c6d 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: Mdupont <jamesmikedupont(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, 6 months

[Gerrit] Use % substitution instead of str.format - change (pywikibot/compat)

by Xqt (Code Review)

Xqt has submitted this change and it was merged. Change subject: Use % substitution instead of str.format ...................................................................... Use % substitution instead of str.format Python 2.5 does not have str.format() and it is not strictly necessary here. Change-Id: If23c8d2a42947381d25d26fced3437cbe35a900f --- M wikipedia.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved diff --git a/wikipedia.py b/wikipedia.py index d0d8488..6d30811 100644 --- a/wikipedia.py +++ b/wikipedia.py @@ -185,7 +185,7 @@ # Format string for the default user agent. -USER_AGENT_FORMAT = '{script}/r{version[rev]} Pywikipediabot/1.0' +USER_AGENT_FORMAT = '%(script)s/r%(versionrev)s Pywikipediabot/1.0' SaxError = xml.sax._exceptions.SAXParseException @@ -5982,9 +5982,9 @@ useragent = s # Default User-agent -setUserAgent(USER_AGENT_FORMAT.format( +setUserAgent(USER_AGENT_FORMAT % dict( script=('-'.join(version.get_executing_script())), - version=version.getversiondict() + versionrev=(version.getversiondict()["rev"]) )) -- To view, visit https://gerrit.wikimedia.org/r/98395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If23c8d2a42947381d25d26fced3437cbe35a900f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: saper <saper(a)saper.info> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 6 months

← Newer
1
...
17
18
19
20
21
22
23
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2013