jenkins-bot has submitted this change and it was merged.
Change subject: (bug 58177) Ternary operator must be separated
......................................................................
(bug 58177) Ternary operator must be separated
Change-Id: I41e22c860733318f8423424df4d5d42b5c9dad67
---
M pywikibot/textlib.py
1 file changed, 4 insertions(+), 6 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index 66b3cf9..30d78b6 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -7,7 +7,7 @@
"""
#
-# (C) Pywikipedia bot team, 2004-2013
+# (C) Pywikibot team, 2004-2013
#
# Distributed under the terms of the MIT license.
#
@@ -515,11 +515,9 @@
if site.language() in site.family.interwiki_attop or \
u'<!-- interwiki at top -->' in oldtext:
#do not add separator if interwiki links are on one line
- newtext = (s +
- u''
- if site.language() in site.family.interwiki_on_one_line
- else separator +
- s2.replace(marker, '').strip())
+ newtext = s + (u'' if site.language()
+ in site.family.interwiki_on_one_line
+ else separator) + s2.replace(marker, '').strip()
else:
# calculate what was after the language links on the page
firstafter = s2.find(marker)
--
To view, visit https://gerrit.wikimedia.org/r/100200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I41e22c860733318f8423424df4d5d42b5c9dad67
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: Allow empty match replace
......................................................................
Allow empty match replace
The patch fix a problem with empty matched group that encountered in replacebot used in hewiki.
Sometimes we want to match empty groups
eg /RISHMI(T |IM)?/ would give None for 'RISHMI '
Change-Id: I58dd59a884b1be3c67627a5f4af7acc036c98699
---
M pywikibot/textlib.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index ffa7520..ef1207f 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -232,7 +232,7 @@
int(groupMatch.group('number')))
try:
replacement = (replacement[:groupMatch.start()] +
- match.group(groupID) + \
+ ('' if match.group(groupID) is None else match.group(groupID)) + \
replacement[groupMatch.end():])
except IndexError:
pywikibot.output('\nInvalid group reference: %s' % groupID)
--
To view, visit https://gerrit.wikimedia.org/r/100333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I58dd59a884b1be3c67627a5f4af7acc036c98699
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Eranroz <eranroz89(a)gmail.com>
Gerrit-Reviewer: Eranroz <eranroz89(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Matanya <matanya(a)foss.co.il>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 58177) Ternary operator must be separated
......................................................................
(bug 58177) Ternary operator must be separated
Change-Id: I0de0c72b213669531ffb6c74a0221a886b3b2faa
---
M pywikibot/textlib.py
1 file changed, 3 insertions(+), 5 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index ffa7520..5c9e14b 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -522,11 +522,9 @@
if site.language() in site.family.interwiki_attop or \
u'<!-- interwiki at top -->' in oldtext:
#do not add separator if interwiki links are on one line
- newtext = (s +
- u''
- if site.language() in site.family.interwiki_on_one_line
- else separator +
- s2.replace(marker, '').strip())
+ newtext = s + (u'' if site.language()
+ in site.family.interwiki_on_one_line
+ else separator) + s2.replace(marker, '').strip()
else:
# calculate what was after the language links on the page
firstafter = s2.find(marker)
--
To view, visit https://gerrit.wikimedia.org/r/100201
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0de0c72b213669531ffb6c74a0221a886b3b2faa
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: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: [BUGFIX] import time used by putting the page
......................................................................
[BUGFIX] import time used by putting the page
Change-Id: I3268211f034294c095e0de932600922de50db838
---
M scripts/add_text.py
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/add_text.py b/scripts/add_text.py
index 673f1a5..310bf85 100644
--- a/scripts/add_text.py
+++ b/scripts/add_text.py
@@ -74,6 +74,7 @@
import re
import webbrowser
import codecs
+import time
import pywikibot
from pywikibot import config
--
To view, visit https://gerrit.wikimedia.org/r/100164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3268211f034294c095e0de932600922de50db838
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: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 55022) Add casechecker.py to i18n system
......................................................................
(bug 55022) Add casechecker.py to i18n system
Change-Id: Id086fac369b7e91fd4d309fefec93046fccc7095
---
A casechecker.py
1 file changed, 30 insertions(+), 0 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/casechecker.py b/casechecker.py
new file mode 100644
index 0000000..be03992
--- /dev/null
+++ b/casechecker.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+msg = {
+ 'en': {
+ 'casechecker-rename': u'Bot: mixed case rename',
+ 'casechecker-delete-reason': u'This redirect used to point to %(target)s',
+ 'casechecker-delete-summary': u'Bot: This redirect contains identical looking Cyrillic and Latin letters in its title',
+ 'casechecker-replacement-linklist': u'%(source)s→%(target)s',
+ 'casechecker-replacement-summary': u'Bot: Case Replacements:',
+ },
+ 'qqq': {
+ 'casechecker-rename': u'Edit summary when bot moves a redirect with mixed Cyrillic and Latin letters to a new target',
+ 'casechecker-delete-reason': u'Reason for speedy deletion request added to the template when bot marks a redirect for deletion because the redirect contains identical looking Cyrillic and Latin letters in its title\n<code>%(target)s</code> is the redirect target.',
+ 'casechecker-delete-summary': u'Edit summary when bot marks a redirect for deletion because the redirect contains identical looking Cyrillic and Latin letters in its title',
+ 'casechecker-replacement-linklist': u'A short list pointing from source to target page.\n<code>%(source)s</code> and <code>%(target)s</code> are mediwiki links',
+ 'casechecker-replacement-summary': u'Short edit summary when bot edits pages and fix case usage',
+ },
+ 'ar': {
+ 'casechecker-rename': u'بوت: اسم لحالة مخلوطة',
+ 'casechecker-replacement-summary': u'استبدالات الحالة',
+ },
+ 'de': {
+ 'casechecker-delete-reason': u'Weiterleitung auf %(target)s mit gemischten kyrillischen und lateinischen Zeichen.',
+ 'casechecker-delete-summary': u'Bot: Diese Weiterleitung enthält identisch aussehende kyrillische und lateinische Zeichen im Titel',
+ 'casechecker-replacement-linklist': u'%(source)s nach %(target)s',
+ },
+ 'ru': {
+ 'casechecker-delete-summary': u'Перенаправление на %(target)s содержало смесь кириллицы и латиницы в названии',
+ 'casechecker-delete-summary': u'бот: Перенаправление содержит смесь кириллицы и латиницы в названии',
+ },
+};
--
To view, visit https://gerrit.wikimedia.org/r/93024
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id086fac369b7e91fd4d309fefec93046fccc7095
Gerrit-PatchSet: 13
Gerrit-Project: pywikibot/i18n
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <ladsgroup(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
jenkins-bot has submitted this change and it was merged.
Change subject: Bug 58053 - iter{items,values,keys} -> items(),values(),keys()
......................................................................
Bug 58053 - iter{items,values,keys} -> items(),values(),keys()
Change-Id: I419b2c2622ea017e451c39fd36023bdb18f30fde
---
M scripts/category_redirect.py
M scripts/interwiki.py
M scripts/isbn.py
M scripts/redirect.py
M scripts/reflinks.py
M scripts/template.py
M tests/api_tests.py
M tests/site_tests.py
8 files changed, 19 insertions(+), 19 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py
index afaff4d..fa7474b 100755
--- a/scripts/category_redirect.py
+++ b/scripts/category_redirect.py
@@ -209,7 +209,7 @@
return log_text
# sort by keys and keep the first (LOG_SIZE-1) values
keep = [text for (key, text) in
- sorted(log_items.iteritems(), reverse=True)[:LOG_SIZE - 1]]
+ sorted(log_items.items(), reverse=True)[:LOG_SIZE - 1]]
log_text = "\n".join("\n".join(line for line in text) for text in keep)
# get permalink to older logs
history = self.log_page.getVersionHistory(total=LOG_SIZE)
diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index 7d5f8a5..d2e56cf 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -761,11 +761,11 @@
"""
Yields (Site, number of pages in site) pairs
"""
- for site, d in self.tree.iteritems():
+ for site, d in self.tree.items():
yield site, len(d)
def __iter__(self):
- for site, plist in self.tree.iteritems():
+ for site, plist in self.tree.items():
for page in plist:
yield page
@@ -1520,14 +1520,14 @@
new[site] = [page]
# See if new{} contains any problematic values
result = {}
- for site, pages in new.iteritems():
+ for site, pages in new.items():
if len(pages) > 1:
errorCount += 1
self.problem(u"Found more than one link for %s" % site)
if not errorCount and not globalvar.select:
# no errors, so all lists have only one item
- for site, pages in new.iteritems():
+ for site, pages in new.items():
result[site] = pages[0]
return result
@@ -1542,7 +1542,7 @@
return None
# First loop over the ones that have more solutions
- for site, pages in new.iteritems():
+ for site, pages in new.items():
if len(pages) > 1:
pywikibot.output(u"=" * 30)
pywikibot.output(u"Links to %s" % site)
@@ -1573,7 +1573,7 @@
# Loop over the ones that have one solution, so are in principle
# not a problem.
acceptall = False
- for site, pages in new.iteritems():
+ for site, pages in new.items():
if len(pages) == 1:
if not acceptall:
pywikibot.output(u"=" * 30)
@@ -1700,7 +1700,7 @@
except GiveUpOnPage:
break
else:
- for (site, page) in new.iteritems():
+ for (site, page) in new.items():
# edit restriction for some templates on zh-wiki where
# interlanguage keys are included by /doc subpage
smallWikiAllowed = not (page.site.sitename() == 'wikipedia:zh'
@@ -2042,7 +2042,7 @@
"""
# use sets because searching an element is faster than in lists
- expectedPages = set(new.itervalues())
+ expectedPages = set(new.values())
expectedSites = set(new)
try:
for site in expectedSites - set(updatedSites):
@@ -2415,7 +2415,7 @@
reader = warnfile.WarnfileReader(filename)
# we won't use removeHints
(hints, removeHints) = reader.getHints()
- for page, pagelist in hints.iteritems():
+ for page, pagelist in hints.items():
# The WarnfileReader gives us a list of pagelinks, but titletranslate.py
# expects a list of strings, so we convert it back.
# TODO: This is a quite ugly hack, in the future we should maybe make
diff --git a/scripts/isbn.py b/scripts/isbn.py
index 32d18dd..cd2ddfa 100755
--- a/scripts/isbn.py
+++ b/scripts/isbn.py
@@ -1208,7 +1208,7 @@
break
# Determine the group
- for groupNumber in ranges.iterkeys():
+ for groupNumber in ranges.keys():
if rest.startswith(groupNumber):
result += groupNumber + '-'
rest = rest[len(groupNumber):]
diff --git a/scripts/redirect.py b/scripts/redirect.py
index 5027ecc..9c96fad 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -304,7 +304,7 @@
elif self.xmlFilename:
redict = self.get_redirects_from_dump()
num = 0
- for (key, value) in redict.iteritems():
+ for (key, value) in redict.items():
num += 1
# check if the value - that is, the redirect target - is a
# redirect as well
diff --git a/scripts/reflinks.py b/scripts/reflinks.py
index ed7466c..e175816 100644
--- a/scripts/reflinks.py
+++ b/scripts/reflinks.py
@@ -349,13 +349,13 @@
id = 1
while self.autogen + str(id) in foundRefNames:
id += 1
- for (g, d) in foundRefs.iteritems():
+ for (g, d) in foundRefs.items():
if g:
group = u"group=\"%s\" " % group
else:
group = u""
- for (k, v) in d.iteritems():
+ for (k, v) in d.items():
if len(v[1]) == 1 and not v[3]:
continue
name = v[0]
@@ -378,7 +378,7 @@
end = end.replace(ref, unnamed)
text = header + end
- for (k, v) in namedRepl.iteritems():
+ for (k, v) in namedRepl.items():
# TODO : Support ref groups
name = v[0]
if v[1]:
diff --git a/scripts/template.py b/scripts/template.py
index 4222f5d..3400c60 100755
--- a/scripts/template.py
+++ b/scripts/template.py
@@ -244,7 +244,7 @@
replacements = []
exceptions = {}
site = pywikibot.getSite()
- for old, new in self.templates.iteritems():
+ for old, new in self.templates.items():
namespaces = list(site.namespace(10, all=True))
if not site.nocapitalize:
pattern = '[' + \
diff --git a/tests/api_tests.py b/tests/api_tests.py
index 4437036..f7401f2 100644
--- a/tests/api_tests.py
+++ b/tests/api_tests.py
@@ -30,7 +30,7 @@
# req.keys() should contain "action", "foo", "bar", "one"
self.assertEqual(len(req.keys()), 4)
self.assert_("test" in req.values())
- self.assert_(all(len(item) == 2 for item in req.iteritems()))
+ self.assert_(all(len(item) == 2 for item in req.items()))
class TestPageGenerator(PywikibotTestCase):
diff --git a/tests/site_tests.py b/tests/site_tests.py
index b17b274..d62443e 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -111,9 +111,9 @@
self.assertTrue(all(isinstance(key, int)
for key in ns))
self.assertTrue(all(isinstance(val, list)
- for val in ns.itervalues()))
+ for val in ns.values()))
self.assertTrue(all(isinstance(name, basestring)
- for val in ns.itervalues()
+ for val in ns.values()
for name in val))
self.assertTrue(all(isinstance(mysite.namespace(key), basestring)
for key in ns))
--
To view, visit https://gerrit.wikimedia.org/r/100168
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I419b2c2622ea017e451c39fd36023bdb18f30fde
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
