jenkins-bot has submitted this change and it was merged.
Change subject: (Bug 57726) add variant unicode string, not a list
......................................................................
(Bug 57726) add variant unicode string, not a list
Synchronize with compat
Change-Id: If8d6e2ebc37af34f4d751642602ab4aabbdf2e1c
---
M pywikibot/textlib.py
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index cb7fb60..ffa7520 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -523,9 +523,9 @@
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] +
+ 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
--
To view, visit https://gerrit.wikimedia.org/r/98376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If8d6e2ebc37af34f4d751642602ab4aabbdf2e1c
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: 57796) Added support for specifying a site in ReplaceRobot
......................................................................
(Bug: 57796) Added support for specifying a site in ReplaceRobot
so that this value can be passed to textlib.replaceExcept()
Change-Id: I460cf154e0110c8339312ba5499e3b75a11c083d
---
M scripts/replace.py
1 file changed, 12 insertions(+), 8 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/replace.py b/scripts/replace.py
index 0be0be8..acc6da0 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -225,7 +225,7 @@
"""
def __init__(self, generator, replacements, exceptions={},
acceptall=False, allowoverlap=False, recursive=False,
- addedCat=None, sleep=None, summary=''):
+ addedCat=None, sleep=None, summary='', site=None):
"""
Arguments:
* generator - A generator that yields Page objects.
@@ -266,10 +266,12 @@
self.acceptall = acceptall
self.allowoverlap = allowoverlap
self.recursive = recursive
+ self.site = site
+ if self.site is None:
+ self.site = pywikibot.getSite()
if addedCat:
- site = pywikibot.getSite()
cat_ns = site.category_namespaces()[0]
- self.addedCat = pywikibot.Page(site,
+ self.addedCat = pywikibot.Page(self.site,
cat_ns + ':' + addedCat)
self.sleep = sleep
self.summary = summary
@@ -314,7 +316,8 @@
if self.sleep is not None:
time.sleep(self.sleep)
new_text = pywikibot.replaceExcept(new_text, old, new, exceptions,
- allowoverlap=self.allowoverlap)
+ allowoverlap=self.allowoverlap,
+ site=self.site)
return new_text
def run(self):
@@ -342,9 +345,9 @@
new_text = original_text
while True:
if self.isTextExcepted(new_text):
- pywikibot.output(
- u'Skipping %s because it contains text that is on the exceptions list.'
- % page.title(asLink=True))
+ pywikibot.output(u'Skipping %s because it contains text '
+ u'that is on the exceptions list.'
+ % page.title(asLink=True))
break
new_text = self.doReplacements(new_text)
if new_text == original_text:
@@ -570,7 +573,8 @@
{'description':
replacementsDescription})
else:
- raise pywikibot.Error('Specifying -fix with replacements is undefined')
+ raise pywikibot.Error(
+ 'Specifying -fix with replacements is undefined')
elif fix is None:
old = pywikibot.input(u'Please enter the text that should be replaced:')
new = pywikibot.input(u'Please enter the new text:')
--
To view, visit https://gerrit.wikimedia.org/r/98472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I460cf154e0110c8339312ba5499e3b75a11c083d
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 57838) Wrong syntax with new print function for py3 compatibility
......................................................................
(bug 57838) Wrong syntax with new print function for py3 compatibility
The new py3 print function is available for 2.6+ versions. We have just to import it from __future__.
follow-up for https://gerrit.wikimedia.org/r/#/c/97876/
Change-Id: I983d07f362cd277820f27f3e00c2629415290625
---
M pywikibot/userinterfaces/win32_unicode.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/userinterfaces/win32_unicode.py b/pywikibot/userinterfaces/win32_unicode.py
index c34a6b1..44ec80c 100755
--- a/pywikibot/userinterfaces/win32_unicode.py
+++ b/pywikibot/userinterfaces/win32_unicode.py
@@ -19,7 +19,7 @@
# Licensed under both CC-BY-SA as the MIT license.
#
################################################
-
+from __future__ import print_function
import sys
stdin = sys.stdin
stdout = sys.stdout
--
To view, visit https://gerrit.wikimedia.org/r/98527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I983d07f362cd277820f27f3e00c2629415290625
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
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: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: [BUGFIX] Fix wrong formatting with old print statement
......................................................................
[BUGFIX] Fix wrong formatting with old print statement
We can use py3 print function in two alternate ways:
- we use: from __future__ import print_function
- we merge the print output to a single basestring inside brackets
(we do the last one here)
Change-Id: I0c6de50230e6417b2cf16cf5a3d651b0d115a128
---
M pywikibot/config2.py
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 9457c9b..bf6c63f 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -674,10 +674,10 @@
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." \
+ print("WARNING: Skipped '%(fn)s': writeable by others."
% {'fn': _filename})
else:
- print("WARNING: Skipped '%(fn)s': owned by someone else." \
+ print("WARNING: Skipped '%(fn)s': owned by someone else."
% {'fn': _filename})
# Test for obsoleted and/or unknown variables.
@@ -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("%s=%s" % (_name, repr(globals()[_name])))
# cleanup all locally-defined variables
for __var in list(globals().keys()):
--
To view, visit https://gerrit.wikimedia.org/r/98530
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c6de50230e6417b2cf16cf5a3d651b0d115a128
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
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: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: [CONFIG] exclude E226 from pep8.py
......................................................................
[CONFIG] exclude E226 from pep8.py
E226 is excluded per default. Don't know why this is necessary.
PEP suggests adding whitespace around the operators with the lowest
priority (only) if operators with different priorities are used.
Change-Id: I75dd8a1234fa5f6750a6df16bc07d5ef2b294868
---
M .pep8
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.pep8 b/.pep8
index 4f1391e..894fe32 100644
--- a/.pep8
+++ b/.pep8
@@ -1,4 +1,4 @@
[pep8]
-ignore = E122,E127,E241,E502
+ignore = E122,E127,E241,E226,E502
exclude = ./catimages.py,./wiktionary.py,./wiktionary/*,./tests/*,./userinterfaces/*,./commonsdelinker/*,./families/*,./maintenance/*,./pywikibot/*,./externals/*
max_line_length = 256
--
To view, visit https://gerrit.wikimedia.org/r/98372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75dd8a1234fa5f6750a6df16bc07d5ef2b294868
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: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: Improvements for pwb.py:
......................................................................
Improvements for pwb.py:
- always add ".py" suffix if omitted.
This enables running scripts outside the /scripts folder,
e.g. library test functions as main module
- raise OSError when the given script name does not exist because
"file not found" error is an OSError
(in py3 which merged IOError to that)
Change-Id: Ie58e9573214accd013a8688816254173df1a5c33
---
M pwb.py
1 file changed, 3 insertions(+), 6 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pwb.py b/pwb.py
index 945d4e1..ae9190a 100644
--- a/pwb.py
+++ b/pwb.py
@@ -109,17 +109,14 @@
fn = sys.argv[1]
argv = sys.argv[1:]
argvu = pwb.argvu[1:]
-
+ if not fn.endswith('.py'):
+ fn += '.py'
if not os.path.exists(fn):
testpath = os.path.join(os.path.split(__file__)[0], 'scripts', fn)
if os.path.exists(testpath):
fn = testpath
else:
- testpath = testpath + '.py'
- if os.path.exists(testpath):
- fn = testpath
- else:
- raise Exception("%s not found!" % fn)
+ raise OSError("%s not found!" % fn)
run_python_file(fn, argv, argvu)
elif __name__ == "__main__":
print(__doc__)
--
To view, visit https://gerrit.wikimedia.org/r/98538
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie58e9573214accd013a8688816254173df1a5c33
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 57879): raise the right form for isRedirectPage exception
......................................................................
(bug 57879): raise the right form for isRedirectPage exception
I am confused: This form is a deprecated form of raising exception (W602)
whereas raise IsRedirectPage(self._redirarg) does not work.
Change-Id: I1263af62e109688cc3ad28b2f1fad525d4766930
---
M wikipedia.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikipedia.py b/wikipedia.py
index 050e825..2f611fa 100644
--- a/wikipedia.py
+++ b/wikipedia.py
@@ -750,7 +750,7 @@
else:
# Make sure we re-raise an exception we got on an earlier attempt
if hasattr(self, '_redirarg') and not get_redirect:
- raise IsRedirectPage(self._redirarg)
+ raise IsRedirectPage, self._redirarg
elif hasattr(self, '_getexception'):
if self._getexception == IsRedirectPage and get_redirect:
pass
--
To view, visit https://gerrit.wikimedia.org/r/98813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1263af62e109688cc3ad28b2f1fad525d4766930
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: jenkins-bot