jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/587708 )
Change subject: [bugfix] Fix FileNotFoundError within editor.edit()
......................................................................
[bugfix] Fix FileNotFoundError within editor.edit()
- During unittests a FileNotFoundError (WindowsError for Python 2)
occures when testing editarticle -simulate. Add shell=True for
Windows plattforms only to solve this bug.
- Also replace the dummy external editor 'call' by 'break'.
Otherwise Windows is asking for an application to open the temporary
edit file.
Bug: T128453
Change-Id: I014702c9fd0d1e725a55f5cad3a058ed54dedb97
---
M pywikibot/editor.py
M tests/utils.py
2 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/editor.py b/pywikibot/editor.py
index 51e58d6..3b93db8 100644
--- a/pywikibot/editor.py
+++ b/pywikibot/editor.py
@@ -3,7 +3,7 @@
"""Text editor class for your favourite editor."""
#
# (C) Gerrit Holl, 2004
-# (C) Pywikibot team, 2004-2018
+# (C) Pywikibot team, 2004-2020
#
# Distributed under the terms of the MIT license.
#
@@ -14,6 +14,8 @@
import subprocess
import tempfile
+from sys import platform
+
import pywikibot
from pywikibot import config
@@ -101,7 +103,8 @@
encoding=config.editor_encoding) as tempFile:
tempFile.write(text)
creationDate = os.stat(tempFilename).st_mtime
- subprocess.call(self._command(tempFilename, text, jumpIndex))
+ cmd = self._command(tempFilename, text, jumpIndex)
+ subprocess.call(cmd, shell=platform == 'win32')
lastChangeDate = os.stat(tempFilename).st_mtime
if lastChangeDate == creationDate:
# Nothing changed
diff --git a/tests/utils.py b/tests/utils.py
index 91c55ac..89456be 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -629,7 +629,7 @@
str(pywikibot.config.userinterface_lang)
# Set EDITOR to an executable that ignores all arguments and does nothing.
- env[str('EDITOR')] = str('call' if OSWIN32 else 'true')
+ env[str('EDITOR')] = str('break' if OSWIN32 else 'true')
try:
p = Popen(
command, env=env, stdout=PIPE, stderr=PIPE,
--
To view, visit https://gerrit.wikimedia.org/r/587708
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I014702c9fd0d1e725a55f5cad3a058ed54dedb97
Gerrit-Change-Number: 587708
Gerrit-PatchSet: 5
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/587962 )
Change subject: [bugfix] Update setuptools in Docker image
......................................................................
[bugfix] Update setuptools in Docker image
Pywikibot needs setuptools >= 40.1.0, but Python 3.5 on Debian Stretch
comes with older one.
Change-Id: I9c8234f8b03792cab46653c7fcac615dd372515b
---
M Dockerfile
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Dockerfile b/Dockerfile
index e4bcd00..0ec66fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,6 +13,7 @@
ADD . /srv/pwb
# pip version in stretch is too old :(
+RUN pip3 install -U setuptools
RUN pip3 install -U pip
RUN pip3 install -r /srv/pwb/requirements.txt
--
To view, visit https://gerrit.wikimedia.org/r/587962
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I9c8234f8b03792cab46653c7fcac615dd372515b
Gerrit-Change-Number: 587962
Gerrit-PatchSet: 4
Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/587876 )
Change subject: [bugfix] Be ok with stable version
......................................................................
[bugfix] Be ok with stable version
Bug: T232496
Change-Id: I291b2d6340e8109c4be9c55cfb5835752ac77e29
---
M pywikibot/version.py
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/version.py b/pywikibot/version.py
index f9ff714..7cbc335 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -83,10 +83,11 @@
if online:
try:
+ hsh3 = getversion_onlinerepo('tags/stable')
hsh2 = getversion_onlinerepo()
hsh1 = data['hsh']
data['cmp_ver'] = 'UNKNOWN' if not hsh1 else (
- 'OUTDATED' if hsh1 != hsh2 else 'ok')
+ 'OUTDATED' if hsh1 not in (hsh2, hsh3) else 'ok')
except Exception:
pass
@@ -383,14 +384,13 @@
return (tag, rev, date, hsh)
-def getversion_onlinerepo():
+def getversion_onlinerepo(path='branches/master'):
"""Retrieve current framework git hash from Gerrit."""
from pywikibot.comms import http
# Gerrit API responses include )]}' at the beginning,
# make sure to strip it out
buf = http.fetch(
- uri='https://gerrit.wikimedia.org/r/projects/pywikibot%2Fcore/'
- 'branches/master',
+ uri='https://gerrit.wikimedia.org/r/projects/pywikibot%2Fcore/' + path,
headers={'user-agent': '{pwb}'}).text[4:]
try:
hsh = json.loads(buf)['revision']
--
To view, visit https://gerrit.wikimedia.org/r/587876
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I291b2d6340e8109c4be9c55cfb5835752ac77e29
Gerrit-Change-Number: 587876
Gerrit-PatchSet: 4
Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/587785 )
Change subject: [bugfix] Fix PetScan generator language and project
......................................................................
[bugfix] Fix PetScan generator language and project
PetScan accepts site.code as "language" (commons, wikidata, species)
instead of site.lang (en, en, en) and also a domain name as "project"
(wikimedia, wikimedia, wikimedia) instead of site.family.name.
In some cases (commons, wikidata) PetScan accepts also site.family.name
as "project", but we can not rely on this. species wiki works only using
species as "language" and wikimedia as "project".
In fact, PetScan needs to create site.dbName() from these fields,
but unfortunately it does not allow to specify site.dbName() directly.
Note: I could not find a way to make it work and test it
on mul:wikisource, this should be also tested.
Bug: T249704
Change-Id: I18b898438ce6a57389d3355ed87a2b19718704f9
---
M pywikibot/pagegenerators.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 5cc2922..60faedb 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -3051,8 +3051,8 @@
extra_options = extra_options or {}
query = {
- 'language': self.site.lang,
- 'project': self.site.family,
+ 'language': self.site.code,
+ 'project': self.site.hostname().split('.')[-2],
'combination': 'subset' if subset_combination else 'union',
'categories': '\r\n'.join(categories),
'format': 'json',
--
To view, visit https://gerrit.wikimedia.org/r/587785
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I18b898438ce6a57389d3355ed87a2b19718704f9
Gerrit-Change-Number: 587785
Gerrit-PatchSet: 3
Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)