Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

13418 discussions

[Gerrit] Remove implicit relative date import (explicit relative impo... - change (pywikibot/core)
by jenkins-bot (Code Review) 01 Dec '13

01 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: Remove implicit relative date import (explicit relative import is already there) ...................................................................... Remove implicit relative date import (explicit relative import is already there) Change-Id: I81b5713235ea54907b5fd6fa63196d1dfd1e246d --- M pywikibot/pagegenerators.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index baccca5..e35dc13 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -21,7 +21,6 @@ # import codecs -import date import itertools import re import time -- To view, visit https://gerrit.wikimedia.org/r/98286 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I81b5713235ea54907b5fd6fa63196d1dfd1e246d 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

1 0

[Gerrit] Remove print statement - change (pywikibot/core)
by jenkins-bot (Code Review) 01 Dec '13

01 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: Remove print statement ...................................................................... Remove print statement Change-Id: Ib9b14364539e320adc2cff37081952954ea8f03e --- M pywikibot/pagegenerators.py 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index baccca5..6e831e2 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1053,10 +1053,9 @@ link = '%s&%s&max=%d&order=img_timestamp' % (URL, wiki, limit) results = re.findall(REGEXP, http.request(site=None, uri=link)) if not results: - print link raise pywikibot.Error( - 'Nothing found! Try to use the tool by yourself to be sure that it ' - 'works!') + 'Nothing found at %s! Try to use the tool by yourself to be sure that it ' + 'works!' % link) else: for result in results: yield pywikibot.Page(pywikibot.getSite(), result) -- To view, visit https://gerrit.wikimedia.org/r/98287 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib9b14364539e320adc2cff37081952954ea8f03e 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

1 0

[Gerrit] Use relative imports - change (pywikibot/core)
by jenkins-bot (Code Review) 01 Dec '13

01 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: Use relative imports ...................................................................... Use relative imports Change-Id: I4f741502ef804a2531715e16db6ae28d5b48eea9 --- M pywikibot/__init__.py M pywikibot/comms/http.py M pywikibot/family.py M pywikibot/i18n.py M pywikibot/pagegenerators.py M pywikibot/textlib.py M pywikibot/userinterfaces/terminal_interface.py M pywikibot/userinterfaces/terminal_interface_base.py M pywikibot/userinterfaces/terminal_interface_unix.py M pywikibot/userinterfaces/terminal_interface_win32.py 10 files changed, 15 insertions(+), 15 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index a91fed6..a348be5 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -400,8 +400,8 @@ getSite = Site # alias for backwards-compability -from page import Page, ImagePage, Category, Link, User, ItemPage, PropertyPage, Claim -from page import html2unicode, url2unicode, unicode2html +from .page import Page, ImagePage, Category, Link, User, ItemPage, PropertyPage, Claim +from .page import html2unicode, url2unicode, unicode2html link_regex = re.compile(r'\[\[(?P<title>[^\]|[<>{}]*)(\|.*?)?\]\]') diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index a4ad829..ada81cd 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -32,7 +32,7 @@ from pywikibot.exceptions import FatalServerError, Server504Error import pywikibot import cookielib -import threadedhttp +from . import threadedhttp import pywikibot.version _logger = "comm.http" diff --git a/pywikibot/family.py b/pywikibot/family.py index 667309a..cc88490 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -13,7 +13,7 @@ import urllib import collections -import config2 as config +from . import config2 as config import pywikibot logger = logging.getLogger("pywiki.wiki.family") diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index f032e2e..92d3eb1 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -14,9 +14,9 @@ import re import locale from pywikibot import Error -from plural import plural_rules +from .plural import plural_rules import pywikibot -import config2 as config +from . import config2 as config PLURAL_PATTERN = '{{PLURAL:(?:%$)?([^$]*?)(?:\)d)?\|(.*?)}}' diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 0a9d2ae..baccca5 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -25,8 +25,8 @@ import itertools import re import time - import pywikibot +from . import date from pywikibot import config from pywikibot import deprecate_arg, i18n from pywikibot.comms import http diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 0cdd3ba..92e66d0 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -21,7 +21,7 @@ import pywikibot import re from HTMLParser import HTMLParser -import config2 as config +from . import config2 as config TEMP_REGEX = re.compile( '{{(?:msg:)?(?P<name>[^{\|]+?)(?:\|(?P<params>[^{]+?(?:{[^{]+?}[^{]*?)?))?}}') @@ -641,7 +641,7 @@ #--------------------------------------- def getCategoryLinks(text, site=None): - import catlib + from . import catlib """Return a list of category links found in text. List contains Category objects. diff --git a/pywikibot/userinterfaces/terminal_interface.py b/pywikibot/userinterfaces/terminal_interface.py index e6353ff..0e8db29 100644 --- a/pywikibot/userinterfaces/terminal_interface.py +++ b/pywikibot/userinterfaces/terminal_interface.py @@ -9,6 +9,6 @@ import sys if sys.platform == 'win32': - from terminal_interface_win32 import Win32UI as UI + from .terminal_interface_win32 import Win32UI as UI else: - from terminal_interface_unix import UnixUI as UI + from .terminal_interface_unix import UnixUI as UI diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index 9b1a656..a5d6ecb 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -6,7 +6,7 @@ # __version__ = '$Id$' -import transliteration +from . import transliteration import traceback import re import sys diff --git a/pywikibot/userinterfaces/terminal_interface_unix.py b/pywikibot/userinterfaces/terminal_interface_unix.py index e8e7246..984a5e5 100755 --- a/pywikibot/userinterfaces/terminal_interface_unix.py +++ b/pywikibot/userinterfaces/terminal_interface_unix.py @@ -6,7 +6,7 @@ # __version__ = '$Id$' -import terminal_interface_base +from . import terminal_interface_base # TODO: other colors: #0 = Black diff --git a/pywikibot/userinterfaces/terminal_interface_win32.py b/pywikibot/userinterfaces/terminal_interface_win32.py index d315fa7..d6e1d28 100755 --- a/pywikibot/userinterfaces/terminal_interface_win32.py +++ b/pywikibot/userinterfaces/terminal_interface_win32.py @@ -7,7 +7,7 @@ __version__ = '$Id$' import re -import terminal_interface_base +from . import terminal_interface_base try: import ctypes @@ -48,7 +48,7 @@ class Win32CtypesUI(Win32BaseUI): def __init__(self): Win32BaseUI.__init__(self) - from win32_unicode import stdin, stdout, stderr, argv + from .win32_unicode import stdin, stdout, stderr, argv self.stdin = stdin self.stdout = stdout self.stderr = stderr -- To view, visit https://gerrit.wikimedia.org/r/97881 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f741502ef804a2531715e16db6ae28d5b48eea9 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Aaron1011 <aa1ronham(a)gmail.com> Gerrit-Reviewer: Aaron1011 <aa1ronham(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

1 0

[Gerrit] Fixed dictionary-related items - change (pywikibot/core)
by jenkins-bot (Code Review) 01 Dec '13

