jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/573587 )
Change subject: Localisation updates from https://translatewiki.net.
......................................................................
Localisation updates from https://translatewiki.net.
Change-Id: I6f993a0dd11a5886d5fb05c21660cc30f0d1e92d
---
M pywikibot/lb.json
M weblinkchecker/lb.json
2 files changed, 7 insertions(+), 6 deletions(-)
Approvals:
L10n-bot: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/lb.json b/pywikibot/lb.json
index 877ff77..0971cd5 100644
--- a/pywikibot/lb.json
+++ b/pywikibot/lb.json
@@ -1,16 +1,17 @@
{
"@metadata": {
"authors": [
- "Robby"
+ "Robby",
+ "Soued031"
]
},
- "pywikibot-enter-category-name": "Gitt w.e.g. den Numm vun der Kategorie an:",
+ "pywikibot-enter-category-name": "Gitt wgl. den Numm vun der Kategorie an:",
"pywikibot-enter-file-links-processing": "Linken op wat fir eng Biller-Säit verschaftt solle ginn?",
"pywikibot-enter-finished-browser": "Dréckt 'Enter' wann Dir fäerdeg sidd.",
- "pywikibot-enter-namespace-number": "Gitt w.e.g. d'Nummer vum Nummraum an:",
- "pywikibot-enter-new-text": "Gitt w.e.g. den neien Text an:",
+ "pywikibot-enter-namespace-number": "Gitt wgl. d'Nummer vum Nummraum an:",
+ "pywikibot-enter-new-text": "Gitt wgl. den neien Text an:",
"pywikibot-enter-page-processing": "Watfir eng Säit soll verschafft ginn?",
- "pywikibot-enter-xml-filename": "Gitt w.e.g. den Numm vum XML-Dump-Fichier an:",
+ "pywikibot-enter-xml-filename": "Gitt wgl. den Numm vum XML-Dump-Fichier an:",
"pywikibot-fixes-fckeditor": "Bot: Verbessere vu Rich-Editor-HTML",
"pywikibot-fixes-html": "Bot:HTML konvertéieren/verbesseren",
"pywikibot-fixes-syntax": "Bot: Verbessere vun der Wiki-Syntax"
diff --git a/weblinkchecker/lb.json b/weblinkchecker/lb.json
index 853a46e..c327561 100644
--- a/weblinkchecker/lb.json
+++ b/weblinkchecker/lb.json
@@ -8,6 +8,6 @@
"weblinkchecker-archive_msg": "D'Internetsäit gouf vum Internet Archive gespäichert. Iwwerleet Iech ob Dir e Link op eng vun den archivéierte Versiounen: [%(URL)s] maache wëllt:",
"weblinkchecker-badurl": "De Link deen uginn ass schéngt keng valabel URL ze sinn",
"weblinkchecker-caption": "Doudege Link",
- "weblinkchecker-report": "Bei verschiddenen automateschen Tester vum Bot war dësen externe Link net disponibel. Kuckt w.e.g. no ob de Link wierklech net méi disponibel ass an an deem Fall fléckt de Link oder huelt en ewech!",
+ "weblinkchecker-report": "Bei verschiddenen automateschen Tester vum Bot war dësen externe Link net disponibel. Kuckt wgl. no ob de Link wierklech net méi disponibel ass an an deem Fall fléckt de Link oder huelt en ewech!",
"weblinkchecker-summary": "Bot: Informatioun iwwer en externe Link deen net disponibel ass"
}
--
To view, visit https://gerrit.wikimedia.org/r/573587
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/i18n
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f993a0dd11a5886d5fb05c21660cc30f0d1e92d
Gerrit-Change-Number: 573587
Gerrit-PatchSet: 1
Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net>
Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/572712 )
Change subject: [note] Show a FutureWarning about desupport of mw < 1.19
......................................................................
[note] Show a FutureWarning about desupport of mw < 1.19
Change-Id: Ib7da01314c9bb0843d7300269404e693e5cf96be
---
M HISTORY.rst
M pywikibot/site.py
2 files changed, 11 insertions(+), 0 deletions(-)
Approvals:
Dvorapa: Looks good to me, but someone else must approve
Zoranzoki21: Looks good to me, but someone else must approve
Mpaa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/HISTORY.rst b/HISTORY.rst
index 5898f37..af1379e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,7 @@
Current release
---------------
+* Support of MediaWiki releases below 1.19 will be dropped (T245350)
* compat module is deprecated for 5 years and will be removed with next release (T183085)
* ipaddress module is required for Python 2 (T243171)
* tools.ip will be dropped in favour of tools.is_IP (T243171)
diff --git a/pywikibot/site.py b/pywikibot/site.py
index ccc026b..c629eb5 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -2751,6 +2751,16 @@
pywikibot.exception('You have no API read permissions. Seems '
'you are not logged in')
version = self.family.version(self.code)
+
+ if MediaWikiVersion(version) < MediaWikiVersion('1.19'):
+ warn('\n'
+ + fill('Support of MediaWiki {version} will be dropped. '
+ 'It is recommended to use MediaWiki 1.19 or above. '
+ 'You may use Pywikibot stable release 3.0.20200111 '
+ 'for older MediaWiki versions. '
+ 'See T245350 for further information.'
+ .format(version=version)), FutureWarning)
+
return version
@property
--
To view, visit https://gerrit.wikimedia.org/r/572712
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: Ib7da01314c9bb0843d7300269404e693e5cf96be
Gerrit-Change-Number: 572712
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/572935 )
Change subject: [cleanup] Deprecate family code2encoding/code2encodings aliases
......................................................................
[cleanup] Deprecate family code2encoding/code2encodings aliases
Change-Id: I9879066b3b27621b0b0b1051daa51ab2166b6a27
---
M pywikibot/families/wikipedia_family.py
M pywikibot/families/wikiquote_family.py
M pywikibot/family.py
3 files changed, 16 insertions(+), 14 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py
index c1dd0213..0693b71 100644
--- a/pywikibot/families/wikipedia_family.py
+++ b/pywikibot/families/wikipedia_family.py
@@ -234,7 +234,7 @@
else:
return self.known_families
- def code2encodings(self, code):
+ def encodings(self, code):
"""Return a list of historical encodings for a specific site."""
# Historic compatibility
if code == 'pl':
@@ -243,4 +243,4 @@
return 'utf-8', 'iso8859-5'
if code in self.latin1old:
return 'utf-8', 'iso-8859-1'
- return self.code2encoding(code)
+ return super(Family, self).encodings(code)
diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py
index 395aac3..d6115e7 100644
--- a/pywikibot/families/wikiquote_family.py
+++ b/pywikibot/families/wikiquote_family.py
@@ -69,7 +69,7 @@
'sr': ('/док', ),
}
- def code2encodings(self, code):
+ def encodings(self, code):
"""
Return a list of historical encodings for a specific language.
@@ -80,4 +80,4 @@
return 'utf-8', 'iso8859-2'
if code == 'ru':
return 'utf-8', 'iso8859-5'
- return (self.code2encoding(code), )
+ return super(Family, self).encodings(code)
diff --git a/pywikibot/family.py b/pywikibot/family.py
index abe13db..935ab25 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1382,22 +1382,24 @@
return 10
return 1000 * int(M.group(1)) + int(M.group(2)) - 1000
- def code2encoding(self, code):
+ def encoding(self, code):
"""Return the encoding for a specific language wiki."""
return 'utf-8'
- def code2encodings(self, code):
- """Return list of historical encodings for a specific language Wiki."""
- return (self.code2encoding(code), )
+ def encodings(self, code):
+ """Return list of historical encodings for a specific language wiki."""
+ return (self.encoding(code), )
# aliases
- def encoding(self, code):
- """Return the encoding for a specific language Wiki."""
- return self.code2encoding(code)
+ @deprecated('Site().encoding()', since='20200218')
+ def code2encoding(self, code):
+ """Return the encoding for a specific language wiki."""
+ return self.encoding(code)
- def encodings(self, code):
- """Return list of historical encodings for a specific language Wiki."""
- return self.code2encodings(code)
+ @deprecated('Site().encodings()', since='20200218')
+ def code2encodings(self, code):
+ """Return list of historical encodings for a specific language wiki."""
+ return self.encodings(code)
def __eq__(self, other):
"""Compare self with other.
--
To view, visit https://gerrit.wikimedia.org/r/572935
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: I9879066b3b27621b0b0b1051daa51ab2166b6a27
Gerrit-Change-Number: 572935
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/572894 )
Change subject: [bugfix] Skip tests if user right missing
......................................................................
[bugfix] Skip tests if user right missing
Bug: T243663
Bug: T243664
Change-Id: I3ce887dc94f85cdfdd156f49df47980afef56c23
---
M tests/site_tests.py
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/site_tests.py b/tests/site_tests.py
index 6fabc24..0dd079f 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -1947,6 +1947,10 @@
def test_deletedrevs(self):
"""Test the site.deletedrevs() method."""
mysite = self.get_site()
+ if not mysite.has_right('deletedhistory'):
+ self.skipTest(
+ "You don't have permission to view the deleted revisions "
+ 'on {0}.'.format(mysite))
mainpage = self.get_mainpage()
gen = mysite.deletedrevs(total=10, titles=mainpage)
@@ -2759,8 +2763,9 @@
self.site.loadrevisions(mainpage, total=12, rollback=True)
self.assertIsNotEmpty(mainpage._revisions)
self.assertLessEqual(len(mainpage._revisions), 12)
- self.assertTrue(all(rev.rollbacktoken is not None
- for rev in mainpage._revisions.values()))
+ if self.site.has_right('rollback'):
+ self.assertTrue(all(rev.rollbacktoken is not None
+ for rev in mainpage._revisions.values()))
class TestBacklinks(TestCase):
--
To view, visit https://gerrit.wikimedia.org/r/572894
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: I3ce887dc94f85cdfdd156f49df47980afef56c23
Gerrit-Change-Number: 572894
Gerrit-PatchSet: 5
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/572877 )
Change subject: [bugfix] Fix TestDeletionBot missing user
......................................................................
[bugfix] Fix TestDeletionBot missing user
After replacement of "test" family with "wikipedia" family in tests,
this error is thrown. Load user for the test to make it pass.
It seems this is caused by the fact `delete` now checks for user rights,
which needs user to be provided. Weird enough test family worked well,
there was some issue with test family user in tests as well.
Bug: T244027
Change-Id: Ic084b025ac2ec8d0457ed4fb0d942cc17ca16024
---
M tests/deletionbot_tests.py
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/deletionbot_tests.py b/tests/deletionbot_tests.py
index 2e111ee..4709825 100644
--- a/tests/deletionbot_tests.py
+++ b/tests/deletionbot_tests.py
@@ -85,6 +85,7 @@
code = 'test'
cached = True
+ user = True
delete_args = []
undelete_args = []
--
To view, visit https://gerrit.wikimedia.org/r/572877
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: Ic084b025ac2ec8d0457ed4fb0d942cc17ca16024
Gerrit-Change-Number: 572877
Gerrit-PatchSet: 5
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/572893 )
Change subject: [bugfix] Fix another error in e1bd61cd0
......................................................................
[bugfix] Fix another error in e1bd61cd0
Fix failing tests after e1bd61cd0
Change-Id: Id973711c535c0da9455f75c14b3fdd6b211ec0b2
---
M tests/api_tests.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/api_tests.py b/tests/api_tests.py
index c2c053d..11a2dc1 100644
--- a/tests/api_tests.py
+++ b/tests/api_tests.py
@@ -1185,7 +1185,7 @@
for info, time in patterns.items():
lag = api.lagpattern.search(info)
self.assertIsNotNone(lag)
- self.assertEqual(int(lag.group('lag')), time)
+ self.assertEqual(float(lag.group('lag')), time)
if __name__ == '__main__': # pragma: no cover
--
To view, visit https://gerrit.wikimedia.org/r/572893
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: Id973711c535c0da9455f75c14b3fdd6b211ec0b2
Gerrit-Change-Number: 572893
Gerrit-PatchSet: 2
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/572615 )
Change subject: [IMPR] use 'lag' value of 'error' result
......................................................................
[IMPR] use 'lag' value of 'error' result
- maxlag error delivers a 'lag' float value. use this value instead of
parsing the info string.
- fallback to parsing. Modify the lagpattern to get a float value
Change-Id: I29adaad064cda2e5abc399b3e6beb6035ecd9a48
---
M pywikibot/data/api.py
M pywikibot/throttle.py
2 files changed, 10 insertions(+), 5 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 0702d38..d65c260 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -98,7 +98,7 @@
_logger = 'data.api'
lagpattern = re.compile(
- r'Waiting for [\w.: ]+: (?P<lag>\d+)(?:\.\d+)? seconds? lagged')
+ r'Waiting for [\w.: ]+: (?P<lag>\d+(?:\.\d+)?) seconds? lagged')
class APIError(Error):
@@ -2022,8 +2022,13 @@
if retries > max(5, pywikibot.config.max_retries):
break
pywikibot.log('Pausing due to database lag: ' + info)
- lag = lagpattern.search(info)
- lag = int(lag.group('lag')) if lag else 0
+
+ try:
+ lag = result['error']['lag']
+ except KeyError:
+ lag = lagpattern.search(info)
+ lag = float(lag.group('lag')) if lag else 0.0
+
self.site.throttle.lag(lag * retries)
continue
diff --git a/pywikibot/throttle.py b/pywikibot/throttle.py
index 608f6dc..91b3318 100644
--- a/pywikibot/throttle.py
+++ b/pywikibot/throttle.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Mechanics to slow down wiki read and/or write rate."""
#
-# (C) Pywikibot team, 2008-2019
+# (C) Pywikibot team, 2008-2020
#
# Distributed under the terms of the MIT license.
#
@@ -299,7 +299,7 @@
@param lagtime: The time to wait for the next request which is the
last maxlag time from api warning. This is only used as a fallback
if self.retry-after isn't set.
- @type lagtime: int
+ @type lagtime: float
"""
started = time.time()
with self.lock:
--
To view, visit https://gerrit.wikimedia.org/r/572615
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: I29adaad064cda2e5abc399b3e6beb6035ecd9a48
Gerrit-Change-Number: 572615
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/572839 )
Change subject: [docs] Fix typos in page.py
......................................................................
[docs] Fix typos in page.py
Change-Id: I52d60190ebe6a2d1e5cc587dcfb58ce6c5b81aa9
---
M pywikibot/page.py
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index b9f4f35..18e41d0 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -431,7 +431,7 @@
A stable identifier to be used as a key in hash-tables.
This relies on the fact that the string
- representation of an instance can not change after the construction.
+ representation of an instance cannot change after the construction.
"""
return hash(self._cmpkey())
@@ -1118,7 +1118,7 @@
"""
Return the protection types allowed for that page.
- If the page doesn't exists it only returns "create". Otherwise it
+ If the page doesn't exist it only returns "create". Otherwise it
returns all protection types provided by the site, except "create".
It also removes "upload" if that page is not in the File namespace.
@@ -1143,7 +1143,7 @@
return p_types
def has_permission(self, action='edit'):
- """Determine whetherthe page can be modified.
+ """Determine whether the page can be modified.
Return True if the bot has the permission of needed restriction level
for the given action type.
--
To view, visit https://gerrit.wikimedia.org/r/572839
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: I52d60190ebe6a2d1e5cc587dcfb58ce6c5b81aa9
Gerrit-Change-Number: 572839
Gerrit-PatchSet: 1
Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: jenkins-bot (75)