01 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: Fixed dictionary-related items ...................................................................... Fixed dictionary-related items Change-Id: Ia3e5160409afe3e18e6f27d76f77daf7f57cbfd8 --- M pywikibot/__init__.py M pywikibot/bot.py M pywikibot/botirc.py M pywikibot/config2.py M pywikibot/data/api.py M pywikibot/date.py M pywikibot/families/anarchopedia_family.py M pywikibot/families/omegawiki_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wiktionary_family.py M pywikibot/family.py M pywikibot/i18n.py M pywikibot/interwiki_graph.py M pywikibot/page.py M pywikibot/site.py M pywikibot/textlib.py M pywikibot/titletranslate.py M pywikibot/userinterfaces/terminal_interface_unix.py M pywikibot/userinterfaces/terminal_interface_win32.py 19 files changed, 53 insertions(+), 53 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 92e9d63..a91fed6 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -521,7 +521,7 @@ # only need one drop() call because all throttles use the same global pid try: - _sites.values()[0].throttle.drop() + list(_sites.values())[0].throttle.drop() pywikibot.log(u"Dropped throttle(s).") except IndexError: pass diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 2db129f..b571fe7 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -264,7 +264,7 @@ # imported modules log(u'MODULES:') - for item in sys.modules.keys(): + for item in list(sys.modules.keys()): ver = version.getfileversion('%s.py' % item.replace('.', '/')) if ver: log(u' %s' % ver) @@ -719,7 +719,7 @@ module = __import__('%s' % modname) helpText = module.__doc__.decode('utf-8') if hasattr(module, 'docuReplacements'): - for key, value in module.docuReplacements.iteritems(): + for key, value in module.docuReplacements.items(): helpText = helpText.replace(key, value.strip('\n\r')) pywikibot.stdout(helpText) # output to STDOUT except Exception: diff --git a/pywikibot/botirc.py b/pywikibot/botirc.py index 8a847a9..d374a93 100644 --- a/pywikibot/botirc.py +++ b/pywikibot/botirc.py @@ -59,7 +59,7 @@ self.site = site self.other_ns = re.compile( u'14\[\[07(' + u'|'.join([item[0] for item in - site.namespaces().values() if item[0]]) + u')') + list(site.namespaces().values()) if item[0]]) + u')') self.api_url = self.site.family.apipath(self.site.lang) self.api_url += '?action=query&meta=siteinfo&siprop=statistics&format=xml' self.api_found = re.compile(r'articles="(.*?)"') diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 003c6e4..9457c9b 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -655,7 +655,7 @@ # Store current variables and their types. _glv = {} _glv.update(globals()) -_gl = _glv.keys() +_gl = list(_glv.keys()) _tp = {} for _key in _gl: if _key[0] != '_': @@ -681,7 +681,7 @@ % {'fn': _filename}) # Test for obsoleted and/or unknown variables. -for _key, _val in globals().items(): +for _key, _val in list(globals().items()): if _key.startswith('_'): pass elif _key in _gl: @@ -740,7 +740,7 @@ _all = 0 else: print("Unknown arg %(_arg)s ignored" % locals()) - _k = globals().keys() + _k = list(globals().keys()) _k.sort() for _name in _k: if _name[0] != '_': @@ -750,7 +750,7 @@ print(_name, "=", repr(globals()[_name])) # cleanup all locally-defined variables -for __var in globals().keys(): +for __var in list(globals().keys()): if __var.startswith("_") and not __var.startswith("__"): del __sys.modules[__name__].__dict__[__var] diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 313f2e2..2d8c4d9 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -155,7 +155,7 @@ del self.params[key] def keys(self): - return self.params.keys() + return list(self.params.keys()) def __contains__(self, key): return self.params.__contains__(key) @@ -167,7 +167,7 @@ return len(self.params) def iteritems(self): - return self.params.iteritems() + return iter(self.params.items()) def http_params(self): """Return the parameters formatted for inclusion in an HTTP request.""" @@ -278,7 +278,7 @@ eoh = body.find(marker) body = body[eoh + len(marker):] # retrieve the headers from the MIME object - mimehead = dict(container.items()) + mimehead = dict(list(container.items())) rawdata = http.request(self.site, uri, ssl, method="POST", headers=mimehead, body=body) else: @@ -680,7 +680,7 @@ if isinstance(resultdata, dict): pywikibot.debug(u"%s received %s; limit=%s" % (self.__class__.__name__, - resultdata.keys(), + list(resultdata.keys()), self.limit), _logger) if "results" in resultdata: @@ -722,7 +722,7 @@ % self.continuekey) return update = self.data["query-continue"][self.continuekey] - for key, value in update.iteritems(): + for key, value in update.items(): # query-continue can return ints if isinstance(value, int): value = str(value) diff --git a/pywikibot/date.py b/pywikibot/date.py index 46ccb54..6b2e59e 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -2282,7 +2282,7 @@ dictName is 'YearBC', 'December', etc. """ - for dictName, dict in formats.iteritems(): + for dictName, dict in formats.items(): try: year = dict[lang](title) return dictName, year @@ -2352,7 +2352,7 @@ pywikibot.output((u"Processing %s with limits from %d to %d and step %d" % (formatName, start, stop - 1, step))) - for code, convFunc in formats[formatName].iteritems(): + for code, convFunc in formats[formatName].items(): ## import time ## startClock = time.clock() for value in xrange(start, stop, step): diff --git a/pywikibot/families/anarchopedia_family.py b/pywikibot/families/anarchopedia_family.py index 037d015..5929098 100644 --- a/pywikibot/families/anarchopedia_family.py +++ b/pywikibot/families/anarchopedia_family.py @@ -19,7 +19,7 @@ for l in self.languages_by_size: self.langs[l] = '%s.anarchopedia.org' % l - self.nocapitalize = self.langs.keys() + self.nocapitalize = list(self.langs.keys()) self.obsolete = { 'ara': 'ar', diff --git a/pywikibot/families/omegawiki_family.py b/pywikibot/families/omegawiki_family.py index 4722987..f2ae535 100644 --- a/pywikibot/families/omegawiki_family.py +++ b/pywikibot/families/omegawiki_family.py @@ -16,7 +16,7 @@ # On most Wikipedias page names must start with a capital letter, but some # languages don't use this. - self.nocapitalize = self.langs.keys() + self.nocapitalize = list(self.langs.keys()) def hostname(self, code): return 'www.omegawiki.org' diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 8cde673..0e79f2f 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -87,6 +87,6 @@ 'zh': [102], } - for key, values in self.authornamespaces.iteritems(): + for key, values in self.authornamespaces.items(): for item in values: self.crossnamespace[item].update({key: self.authornamespaces}) diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index c769951..116be5f 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -45,7 +45,7 @@ # Other than most Wikipedias, page names must not start with a capital # letter on ALL Wiktionaries. - self.nocapitalize = self.langs.keys() + self.nocapitalize = list(self.langs.keys()) # Which languages have a special order for putting interlanguage links, # and what order is it? If a language is not in interwiki_putfirst, diff --git a/pywikibot/family.py b/pywikibot/family.py index 8b2dd72..667309a 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -831,8 +831,8 @@ @property def iwkeys(self): if self.interwiki_forward: - return pywikibot.Family(self.interwiki_forward).langs.keys() - return self.langs.keys() + return list(pywikibot.Family(self.interwiki_forward).langs.keys()) + return list(self.langs.keys()) def _addlang(self, code, location, namespaces={}): """Add a new language to the langs and namespaces of the family. diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index df64ef5..f032e2e 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -283,8 +283,8 @@ code = alt break else: - trans = xdict.values()[0] - code = xdict.keys()[0] + trans = list(xdict.values())[0] + code = list(xdict.keys())[0] if not trans: return # return None if we have no translation found if parameters is None: diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py index ee043ae..7e27d01 100644 --- a/pywikibot/interwiki_graph.py +++ b/pywikibot/interwiki_graph.py @@ -78,7 +78,7 @@ # if we found more than one valid page for this language: if len(filter(lambda p: p.site == page.site and p.exists() and not p.isRedirectPage(), # noqa - self.subject.foundIn.keys())) > 1: + list(self.subject.foundIn.keys()))) > 1: # mark conflict by octagonal node node.set_shape('octagon') self.graph.add_node(node) @@ -134,14 +134,14 @@ # create empty graph self.graph = pydot.Dot() # self.graph.set('concentrate', 'true') - for page in self.subject.foundIn.iterkeys(): + for page in self.subject.foundIn.keys(): # a node for each found page self.addNode(page) # mark start node by pointing there from a black dot. firstLabel = self.getLabel(self.subject.originPage) self.graph.add_node(pydot.Node('start', shape='point')) self.graph.add_edge(pydot.Edge('start', firstLabel)) - for page, referrers in self.subject.foundIn.iteritems(): + for page, referrers in self.subject.foundIn.items(): for refPage in referrers: self.addDirectedEdge(page, refPage) self.saveGraphFile() diff --git a/pywikibot/page.py b/pywikibot/page.py index 049aab0..c5636bf 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -854,12 +854,12 @@ if config.cosmetic_changes_mylang_only: cc = ((family == config.family and self.site.lang == config.mylang) or - family in config.cosmetic_changes_enable.keys() and + family in list(config.cosmetic_changes_enable.keys()) and self.site.lang in config.cosmetic_changes_enable[family]) else: cc = True cc = (cc and not - (family in config.cosmetic_changes_disable.keys() and + (family in list(config.cosmetic_changes_disable.keys()) and self.site.lang in config.cosmetic_changes_disable[family])) if not cc: return @@ -2389,7 +2389,7 @@ """ if force or not hasattr(self, '_content'): data = self.repo.loadcontent(self._defined_by(), *args) - self.id = data.keys()[0] + self.id = list(data.keys())[0] self._content = data[self.id] if 'lastrevid' in self._content: self.lastrevid = self._content['lastrevid'] @@ -2514,7 +2514,7 @@ value should be a list of strings. """ aliases = self.__normalizeLanguages(aliases) - for (key, strings) in aliases.items(): + for (key, strings) in list(aliases.items()): aliases[key] = [{'language': key, 'value': i} for i in strings] data = {'aliases': aliases} self.editEntity(data, **kwargs) @@ -2832,7 +2832,7 @@ more handling. """ source = collections.defaultdict(list) - for prop in data['snaks'].values(): + for prop in list(data['snaks'].values()): for claimsnak in prop: claim = Claim.fromJSON(site, {'mainsnak': claimsnak, 'hash': data['hash']}) @@ -3186,7 +3186,7 @@ t = t[t.index(u":"):].lstrip(u":").lstrip(u" ") self._namespace = ns break - if prefix in fam.langs.keys()\ + if prefix in list(fam.langs.keys())\ or prefix in fam.get_known_families(site=self._site): # looks like an interwiki link if not firstPass: @@ -3195,7 +3195,7 @@ "Improperly formatted interwiki link '%s'" % self._text) t = t[t.index(u":"):].lstrip(u":").lstrip(u" ") - if prefix in fam.langs.keys(): + if prefix in list(fam.langs.keys()): newsite = pywikibot.Site(prefix, fam) else: otherlang = self._site.code diff --git a/pywikibot/site.py b/pywikibot/site.py index 9399afa..9f36234 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -61,7 +61,7 @@ @classmethod def name(cls, search_value): - for key, value in cls.__dict__.iteritems(): + for key, value in cls.__dict__.items(): if key == key.upper() and value == search_value: return key raise KeyError("Value %r could not be found in this enum" @@ -135,7 +135,7 @@ raise NoSuchSite("Language %s in family %s is obsolete" % (self.__code, self.__family.name)) if self.__code not in self.languages(): - if self.__family.name in self.__family.langs.keys() and \ + if self.__family.name in list(self.__family.langs.keys()) and \ len(self.__family.langs) == 1: oldcode = self.__code self.__code = self.__family.name @@ -258,12 +258,12 @@ def languages(self): """Return list of all valid language codes for this site's Family.""" - return self.family.langs.keys() + return list(self.family.langs.keys()) def validLanguageLinks(self): """Return list of language codes that can be used in interwiki links.""" - nsnames = [name for name in self.namespaces().itervalues()] + nsnames = [name for name in self.namespaces().values()] return [lang for lang in self.languages() if lang[:1].upper() + lang[1:] not in nsnames] @@ -1407,7 +1407,7 @@ if target_title == title or "pages" not in result['query']: # no "pages" element indicates a circular redirect raise pywikibot.CircularRedirect(redirmap[title]) - pagedata = result['query']['pages'].values()[0] + pagedata = list(result['query']['pages'].values())[0] # there should be only one value in 'pages', and it is the target if self.sametitle(pagedata['title'], target_title): target = pywikibot.Page(self, pagedata['title'], pagedata['ns']) @@ -1450,7 +1450,7 @@ # only use pageids if all pages have them rvgen.request["pageids"] = "|".join(pageids) else: - rvgen.request["titles"] = "|".join(cache.keys()) + rvgen.request["titles"] = "|".join(list(cache.keys())) rvgen.request[u"rvprop"] = u"ids|flags|timestamp|user|comment|content" pywikibot.output(u"Retrieving %s pages from %s." % (len(cache), self)) @@ -1477,7 +1477,7 @@ except KeyError: pywikibot.debug(u"No 'title' in %s" % pagedata, _logger) pywikibot.debug(u"pageids=%s" % pageids, _logger) - pywikibot.debug(u"titles=%s" % cache.keys(), _logger) + pywikibot.debug(u"titles=%s" % list(cache.keys()), _logger) continue page = cache[pagedata['title']] api.update_page(page, pagedata) @@ -1559,7 +1559,7 @@ namespaces=namespaces, content=content ) - return itertools.chain(*genlist.values()) + return itertools.chain(*list(genlist.values())) return blgen def page_embeddedin(self, page, filterRedirects=None, namespaces=None, @@ -2429,7 +2429,7 @@ if where not in ("text", "titles"): raise Error("search: unrecognized 'where' value: %s" % where) if namespaces == []: - namespaces = [ns for ns in self.namespaces().keys() if ns >= 0] + namespaces = [ns for ns in list(self.namespaces().keys()) if ns >= 0] if not namespaces: pywikibot.warning(u"search: namespaces cannot be empty; using [0].") namespaces = [0] @@ -2960,7 +2960,7 @@ % page.title(asLink=True)) last_rev = page._revisions[page.latestRevision()] last_user = last_rev.user - for rev in sorted(page._revisions.keys(), reverse=True): + for rev in sorted(list(page._revisions.keys()), reverse=True): # start with most recent revision first if rev.user != last_user: prev_user = rev.user @@ -3263,7 +3263,7 @@ result = result["upload"] pywikibot.debug(result, _logger) if "warnings" in result: - warning = result["warnings"].keys()[0] + warning = list(result["warnings"].keys())[0] message = result["warnings"][warning] raise pywikibot.UploadWarning(upload_warnings[warning] % {'msg': message}) diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 4459b1c..0cdd3ba 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -90,7 +90,7 @@ # also finds links to foreign sites with preleading ":" 'interwiki': re.compile(r'(?i)\[\[:?(%s)\s?:[^\]]*\]\][\s]*' % '|'.join(site.validLanguageLinks() + - site.family.obsolete.keys())), + list(site.family.obsolete.keys()))), # Wikidata property inclusions 'property': re.compile(r'(?i)\{\{\s*#property:\s*p\d+\s*\}\}'), # Module invocations (currently only Lua) @@ -275,7 +275,7 @@ 'syntaxhighlight': r'<syntaxhighlight .*?</syntaxhighlight>', } if '*' in tags: - tags = regexes.keys() + tags = list(regexes.keys()) # add alias tags = set(tags) if 'source' in tags: @@ -430,7 +430,7 @@ # language, or if it's e.g. a category tag or an internal link if lang in fam.obsolete: lang = fam.obsolete[lang] - if lang in fam.langs.keys(): + if lang in list(fam.langs.keys()): if '|' in pagetitle: # ignore text after the pipe pagetitle = pagetitle[:pagetitle.index('|')] @@ -462,7 +462,7 @@ # This regular expression will find every interwiki link, plus trailing # whitespace. languages = '|'.join(site.validLanguageLinks() + - site.family.obsolete.keys()) + list(site.family.obsolete.keys())) interwikiR = re.compile(r'\[\[(%s)\s?:[^\[\]\n]*\]\][\s]*' % languages, re.IGNORECASE) text = replaceExcept(text, interwikiR, '', @@ -595,7 +595,7 @@ if not links: return '' - ar = interwikiSort(links.keys(), insite) + ar = interwikiSort(list(links.keys()), insite) s = [] for site in ar: try: diff --git a/pywikibot/titletranslate.py b/pywikibot/titletranslate.py index 9e1d15d..6ef5f0d 100644 --- a/pywikibot/titletranslate.py +++ b/pywikibot/titletranslate.py @@ -94,7 +94,7 @@ pywikibot.output( u'TitleTranslate: %s was recognized as %s with value %d' % (page.title(), dictName, value)) - for entryLang, entry in date.formats[dictName].iteritems(): + for entryLang, entry in date.formats[dictName].items(): if entryLang != page.site.code: if (dictName == 'yearsBC' and entryLang in date.maxyearBC and @@ -118,7 +118,7 @@ def appendFormatedDates(result, dictName, value): - for code, func in date.formats[dictName].iteritems(): + for code, func in date.formats[dictName].items(): result.append(u'[[%s:%s]]' % (code, func(value))) diff --git a/pywikibot/userinterfaces/terminal_interface_unix.py b/pywikibot/userinterfaces/terminal_interface_unix.py index 0ba718c..e8e7246 100755 --- a/pywikibot/userinterfaces/terminal_interface_unix.py +++ b/pywikibot/userinterfaces/terminal_interface_unix.py @@ -41,7 +41,7 @@ def printColorized(self, text, targetStream): lastColor = None totalcount = 0 - for key, value in unixColors.iteritems(): + for key, value in unixColors.items(): ckey = '\03{%s}' % key totalcount += text.count(ckey) text = text.replace(ckey, value) diff --git a/pywikibot/userinterfaces/terminal_interface_win32.py b/pywikibot/userinterfaces/terminal_interface_win32.py index 3b8cea1..d315fa7 100755 --- a/pywikibot/userinterfaces/terminal_interface_win32.py +++ b/pywikibot/userinterfaces/terminal_interface_win32.py @@ -35,7 +35,7 @@ 'white': 15, } -colorTagR = re.compile('\03{(?P<name>%s)}' % '|'.join(windowsColors.keys())) +colorTagR = re.compile('\03{(?P<name>%s)}' % '|'.join(list(windowsColors.keys()))) # Compat for python <= 2.5 -- To view, visit https://gerrit.wikimedia.org/r/97877 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia3e5160409afe3e18e6f27d76f77daf7f57cbfd8 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Aaron1011 <aa1ronham(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Fixed print statements - change (pywikibot/core)
by jenkins-bot (Code Review) 01 Dec '13

01 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: Fixed print statements ...................................................................... Fixed print statements Change-Id: Ia0edaf1b30b27d424d2b3fc2fd0fd827947dd72d --- M pywikibot/config2.py M pywikibot/date.py M pywikibot/pagegenerators.py M pywikibot/textlib.py M pywikibot/userinterfaces/terminal_interface_base.py M pywikibot/userinterfaces/win32_unicode.py 6 files changed, 23 insertions(+), 24 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 9f586c3..003c6e4 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -674,11 +674,11 @@ if __sys.platform == 'win32' or _filemode & 0o02 == 0 or True: exec(compile(open(_filename).read(), _filename, 'exec')) else: - print "WARNING: Skipped '%(fn)s': writeable by others." \ - % {'fn': _filename} + print("WARNING: Skipped '%(fn)s': writeable by others." \ + % {'fn': _filename}) else: - print "WARNING: Skipped '%(fn)s': owned by someone else." \ - % {'fn': _filename} + print("WARNING: Skipped '%(fn)s': owned by someone else." \ + % {'fn': _filename}) # Test for obsoleted and/or unknown variables. for _key, _val in globals().items(): @@ -696,14 +696,14 @@ elif ot is int and (nt is float or nt is bool): pass else: - print "WARNING: Type of '%(_key)s' changed" % locals() - print " %(was)s: %(old)s" % {'was': "Was", 'old': ot} - print " %(now)s: %(new)s" % {'now': "Now", 'new': nt} + print("WARNING: Type of '%(_key)s' changed" % locals()) + print(" %(was)s: %(old)s" % {'was': "Was", 'old': ot}) + print(" %(now)s: %(new)s" % {'now': "Now", 'new': nt}) del nt, ot else: - print("WARNING: " + print(("WARNING: " "Configuration variable %(_key)r is defined but unknown.\n" - "Misspelled?" % locals()) + "Misspelled?" % locals())) # Fix up default console_encoding if console_encoding is None: @@ -739,7 +739,7 @@ if _arg == "modified": _all = 0 else: - print "Unknown arg %(_arg)s ignored" % locals() + print("Unknown arg %(_arg)s ignored" % locals()) _k = globals().keys() _k.sort() for _name in _k: @@ -747,7 +747,7 @@ if not type(globals()[_name]) in [types.FunctionType, types.ModuleType]: if _all or _glv[_name] != globals()[_name]: - print _name, "=", repr(globals()[_name]) + print(_name, "=", repr(globals()[_name])) # cleanup all locally-defined variables for __var in globals().keys(): diff --git a/pywikibot/date.py b/pywikibot/date.py index 410540d..46ccb54 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -2349,8 +2349,8 @@ if value is not None: start, stop = value, value + 1 if showAll: - print(u"Processing %s with limits from %d to %d and step %d" - % (formatName, start, stop - 1, step)) + pywikibot.output((u"Processing %s with limits from %d to %d and step %d" + % (formatName, start, stop - 1, step))) for code, convFunc in formats[formatName].iteritems(): ## import time @@ -2366,12 +2366,12 @@ " %s != %s: assert failed, values didn't match" % (newValue, value)) if showAll: - print(u"date.formats['%s']['%s'](%d): '%s' -> %d" - % (formatName, code, value, convFunc(value), - newValue)) + pywikibot.output((u"date.formats['%s']['%s'](%d): '%s' -> %d" + % (formatName, code, value, convFunc(value), + newValue))) except: - print(u"********** Error in date.formats['%s']['%s'](%d)" - % (formatName, code, value)) + pywikibot.output((u"********** Error in date.formats['%s']['%s'](%d)" + % (formatName, code, value))) raise ## print(u"%s\t%s\t%f" % (formatName, code, time.clock() - startClock)) @@ -2393,7 +2393,7 @@ else: # Extensive test! Test decade rounding testMapEntry(formatName, showAll) - print(u"'%s' complete." % formatName) + pywikibot.output((u"'%s' complete." % formatName)) if quick: ## print(u'Date module quick consistency test passed') pass diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 4033f68..0a9d2ae 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1256,7 +1256,6 @@ while True: try: namespaceNumber, pageName = cursor.fetchone() - print namespaceNumber, pageName except TypeError: # Limit reached or no more results break diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 80ddf86..4459b1c 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -231,8 +231,8 @@ match.group(groupID) + \ replacement[groupMatch.end():]) except IndexError: - print '\nInvalid group reference:', groupID - print 'Groups found:\n', match.groups() + pywikibot.output('\nInvalid group reference: %s' % groupID) + pywikibot.output('Groups found:\n%s' % match.groups()) raise IndexError text = text[:match.start()] + replacement + text[match.end():] diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index 60ca7b9..9b1a656 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -238,7 +238,7 @@ try: import gui except ImportError as e: - print 'Could not load GUI modules: %s' % e + print('Could not load GUI modules: %s' % e) return text editor = gui.EditBoxWindow() return editor.edit(text, jumpIndex=jumpIndex, highlight=highlight) diff --git a/pywikibot/userinterfaces/win32_unicode.py b/pywikibot/userinterfaces/win32_unicode.py index b06025a..97a611a 100755 --- a/pywikibot/userinterfaces/win32_unicode.py +++ b/pywikibot/userinterfaces/win32_unicode.py @@ -42,7 +42,7 @@ # So be paranoid about catching errors and reporting them to original_stderr, # so that we can at least see them. def _complain(message): - print >>original_stderr, isinstance(message, str) and message or repr(message) + print(isinstance(message, str) and message or repr(message), file=original_stderr) # Work around <http://bugs.python.org/issue6058>. codecs.register(lambda name: name == 'cp65001' and codecs.lookup('utf-8') or None) -- To view, visit https://gerrit.wikimedia.org/r/97876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia0edaf1b30b27d424d2b3fc2fd0fd827947dd72d Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Aaron1011 <aa1ronham(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Import Queue: fix for python 3 - change (pywikibot/core)
by jenkins-bot (Code Review) 01 Dec '13

01 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: Import Queue: fix for python 3 ...................................................................... Import Queue: fix for python 3 Original patch (using six) by Aaron Hill Change-Id: I58970010bccbc675eeb494b3ff7b40fe0d314dd3 --- M pywikibot/__init__.py 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 34f7958..92e9d63 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -17,7 +17,11 @@ import re import sys import threading -from Queue import Queue + +try: + from queue import Queue +except ImportError: + from Queue import Queue # Use pywikibot. prefix for all in-package imports; this is to prevent # confusion with similarly-named modules in version 1 framework, for users -- To view, visit https://gerrit.wikimedia.org/r/97878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58970010bccbc675eeb494b3ff7b40fe0d314dd3 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Aaron1011 <aa1ronham(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Add --python3ok option to setup.py - change (pywikibot/core)
by jenkins-bot (Code Review) 01 Dec '13

01 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: Add --python3ok option to setup.py ...................................................................... Add --python3ok option to setup.py This allows us to run tests on Python 3.3+, while keeping the error message we only support Python 2. Change-Id: I7473a595a5acd464a74343f2d675f285033ec5b1 --- M setup.py 1 file changed, 19 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index c61b298..1b21060 100644 --- a/setup.py +++ b/setup.py @@ -19,16 +19,24 @@ from setuptools.command import install test_deps = [] +testcollector = "tests" -if sys.version_info[0] != 2: - raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2") -elif sys.version_info[1] < 6: - raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2.6 or higher") -elif sys.version_info[1] == 6: - test_deps = ['unittest2'] - testcollector = "tests.utils.collector" -else: - testcollector = "tests" +if sys.version_info[0] == 2: + if sys.version_info[1] < 6: + raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2.6 or higher") + elif sys.version_info[1] == 6: + test_deps = ['unittest2'] + testcollector = "tests.utils.collector" + +if sys.version_info[0] == 3: + if "--python3ok" not in sys.argv: + # 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) class pwb_install(install.install): @@ -68,5 +76,6 @@ ], cmdclass={ 'install': pwb_install - } + }, + use_2to3=False ) -- To view, visit https://gerrit.wikimedia.org/r/98272 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7473a595a5acd464a74343f2d675f285033ec5b1 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Use raise Err(...) instead of raise Err, ... - change (pywikibot/core)
by jenkins-bot (Code Review) 01 Dec '13

01 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: Use raise Err(...) instead of raise Err, ... ...................................................................... Use raise Err(...) instead of raise Err, ... Change-Id: Ia08d34e42c476f3a196d54413c251ae0d6721103 --- M scripts/replace.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index e02cb0c..c0686ba 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -544,7 +544,7 @@ pywikibot.Site().login() gen = genFactory.getCombinedGenerator() if (len(commandline_replacements) % 2): - raise pywikibot.Error, 'require even number of replacements.' + raise pywikibot.Error('require even number of replacements.') elif (len(commandline_replacements) == 2 and fix is None): replacements.append((commandline_replacements[0], commandline_replacements[1])) -- To view, visit https://gerrit.wikimedia.org/r/98280 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia08d34e42c476f3a196d54413c251ae0d6721103 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Remove all ur's - change (pywikibot/core)
by jenkins-bot (Code Review) 01 Dec '13

01 Dec '13

jenkins-bot has submitted this change and it was merged. Change subject: Remove all ur's ...................................................................... Remove all ur's PEP 414 re-introduced the u'...' syntax, but not the ur'...' syntax. This means we have to re-write all non-ASCII regexps in some way. I used different methods, depending on the context. 1) ASCII regexps, or regexp that get the unicode parts formatted (%s) in: --> replace ur'...' by r'...' 2) Regexps that do not contain any backslashes --> replace ur'...' by u'...' 2) Regexps with a single unicode part, e.g. ur'\{\{ä\}\}' --> replace by r'\{\{' + u'ä' + r'\}\}' 4) Complicated regexps --> copy-paste into python 2, and copy-paste the repr() back Change-Id: Ifd17b508baafcb30016d314852472371e47fa79c --- M pywikibot/fixes.py M pywikibot/page.py M pywikibot/textlib.py M pywikibot/titletranslate.py M scripts/blockpageschecker.py M scripts/category_redirect.py M scripts/cosmetic_changes.py M scripts/featured.py M scripts/interwiki.py M scripts/reflinks.py 10 files changed, 155 insertions(+), 146 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py index aafc6f0..02d6b31 100644 --- a/pywikibot/fixes.py +++ b/pywikibot/fixes.py @@ -122,7 +122,7 @@ # weggelassen wegen vieler falsch Positiver: s, A, V, C, S, J, % (u'(?<!\w)(\d+|\d+[\.,]\d+)(\$|€|DM|£|¥|mg|g|kg|ml|cl|l|t|ms|min|µm|mm|cm|dm|m|km|ha|°C|kB|MB|GB|TB|W|kW|MW|GW|PS|Nm|eV|kcal|mA|mV|kV|Ω|Hz|kHz|MHz|GHz|mol|Pa|Bq|Sv|mSv)(?=\W|²|³|$)', r'\1 \2'), # Temperaturangabe mit falsch gesetztem Leerzeichen - (u'(?<!\w)(\d+|\d+[\.,]\d+)° C(?=\W|²|³|$)', ur'\1 °C'), + (u'(?<!\w)(\d+|\d+[\.,]\d+)° C(?=\W|²|³|$)', r'\1' + u' °C'), # Kein Leerzeichen nach Komma (u'([a-zäöüß](\]\])?,)((\[\[)?[a-zäöüA-ZÄÖÜ])', r'\1 \3'), # Leerzeichen und Komma vertauscht @@ -152,8 +152,8 @@ 'inside': [ r'<code>.*</code>', # because of code examples r'{{[Zz]itat\|.*?}}', - ur'{{§\|.*?}}', # Gesetzesparagraph - ur'§ ?\d+[a-z]', # Gesetzesparagraph + r'{{' + u'§' + r'\|.*?}}', # Gesetzesparagraph + u'§' + r'?\d+[a-z]', # Gesetzesparagraph r'Ju 52/1m', # Flugzeugbezeichnung r'Ju 52/3m', # Flugzeugbezeichnung r'AH-1W', # Hubschrauberbezeichnung @@ -425,8 +425,17 @@ # hyphen-minus as separator, or spaces between digits and separators. # Note that these regular expressions also match valid ISBNs, but # these won't be changed. - (ur'ISBN (978|979) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d)(?!\d)', r'ISBN \1-\2-\3-\4-\5'), # ISBN-13 - (ur'ISBN (\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d|X|x)(?!\d)', r'ISBN \1-\2-\3-\4'), # ISBN-10 + + # NOTE + # The following regexps are in u'...' format because Python 3.3 does not support + # ur'...' strings. They have been converted by copy-pasting them to Python 2.7 + # and copying back the results. + + # ur'ISBN (978|979) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d)(?!\d)' + (u'ISBN (978|979) *[\\- \u2212\\.\u2010-\u2015] *(\\d+) *[\\- \u2212\\.\u2010-\u2015] *(\\d+) *[\\- \u2212\\.\u2010-\u2015] *(\\d+) *[\\- \u2212\\.\u2010-\u2015] *(\\d)(?!\\d)', r'ISBN \1-\2-\3-\4-\5'), # ISBN-13 + + # ur'ISBN (\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d|X|x)(?!\d)' + (u'ISBN (\\d+) *[\\- \u2212\\.\u2010-\u2015] *(\\d+) *[\\- \u2212\\.\u2010-\u2015] *(\\d+) *[\\- \u2212\\.\u2010-\u2015] *(\\d|X|x)(?!\\d)', r'ISBN \1-\2-\3-\4'), # ISBN-10 # missing space before ISBN-10 or before ISBN-13, # or non-breaking space. (r'ISBN(| | )((\d(-?)){12}\d|(\d(-?)){9}[\dXx])', r'ISBN \2'), @@ -453,96 +462,96 @@ }, 'replacements': [ #(u' ,', u' ،'), #FIXME: Do not replace comma in non-Arabic text, interwiki, image links or <math> syntax. - (ur'\bإمرأة\b', u'امرأة'), - (ur'\bالى\b', ur'إلى'), - (ur'\bإسم\b', u'اسم'), - (ur'\bالأن\b', u'الآن'), - (ur'\bالة\b', u'آلة'), - (ur'\bفى\b', u'في'), - (ur'\bإبن\b', u'ابن'), - (ur'\bإبنة\b', u'ابنة'), - (ur'\bإقتصاد\b', u'اقتصاد'), - (ur'\bإجتماع\b', u'اجتماع'), - (ur'\bانجيل\b', u'إنجيل'), - (ur'\bاجماع\b', u'إجماع'), - (ur'\bاكتوبر\b', u'أكتوبر'), - (ur'\bإستخراج\b', u'استخراج'), - (ur'\bإستعمال\b', u'استعمال'), - (ur'\bإستبدال\b', u'استبدال'), - (ur'\bإشتراك\b', u'اشتراك'), - (ur'\bإستعادة\b', u'استعادة'), - (ur'\bإستقلال\b', u'استقلال'), - (ur'\bإنتقال\b', u'انتقال'), - (ur'\bإتحاد\b', u'اتحاد'), - (ur'\bاملاء\b', u'إملاء'), - (ur'\bإستخدام\b', u'استخدام'), - (ur'\bأحدى\b', u'إحدى'), - (ur'\bلاكن\b', u'لكن'), - (ur'\bإثنان\b', u'اثنان'), - (ur'\bإحتياط\b', u'احتياط'), - (ur'\bإقتباس\b', u'اقتباس'), - (ur'\bادارة\b', u'إدارة'), - (ur'\bابناء\b', u'أبناء'), - (ur'\bالانصار\b', u'الأنصار'), - (ur'\bاشارة\b', u'إشارة'), - (ur'\bإقرأ\b', u'اقرأ'), - (ur'\bإمتياز\b', u'امتياز'), - (ur'\bارق\b', u'أرق'), - (ur'\bاللة\b', u'الله'), - (ur'\bإختبار\b', u'اختبار'), - (ur'==[ ]?روابط خارجية[ ]?==', u'== وصلات خارجية =='), - (ur'\bارسال\b', u'إرسال'), - (ur'\bإتصالات\b', u'اتصالات'), - (ur'\bابو\b', u'أبو'), - (ur'\bابا\b', u'أبا'), - (ur'\bاخو\b', u'أخو'), - (ur'\bاخا\b', u'أخا'), - (ur'\bاخي\b', u'أخي'), - (ur'\bاحد\b', u'أحد'), - (ur'\bاربعاء\b', u'أربعاء'), - (ur'\bاول\b', u'أول'), - (ur'\b(ال|)اهم\b', ur'\1أهم'), - (ur'\b(ال|)اثقل\b', ur'\1أثقل'), - (ur'\b(ال|)امجد\b', ur'\1أمجد'), - (ur'\b(ال|)اوسط\b', ur'\1أوسط'), - (ur'\b(ال|)اشقر\b', ur'\1أشقر'), - (ur'\b(ال|)انور\b', ur'\1أنور'), - (ur'\b(ال|)اصعب\b', ur'\1أصعب'), - (ur'\b(ال|)اسهل\b', ur'\1أسهل'), - (ur'\b(ال|)اجمل\b', ur'\1أجمل'), - (ur'\b(ال|)اقبح\b', ur'\1أقبح'), - (ur'\b(ال|)اطول\b', ur'\1أطول'), - (ur'\b(ال|)اقصر\b', ur'\1أقصر'), - (ur'\b(ال|)اسمن\b', ur'\1أسمن'), - (ur'\b(ال|)اذكى\b', ur'\1أذكى'), - (ur'\b(ال|)اكثر\b', ur'\1أكثر'), - (ur'\b(ال|)افضل\b', ur'\1أفضل'), - (ur'\b(ال|)اكبر\b', ur'\1أكبر'), - (ur'\b(ال|)اشهر\b', ur'\1أشهر'), - (ur'\b(ال|)ابطأ\b', ur'\1أبطأ'), - (ur'\b(ال|)اماني\b', ur'\1أماني'), - (ur'\b(ال|)احلام\b', ur'\1أحلام'), - (ur'\b(ال|)اسماء\b', ur'\1أسماء'), - (ur'\b(ال|)اسامة\b', ur'\1أسامة'), - (ur'\bابراهيم\b', u'إبراهيم'), - (ur'\bاسماعيل\b', u'إسماعيل'), - (ur'\bايوب\b', u'أيوب'), - (ur'\bايمن\b', u'أيمن'), - (ur'\bاوزبكستان\b', u'أوزبكستان'), - (ur'\bاذربيجان\b', u'أذربيجان'), - (ur'\bافغانستان\b', u'أفغانستان'), - (ur'\bانجلترا\b', u'إنجلترا'), - (ur'\bايطاليا\b', u'إيطاليا'), - (ur'\bاوربا\b', u'أوروبا'), - (ur'\bأوربا\b', u'أوروبا'), - (ur'\bاوغندة\b', u'أوغندة'), - (ur'\b(ال|)ا(لماني|فريقي|سترالي)(ا|ة|تان|ان|ين|ي|ون|و|ات|)\b', ur'\1أ\2\3'), - (ur'\b(ال|)ا(وروب|مريك)(ا|ي|ية|يتان|يان|يين|يي|يون|يو|يات|)\b', ur'\1أ\2\3'), - (ur'\b(ال|)ا(ردن|رجنتين|وغند|سبان|وكران|فغان)(ي|ية|يتان|يان|يين|يي|يون|يو|يات|)\b', ur'\1أ\2\3'), - (ur'\b(ال|)ا(سرائيل|يران|مارات|نكليز|نجليز)(ي|ية|يتان|يان|يين|يي|يون|يو|يات|)\b', ur'\1إ\2\3'), - (ur'\b(ال|)(ا|أ)(رثوذكس|رثوذوكس)(ي|ية|يتان|يان|يين|يي|يون|يو|يات|)\b', ur'\1أرثوذكس\4'), - (ur'\bإست(عمل|خدم|مر|مد|مال|عاض|قام|حال|جاب|قال|زاد|عان|طال)(ت|ا|وا|)\b', ur'است\1\2'), - (ur'\bإست(حال|قال|طال|زاد|عان|قام|راح|جاب|عاض|مال)ة\b', ur'است\1ة'), + (r'\b' + u'إمرأة' + r'\b', u'امرأة'), + (r'\b' + u'الى' + r'\b', u'إلى'), + (r'\b' + u'إسم' + r'\b', u'اسم'), + (r'\b' + u'الأن' + r'\b', u'الآن'), + (r'\b' + u'الة' + r'\b', u'آلة'), + (r'\b' + u'فى' + r'\b', u'في'), + (r'\b' + u'إبن' + r'\b', u'ابن'), + (r'\b' + u'إبنة' + r'\b', u'ابنة'), + (r'\b' + u'إقتصاد' + r'\b', u'اقتصاد'), + (r'\b' + u'إجتماع' + r'\b', u'اجتماع'), + (r'\b' + u'انجيل' + r'\b', u'إنجيل'), + (r'\b' + u'اجماع' + r'\b', u'إجماع'), + (r'\b' + u'اكتوبر' + r'\b', u'أكتوبر'), + (r'\b' + u'إستخراج' + r'\b', u'استخراج'), + (r'\b' + u'إستعمال' + r'\b', u'استعمال'), + (r'\b' + u'إستبدال' + r'\b', u'استبدال'), + (r'\b' + u'إشتراك' + r'\b', u'اشتراك'), + (r'\b' + u'إستعادة' + r'\b', u'استعادة'), + (r'\b' + u'إستقلال' + r'\b', u'استقلال'), + (r'\b' + u'إنتقال' + r'\b', u'انتقال'), + (r'\b' + u'إتحاد' + r'\b', u'اتحاد'), + (r'\b' + u'املاء' + r'\b', u'إملاء'), + (r'\b' + u'إستخدام' + r'\b', u'استخدام'), + (r'\b' + u'أحدى' + r'\b', u'إحدى'), + (r'\b' + u'لاكن' + r'\b', u'لكن'), + (r'\b' + u'إثنان' + r'\b', u'اثنان'), + (r'\b' + u'إحتياط' + r'\b', u'احتياط'), + (r'\b' + u'إقتباس' + r'\b', u'اقتباس'), + (r'\b' + u'ادارة' + r'\b', u'إدارة'), + (r'\b' + u'ابناء' + r'\b', u'أبناء'), + (r'\b' + u'الانصار' + r'\b', u'الأنصار'), + (r'\b' + u'اشارة' + r'\b', u'إشارة'), + (r'\b' + u'إقرأ' + r'\b', u'اقرأ'), + (r'\b' + u'إمتياز' + r'\b', u'امتياز'), + (r'\b' + u'ارق' + r'\b', u'أرق'), + (r'\b' + u'اللة' + r'\b', u'الله'), + (r'\b' + u'إختبار' + r'\b', u'اختبار'), + (u'==[ ]?روابط خارجية[ ]?==', u'== وصلات خارجية =='), + (r'\b' + u'ارسال' + r'\b', u'إرسال'), + (r'\b' + u'إتصالات' + r'\b', u'اتصالات'), + (r'\b' + u'ابو' + r'\b', u'أبو'), + (r'\b' + u'ابا' + r'\b', u'أبا'), + (r'\b' + u'اخو' + r'\b', u'أخو'), + (r'\b' + u'اخا' + r'\b', u'أخا'), + (r'\b' + u'اخي' + r'\b', u'أخي'), + (r'\b' + u'احد' + r'\b', u'أحد'), + (r'\b' + u'اربعاء' + r'\b', u'أربعاء'), + (r'\b' + u'اول' + r'\b', u'أول'), + (r'\b' + u'(ال|)اهم' + r'\b', u'\\1أهم'), + (r'\b' + u'(ال|)اثقل' + r'\b', u'\\1أثقل'), + (r'\b' + u'(ال|)امجد' + r'\b', u'\\1أمجد'), + (r'\b' + u'(ال|)اوسط' + r'\b', u'\\1أوسط'), + (r'\b' + u'(ال|)اشقر' + r'\b', u'\\1أشقر'), + (r'\b' + u'(ال|)انور' + r'\b', u'\\1أنور'), + (r'\b' + u'(ال|)اصعب' + r'\b', u'\\1أصعب'), + (r'\b' + u'(ال|)اسهل' + r'\b', u'\\1أسهل'), + (r'\b' + u'(ال|)اجمل' + r'\b', u'\\1أجمل'), + (r'\b' + u'(ال|)اقبح' + r'\b', u'\\1أقبح'), + (r'\b' + u'(ال|)اطول' + r'\b', u'\\1أطول'), + (r'\b' + u'(ال|)اقصر' + r'\b', u'\\1أقصر'), + (r'\b' + u'(ال|)اسمن' + r'\b', u'\\1أسمن'), + (r'\b' + u'(ال|)اذكى' + r'\b', u'\\1أذكى'), + (r'\b' + u'(ال|)اكثر' + r'\b', u'\\1أكثر'), + (r'\b' + u'(ال|)افضل' + r'\b', u'\\1أفضل'), + (r'\b' + u'(ال|)اكبر' + r'\b', u'\\1أكبر'), + (r'\b' + u'(ال|)اشهر' + r'\b', u'\\1أشهر'), + (r'\b' + u'(ال|)ابطأ' + r'\b', u'\\1أبطأ'), + (r'\b' + u'(ال|)اماني' + r'\b', u'\\1أماني'), + (r'\b' + u'(ال|)احلام' + r'\b', u'\\1أحلام'), + (r'\b' + u'(ال|)اسماء' + r'\b', u'\\1أسماء'), + (r'\b' + u'(ال|)اسامة' + r'\b', u'\\1أسامة'), + (r'\b' + u'ابراهيم' + r'\b', u'إبراهيم'), + (r'\b' + u'اسماعيل' + r'\b', u'إسماعيل'), + (r'\b' + u'ايوب' + r'\b', u'أيوب'), + (r'\b' + u'ايمن' + r'\b', u'أيمن'), + (r'\b' + u'اوزبكستان' + r'\b', u'أوزبكستان'), + (r'\b' + u'اذربيجان' + r'\b', u'أذربيجان'), + (r'\b' + u'افغانستان' + r'\b', u'أفغانستان'), + (r'\b' + u'انجلترا' + r'\b', u'إنجلترا'), + (r'\b' + u'ايطاليا' + r'\b', u'إيطاليا'), + (r'\b' + u'اوربا' + r'\b', u'أوروبا'), + (r'\b' + u'أوربا' + r'\b', u'أوروبا'), + (r'\b' + u'اوغندة' + r'\b', u'أوغندة'), + (r'\b' + u'(ال|)ا(لماني|فريقي|سترالي)(ا|ة|تان|ان|ين|ي|ون|و|ات|)' + r'\b', u'\\1أ\\2\\3'), + (r'\b' + u'(ال|)ا(وروب|مريك)(ا|ي|ية|يتان|يان|يين|يي|يون|يو|يات|)' + r'\b', u'\\1أ\\2\\3'), + (r'\b' + u'(ال|)ا(ردن|رجنتين|وغند|سبان|وكران|فغان)(ي|ية|يتان|يان|يين|يي|يون|يو|يات|)' + r'\b', u'\\1أ\\2\\3'), + (r'\b' + u'(ال|)ا(سرائيل|يران|مارات|نكليز|نجليز)(ي|ية|يتان|يان|يين|يي|يون|يو|يات|)' + r'\b', u'\\1إ\\2\\3'), + (r'\b' + u'(ال|)(ا|أ)(رثوذكس|رثوذوكس)(ي|ية|يتان|يان|يين|يي|يون|يو|يات|)' + r'\b', u'\\1أرثوذكس\\4'), + (r'\b' + u'إست(عمل|خدم|مر|مد|مال|عاض|قام|حال|جاب|قال|زاد|عان|طال)(ت|ا|وا|)' + r'\b', u'است\\1\\2'), + (r'\b' + u'إست(حال|قال|طال|زاد|عان|قام|راح|جاب|عاض|مال)ة' + r'\b', u'است\\1ة'), ], 'exceptions': { 'inside-tags': [ diff --git a/pywikibot/page.py b/pywikibot/page.py index 1db43d3..9b6a6db 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -3046,7 +3046,7 @@ """ illegal_titles_pattern = re.compile( # Matching titles will be held as illegal. - ur'''[\x00-\x1f\x23\x3c\x3e\x5b\x5d\x7b\x7c\x7d\x7f]''' + r'''[\x00-\x1f\x23\x3c\x3e\x5b\x5d\x7b\x7c\x7d\x7f]''' # URL percent encoding sequences interfere with the ability # to round-trip titles -- you can't link to them consistently. u'|%[0-9A-Fa-f]{2}' diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index b4eb950..80ddf86 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -96,9 +96,9 @@ # Module invocations (currently only Lua) 'invoke': re.compile(r'(?i)\{\{\s*#invoke:.*?}\}'), # categories - 'category': re.compile(ur'\[\[ *(?:%s)\s*:.*?\]\]' % ur'|'.join(site.namespace(14, all=True))), + 'category': re.compile(u'\[\[ *(?:%s)\s*:.*?\]\]' % u'|'.join(site.namespace(14, all=True))), #files - 'file': re.compile(ur'\[\[ *(?:%s)\s*:.*?\]\]' % ur'|'.join(site.namespace(6, all=True))), + 'file': re.compile(u'\[\[ *(?:%s)\s*:.*?\]\]' % u'|'.join(site.namespace(6, all=True))), } @@ -947,12 +947,12 @@ marker4 = findmarker(thistxt, u'§§', u'§') result = [] - Rmath = re.compile(ur'<math>[^<]+</math>') + Rmath = re.compile(r'<math>[^<]+</math>') Rvalue = re.compile(r'{{{.+?}}}') - Rmarker1 = re.compile(ur'%s(\d+)%s' % (marker1, marker1)) - Rmarker2 = re.compile(ur'%s(\d+)%s' % (marker2, marker2)) - Rmarker3 = re.compile(ur'%s(\d+)%s' % (marker3, marker3)) - Rmarker4 = re.compile(ur'%s(\d+)%s' % (marker4, marker4)) + Rmarker1 = re.compile(r'%s(\d+)%s' % (marker1, marker1)) + Rmarker2 = re.compile(r'%s(\d+)%s' % (marker2, marker2)) + Rmarker3 = re.compile(r'%s(\d+)%s' % (marker3, marker3)) + Rmarker4 = re.compile(r'%s(\d+)%s' % (marker4, marker4)) # Replace math with markers maths = {} diff --git a/pywikibot/titletranslate.py b/pywikibot/titletranslate.py index db05833..9e1d15d 100644 --- a/pywikibot/titletranslate.py +++ b/pywikibot/titletranslate.py @@ -56,7 +56,7 @@ newname = page.title() # ... unless we do want brackets if removebrackets: - newname = re.sub(re.compile(ur"\W*?$.*?$\W*?", re.UNICODE), u" ", newname) + newname = re.sub(re.compile(r"\W*?$.*?$\W*?", re.UNICODE), u" ", newname) try: number = int(codes) codes = site.family.languages_by_size[:number] diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index d6a5677..fa0a65c 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -85,8 +85,8 @@ 'en': None, 'it': [r'\{\{(?:[Tt]emplate:|)[Aa]vvisobloccoparziale(?:|[ _]scad\|.*?|\|.*?)\}\}', r'\{\{(?:[Tt]emplate:|)[Aa]bp(?:|[ _]scad\|(?:.*?))\}\}'], - 'fr': [ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Ss]emi[- ]?protection(|[^\}]*)\}\}'], - 'ja': [ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)半保護(?:[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 +94,23 @@ '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': [ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)[Pp]rotection(|[^\}]*)\}\}', - ur'\{\{(?:[Tt]emplate:|[Mm]odèle:|)(?:[Pp]age|[Aa]rchive|[Mm]odèle) protégée?(|[^\}]*)\}\}'], - 'ja': [ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)保護(?:性急|)(?:[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': [ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)移動半保護(?:[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': [ur'(?<!\<nowiki\>)\{\{(?:[Tt]emplate:|)移動保護(?:[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. diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index a6f54c3..5f8a5bd 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -257,15 +257,15 @@ # note that any templates containing optional "category:" are # incorrect and will be fixed by the bot template_regex = re.compile( - ur"""{{\s*(?:%(prefix)s\s*:\s*)? # optional "template:" - (?:%(template)s)\s*\| # catredir template name - (\s*%(catns)s\s*:\s*)? # optional "category:" - ([^|}]+) # redirect target cat - (?:\|[^|}]*)*}} # optional arguments 2+, ignored - """ % {'prefix': self.site.namespace(10).lower(), - 'template': "|".join(item.replace(" ", "[ _]+") - for item in template_list), - 'catns': self.site.namespace(14)}, + r"""{{\s*(?:%(prefix)s\s*:\s*)? # optional "template:" + (?:%(template)s)\s*\| # catredir template name + (\s*%(catns)s\s*:\s*)? # optional "category:" + ([^|}]+) # redirect target cat + (?:\|[^|}]*)*}} # optional arguments 2+, ignored + """ % {'prefix': self.site.namespace(10).lower(), + 'template': "|".join(item.replace(" ", "[ _]+") + for item in template_list), + 'catns': self.site.namespace(14)}, re.I | re.X) # check for hard-redirected categories that are not already marked diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py index 557873e..a99b8db 100755 --- a/scripts/cosmetic_changes.py +++ b/scripts/cosmetic_changes.py @@ -697,27 +697,27 @@ # convert prettytable to wikitable class if self.site.language in ('de', 'en'): text = pywikibot.replaceExcept(text, - ur'(class="[^"]*)prettytable([^"]*")', - ur'\1wikitable\2', exceptions) + r'(class="[^"]*)prettytable([^"]*")', + r'\1wikitable\2', exceptions) return text def fixTypo(self, text): exceptions = ['nowiki', 'comment', 'math', 'pre', 'source', 'startspace', 'gallery', 'hyperlink', 'interwiki', 'link'] # change <number> ccm -> <number> cm³ - text = pywikibot.replaceExcept(text, ur'(\d)\s* ccm', - ur'\1 cm³', exceptions) - text = pywikibot.replaceExcept(text, ur'(\d)\s*ccm', ur'\1 cm³', + text = pywikibot.replaceExcept(text, r'(\d)\s* ccm', + r'\1 ' + u'cm³', exceptions) + text = pywikibot.replaceExcept(text, r'(\d)\s*ccm', r'\1 ' + u'cm³', exceptions) # Solve wrong Nº sign with °C or °F # additional exception requested on fr-wiki for this stuff pattern = re.compile(u'«.*?»', re.UNICODE) exceptions.append(pattern) - text = pywikibot.replaceExcept(text, ur'(\d)\s* [º°]([CF])', - ur'\1 °\2', exceptions) - text = pywikibot.replaceExcept(text, ur'(\d)\s*[º°]([CF])', - ur'\1 °\2', exceptions) - text = pywikibot.replaceExcept(text, ur'º([CF])', ur'°\1', exceptions) + text = pywikibot.replaceExcept(text, r'(\d)\s* ' + u'[º°]([CF])', + r'\1 ' + u'°' + r'\2', exceptions) + text = pywikibot.replaceExcept(text, r'(\d)\s*' + u'[º°]([CF])', + r'\1 ' + u'°' + r'\2', exceptions) + text = pywikibot.replaceExcept(text, u'º([CF])', u'°' + r'\1', exceptions) return text def fixArabicLetters(self, text): @@ -756,12 +756,12 @@ text = pywikibot.replaceExcept(text, u',', u'،', exceptions) if self.site.lang == 'ckb': text = pywikibot.replaceExcept(text, - ur'ه([.،_<\]\s])', - ur'ە\1', exceptions) + u'\u0647([.\u060c_<\\]\\s])', + u'\u06d5\\1', exceptions) text = pywikibot.replaceExcept(text, u'ه‌', u'ە', exceptions) text = pywikibot.replaceExcept(text, u'ه', u'ھ', exceptions) text = pywikibot.replaceExcept(text, u'ك', u'ک', exceptions) - text = pywikibot.replaceExcept(text, ur'[ىي]', u'ی', exceptions) + text = pywikibot.replaceExcept(text, u'[ىي]', u'ی', exceptions) return text # replace persian/arabic digits ## deactivated due to bug #3539407 diff --git a/scripts/featured.py b/scripts/featured.py index bffea39..b81bbb6 100644 --- a/scripts/featured.py +++ b/scripts/featured.py @@ -519,7 +519,7 @@ def compile_link(site, templates): """compile one link template list""" findtemplate = '(%s)' % '|'.join(templates) - return re.compile(ur"\{\{%s\|%s\}\}" + return re.compile(r"\{\{%s\|%s\}\}" % (findtemplate.replace(u' ', u'[ _]'), site.code), re.IGNORECASE) diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 74fd13b..9a91417 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -516,7 +516,7 @@ f = codecs.open(hintfilename, 'r', config.textfile_encoding) # hint or title ends either before | or before ]] - R = re.compile(ur'\[\[(.+?)(?:\]\]|\|)') + R = re.compile(r'\[\[(.+?)(?:\]\]|\|)') for pageTitle in R.findall(f.read()): self.hints.append(pageTitle) f.close() diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 6a024cd..f95c4ef 100644 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -103,14 +103,14 @@ soft404 = re.compile( - ur'\D404(\D|\Z)|error|errdoc|Not.{0,3}Found|sitedown|eventlog', + r'\D404(\D|\Z)|error|errdoc|Not.{0,3}Found|sitedown|eventlog', re.IGNORECASE) # matches an URL at the index of a website dirIndex = re.compile( - ur'^\w+://[^/]+/((default|index)\.(asp|aspx|cgi|htm|html|phtml|mpx|mspx|php|shtml|var))?$', + r'^\w+://[^/]+/((default|index)\.(asp|aspx|cgi|htm|html|phtml|mpx|mspx|php|shtml|var))?$', re.IGNORECASE) # Extracts the domain name -domain = re.compile(ur'^(\w+)://(?:www.|)([^/]+)') +domain = re.compile(r'^(\w+)://(?:www.|)([^/]+)') globalbadtitles = """ # is @@ -162,11 +162,11 @@ # Regex that match bare references linksInRef = re.compile( # bracketed URLs - ur'(?i)<ref(?P<name>[^>]*)>\s*\[?(?P<url>(?:http|https|ftp)://(?:' + + r'(?i)<ref(?P<name>[^>]*)>\s*\[?(?P<url>(?:http|https|ftp)://(?:' + # unbracketed with() - ur'^\[\]\s<>"]+$[^\[\]\s<>"]+[^\[\]\s\.:;\\,<>\?"]+|' + + r'^\[\]\s<>"]+\([^\[\]\s<>"]+[^\[\]\s\.:;\\,<>\?"]+|' + # unbracketed without () - ur'[^\[\]\s<>"]+[^\[\]\s$\.:;\\,<>\?"]+|[^\[\]\s<>"]+))[!?,\s]*\]?\s*</ref>') + r'[^\[\]\s<>"]+[^\[\]\s\)\.:;\\,<>\?"]+|[^\[\]\s<>"]+))[!?,\s]*\]?\s*</ref>') # Download this file : # http://www.twoevils.org/files/wikipedia/404-links.txt.gz @@ -436,18 +436,18 @@ raise # Regex to grasp content-type meta HTML tag in HTML source - self.META_CONTENT = re.compile(ur'(?i)<meta[^>]*content\-type[^>]*>') + self.META_CONTENT = re.compile(r'(?i)<meta[^>]*content\-type[^>]*>') # Extract the encoding from a charset property (from content-type !) - self.CHARSET = re.compile(ur'(?i)charset\s*=\s*(?P<enc>[^\'";>/]*)') + self.CHARSET = re.compile(r'(?i)charset\s*=\s*(?P<enc>[^\'";>/]*)') # Extract html title from page - self.TITLE = re.compile(ur'(?is)(?<=<title>).*?(?=</title>)') + self.TITLE = re.compile(r'(?is)(?<=<title>).*?(?=</title>)') # Matches content inside <script>/<style>/HTML comments self.NON_HTML = re.compile( - ur'(?is)<script[^>]*>.*?</script>|<style[^>]*>.*?</style>||<!\[CDATA\[.*?\]\]>') + r'(?is)<script[^>]*>.*?</script>|<style[^>]*>.*?</style>||<!\[CDATA\[.*?\]\]>') # Authorized mime types for HTML pages self.MIME = re.compile( - ur'application/(?:xhtml\+xml|xml)|text/(?:ht|x)ml') + r'application/(?:xhtml\+xml|xml)|text/(?:ht|x)ml') def put_page(self, page, new): """ Prints diffs between orginal and new (text), puts new text for page -- To view, visit https://gerrit.wikimedia.org/r/98277 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd17b508baafcb30016d314852472371e47fa79c 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Replace print statements by pywikibot.output - change (pywikibot/core)
by jenkins-bot (Code Review) 30 Nov '13

30 Nov '13

jenkins-bot has submitted this change and it was merged. Change subject: Replace print statements by pywikibot.output ...................................................................... Replace print statements by pywikibot.output Change-Id: I1003d927d27a7c77a7aecda086f6737d3c225ebe --- M scripts/category.py M scripts/flickrripper.py M scripts/harvest_template.py M scripts/pagefromfile.py M scripts/reflinks.py M scripts/replicate_wiki.py M scripts/solve_disambiguation.py M scripts/upload.py M scripts/version.py 9 files changed, 49 insertions(+), 55 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category.py b/scripts/category.py index ddf5262..e5ede3d 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -672,19 +672,16 @@ contextLength = full_text.find('\n\n', contextLength + 2) if contextLength > 1000 or contextLength < 0: contextLength = 500 - print - pywikibot.output(full_text[:contextLength]) - print + + pywikibot.output('\n' + full_text[:contextLength] + '\n') subcatlist = self.catDB.getSubcats(current_cat) supercatlist = self.catDB.getSupercats(current_cat) - print + if len(subcatlist) == 0: - print 'This category has no subcategories.' - print + pywikibot.output('This category has no subcategories.\n') if len(supercatlist) == 0: - print 'This category has no supercategories.' - print + pywikibot.output('This category has no supercategories.\n') # show subcategories as possible choices (with numbers) for i in range(len(supercatlist)): # layout: we don't expect a cat to have more than 10 supercats @@ -694,22 +691,22 @@ # layout: we don't expect a cat to have more than 100 subcats pywikibot.output(u'%2d - Move down to %s' % (i, subcatlist[i].title())) - print ' j - Jump to another category' - print ' s - Skip this article' - print ' r - Remove this category tag' - print ' ? - Print first part of the page (longer and longer)' + pywikibot.output(' j - Jump to another category') + pywikibot.output(' s - Skip this article') + pywikibot.output(' r - Remove this category tag') + pywikibot.output(' ? - Print first part of the page (longer and longer)') pywikibot.output(u'Enter - Save category as %s' % current_cat.title()) flag = False while not flag: - print '' + pywikibot.output('') choice = pywikibot.input(u'Choice:') if choice in ['s', 'S']: flag = True elif choice == '': pywikibot.output(u'Saving category as %s' % current_cat.title()) if current_cat == original_cat: - print 'No changes necessary.' + pywikibot.output('No changes necessary.') else: catlib.change_category(article, original_cat, current_cat, comment=self.editSummary) @@ -728,15 +725,13 @@ flag = True elif choice == '?': contextLength += 500 - print - pywikibot.output(full_text[:contextLength]) - print + pywikibot.output('\n' + full_text[:contextLength] + '\n') # if categories possibly weren't visible, show them additionally # (maybe this should always be shown?) if len(full_text) > contextLength: - print '' - print 'Original categories: ' + pywikibot.output('') + pywikibot.output('Original categories: ') for cat in article.categories(): pywikibot.output(u'* %s' % cat.title()) elif choice[0] == 'u': diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index da96c14..d36275d 100644 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -257,7 +257,7 @@ autonomous=False): """ Process a single Flickr photo """ if photo_id: - print photo_id + pywikibot.output(str(photo_id)) (photoInfo, photoSizes) = getPhoto(flickr, photo_id) if isAllowedLicense(photoInfo) or override: #Get the url of the largest photo @@ -522,7 +522,7 @@ pywikibot.input("Press ENTER after you authorized this program") flickr.get_token_part_two((token, frob)) else: - print 'Accessing public content only' + pywikibot.output('Accessing public content only') flickr = flickrapi.FlickrAPI(config.flickr['api_key']) group_id = u'' @@ -547,7 +547,7 @@ if config.flickr['reviewer']: reviewer = config.flickr['reviewer'] elif 'commons' in config.sysopnames['commons']: - print config.sysopnames['commons'] + pywikibot.output(config.sysopnames['commons']) reviewer = config.sysopnames['commons']['commons'] elif 'commons' in config.usernames['commons']: reviewer = config.usernames['commons']['commons'] diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index ea01b18..a0a947f 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -146,7 +146,7 @@ elif claim.getType() == 'string': claim.setTarget(value.strip()) else: - print "%s is not a supported datatype." % claim.getType() + pywikibot.output("%s is not a supported datatype." % claim.getType()) continue pywikibot.output('Adding %s --> %s' % (claim.getID(), claim.getTarget())) diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py index 2a8c56c..d6dcb34 100644 --- a/scripts/pagefromfile.py +++ b/scripts/pagefromfile.py @@ -259,7 +259,7 @@ f = codecs.open(self.filename, 'r', encoding=config.textfile_encoding) except IOError as err: - print err + pywikibot.output(str(err)) return text = f.read() diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 9320ab6..a1cacd3 100644 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -336,7 +336,7 @@ if not name in foundRefNames: # first time ever we meet this name if name == 'population': - print "in" + pywikibot.output("in") v[2] = quoted v[0] = name else: diff --git a/scripts/replicate_wiki.py b/scripts/replicate_wiki.py index c2c80d0..67d073d 100644 --- a/scripts/replicate_wiki.py +++ b/scripts/replicate_wiki.py @@ -58,7 +58,7 @@ else: original_wiki = config.mylang - print "Syncing from " + original_wiki + pywikibot.output("Syncing from " + original_wiki) family = options.family or config.family @@ -69,19 +69,19 @@ if options.namespace and 'help' in options.namespace: nsd = namespaces(self.original) for k in nsd: - print k, nsd[k] + pywikibot.output('%s %s' % (k, nsd[k])) sys.exit() self.sites = map(lambda s: getSite(s, family), sites) self.differences = {} self.user_diff = {} - print 'Syncing to', + pywikibot.output('Syncing to', newline=False) for s in self.sites: self.differences[s] = [] self.user_diff[s] = [] - print s, - print + pywikibot.output(str(s), newline=False) + pywikibot.output('') def check_sysops(self): '''Check if sysops are the same @@ -115,9 +115,9 @@ ] if self.options.namespace: - print options.namespace + pywikibot.output(str(options.namespace)) namespaces = [int(options.namespace)] - print "Checking these namespaces", namespaces, "\n" + pywikibot.output("Checking these namespaces: %s\n" % (namespaces,)) for ns in namespaces: self.check_namespace(ns) @@ -125,7 +125,7 @@ def check_namespace(self, namespace): '''Check an entire namespace''' - print "\nCHECKING NAMESPACE", namespace + pywikibot.output("\nCHECKING NAMESPACE %s" % namespace) pages = imap(lambda p: p.title(), self.original.allpages('!', namespace=namespace)) for p in pages: @@ -134,10 +134,10 @@ try: self.check_page(p) except pywikibot.exceptions.NoPage: - print 'Bizarre NoPage exception that we are just going to ignore' + pywikibot.output('Bizarre NoPage exception that we are just going to ignore') except pywikibot.exceptions.IsRedirectPage: - print 'error: Redirectpage - todo: handle gracefully' - print + pywikibot.output('error: Redirectpage - todo: handle gracefully') + pywikibot.output('') def generate_overviews(self): '''Create page on wikis with overview of bot results''' @@ -155,7 +155,7 @@ else: output += "All users from original are also present on this wiki" - print output + pywikibot.output(output) sync_overview_page.put(output, self.put_message(site)) def put_message(self, site): @@ -164,7 +164,7 @@ def check_page(self, pagename): '''Check one page''' - print "\nChecking", pagename, + pywikibot.output("\nChecking %s" % pagename) sys.stdout.flush() page1 = Page(self.original, pagename) txt1 = page1.get() @@ -175,7 +175,7 @@ if prefix: prefix += ':' new_pagename = prefix + page1.titleWithoutNamespace() - print "\nCross namespace, new title: ", new_pagename + pywikibot.output("\nCross namespace, new title: %s", new_pagename) else: new_pagename = pagename @@ -189,12 +189,12 @@ if str(site) in config.replicate_replace: txt_new = multiple_replace(txt1, config.replicate_replace[str(site)]) if txt1 != txt_new: - print 'NOTE: text replaced using config.sync_replace' - print txt1, txt_new, txt2 + pywikibot.output('NOTE: text replaced using config.sync_replace') + pywikibot.output('%s %s %s' % (txt1, txt_new, txt2)) txt1 = txt_new if txt1 != txt2: - print "\n", site, 'DIFFERS' + pywikibot.output("\n %s DIFFERS" % site) self.differences[site].append(pagename) if self.options.replace: diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index b435cba..1187113 100644 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -1071,10 +1071,10 @@ generator = pagegenerators.NamespaceFilterPageGenerator( generator, [0]) except pywikibot.NoPage: - print "Disambiguation category for your wiki is not known." + pywikibot.output("Disambiguation category for your wiki is not known.") raise elif arg.startswith("-"): - print "Unrecognized command line argument: %s" % arg + pywikibot.output("Unrecognized command line argument: %s" % arg) # show help text and exit pywikibot.showHelp() else: diff --git a/scripts/upload.py b/scripts/upload.py index 476841e..c1a15b6 100755 --- a/scripts/upload.py +++ b/scripts/upload.py @@ -84,8 +84,7 @@ infile = uo.open(self.url) if 'text/html' in infile.info().getheader('Content-Type'): - print \ -"Couldn't download the image: the requested URL was not found on server." + pywikibot.output(u"Couldn't download the image: the requested URL was not found on server.") return content_len = infile.info().getheader('Content-Length') @@ -157,7 +156,7 @@ invalid = set(forbidden) & set(newfn) if invalid: c = "".join(invalid) - print "Invalid character(s): %s. Please try again" % c + pywikibot.output("Invalid character(s): %s. Please try again" % c) continue if ext not in allowed_formats: choice = pywikibot.inputChoice( diff --git a/scripts/version.py b/scripts/version.py index 94d8f65..42a08b6 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -17,13 +17,13 @@ from pywikibot import config2 as config if __name__ == '__main__': - print 'Pywikibot: %s' % getversion() - print 'Release version: %s' % pywikibot.__release__ - print 'Python: %s' % sys.version - #print 'config-settings:' - #print 'site_interface =', config.site_interface - #print 'API_config_expiry =', config.API_config_expiry + pywikibot.output('Pywikibot: %s' % getversion()) + pywikibot.output('Release version: %s' % pywikibot.__release__) + pywikibot.output('Python: %s' % sys.version) + #pywikibot.output('config-settings:') + #pywikibot.output('site_interface =', config.site_interface) + #pywikibot.output('API_config_expiry =', config.API_config_expiry) if not __import__('unicodedata').normalize('NFC', u'\u092e\u093e\u0930\u094d\u0915 \u091c\u093c\u0941\u0915\u0947\u0930\u092c\u0930\u094d\u0917') == u'\u092e\u093e\u0930\u094d\u0915 \u091c\u093c\u0941\u0915\u0947\u0930\u092c\u0930\u094d\u0917': - print u'unicode test: triggers problem #3081100' + pywikibot.output(u'unicode test: triggers problem #3081100') else: - print u'unicode test: ok' + pywikibot.output(u'unicode test: ok') -- To view, visit https://gerrit.wikimedia.org/r/98279 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1003d927d27a7c77a7aecda086f6737d3c225ebe 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits