Pywikibot-commits January 2018

pywikibot-commits@lists.wikimedia.org

1 participants
80 discussions

[Gerrit] pywikibot/core[master]: utils.WarningSourceSkipContextManager: Ignore unclosed socke...

by Xqt (Code Review)

Xqt has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405559 ) Change subject: utils.WarningSourceSkipContextManager: Ignore unclosed socket ResourceWarnings ...................................................................... utils.WarningSourceSkipContextManager: Ignore unclosed socket ResourceWarnings Ignore unclosed socket ResourceWarnings from any file during DeprecationTestCase run. Python ResourceWarning happens when garbage collection is triggered which may happen at any point during runtime. Therefore the source of the warning is rather arbitrary. See https://bugs.python.org/issue29564 for more info. Bug: T185401 Change-Id: Ie15e5aebf4ebec2fd27831399762e5812916f939 --- M tests/utils.py 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/utils.py b/tests/utils.py index eaf68c4..e3c6526 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -260,9 +260,7 @@ if (PYTHON_VERSION >= (3, 2) and issubclass(warn_msg.category, ResourceWarning) and any(str(warn_msg.message).startswith(msg) for msg in ( - 'unclosed <ssl.SSLSocket', 'unclosed <socket.socket')) - and warn_msg.filename.rpartition('/')[2] in ( - 'cookiejar.py', 'inspect.py', 'socket.py')): + 'unclosed <ssl.SSLSocket', 'unclosed <socket.socket'))): return log.append(warn_msg) -- To view, visit https://gerrit.wikimedia.org/r/405559 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie15e5aebf4ebec2fd27831399762e5812916f939 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 2 months

[Gerrit] pywikibot/core[master]: Update for hrwiki and srwiki

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404878 ) Change subject: Update for hrwiki and srwiki ...................................................................... Update for hrwiki and srwiki Change-Id: I6aa52d103dabcce7bd06b14fe646d538e3857b3a --- M scripts/checkimages.py M scripts/welcome.py 2 files changed, 8 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 812ac07..99ef506 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -117,10 +117,12 @@ 'fa': u'{{جا:حق تکثیر تصویر نامعلوم}}', 'fr': u'{{subst:lid}}', 'ga': u'{{subst:Ceadúnas de dhíth}}', + 'hr': '{{Bez licence}}', 'hu': u'{{nincslicenc|~~~~~}}', 'it': u'{{subst:unverdata}}', 'ja': u'{{subst:Nld}}', 'ko': u'{{subst:nld}}', + 'sr': '{{датотека без лиценце}}', 'ta': u'{{subst:nld}}', 'ur': u'{{subst:حقوق نسخہ تصویر نامعلوم}}', 'zh': u'{{subst:No license/auto}}', @@ -141,12 +143,13 @@ 'en': [u'{{nld', u'{{no license'], 'fa': [u'{{حق تکثیر تصویر نامعلوم۲'], 'ga': [u'{{Ceadúnas de dhíth', u'{{Ceadúnas de dhíth'], + 'hr': ['{{bez licence'], 'hu': [u'{{nincsforrás', u'{{nincslicenc'], 'it': [u'{{unverdata', u'{{unverified'], 'ja': [u'{{no source', u'{{unknown', u'{{non free', u'\n{{subst:Benvebot}}\n~~~~\n' '', @@ -232,6 +236,7 @@ 'fa': 'ربات: اضافه کردن %(adding)s', 'ga': 'Róbó: Cuir %(adding)s leis', 'fr': 'Robot : Ajouté %(adding)s', + 'hr': 'Bot: Dodato %(adding)s', 'hu': 'Robot:"%(adding)s" hozzáadása', 'it': 'Bot: Aggiungo %(adding)s', 'ja': 'ロボットによる: 追加 %(adding)s', @@ -374,6 +379,7 @@ 'fa': [u'الگو:اطلاعات'], 'fr': [u'Template:Information'], 'ga': [u'Template:Information'], + 'hr': ['Template:Infoslika'], 'hu': [u'Template:Információ', u'Template:Enwiki', u'Template:Azonnali'], 'it': [u'Template:EDP', u'Template:Informazioni file', u'Template:Information', u'Template:Trademark', diff --git a/scripts/welcome.py b/scripts/welcome.py index d97f14b..42e6ee9 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -204,7 +204,6 @@ 'nl': u'Project:Logboek welkom', 'no': u'Project:Velkomstlogg', 'sq': u'Project:Tung log', - 'sr': u'Project:Добродошлице', 'zh': u'User:Welcomebot/欢迎日志', 'commons': u'Project:Welcome log', } @@ -224,6 +223,7 @@ 'fr': u'{{subst:Discussion Projet:Aide/Bienvenue}} %s', 'ga': u'{{subst:fáilte}} %s', 'he': u'{{ס:ברוך הבא}} %s', + 'hr': '{{subst:dd}} %s', 'id': u'{{subst:sdbot2}}\n%s', 'it': u'\n{{subst:Benvebot}}\n%s', 'ja': u'{{subst:Welcome/intro}}\n{{subst:welcome|%s}}', -- To view, visit https://gerrit.wikimedia.org/r/404878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6aa52d103dabcce7bd06b14fe646d538e3857b3a Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 2 months

[Gerrit] pywikibot/core[master]: BasePage.title: Encode slashes when asUrl is True

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404907 ) Change subject: BasePage.title: Encode slashes when asUrl is True ...................................................................... BasePage.title: Encode slashes when asUrl is True Update page_tests.TestPermalink.test_permalink accordingly. Bug: T184712 Change-Id: Ib19e3004761dd29adab762ff3f5a9ec0c1a5d3ba --- M pywikibot/page.py M tests/page_tests.py 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/page.py b/pywikibot/page.py index 767835d..f3025e0 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -367,7 +367,7 @@ title = title.replace(u' ', u'_') if asUrl: encodedTitle = title.encode(self.site.encoding()) - title = quote_from_bytes(encodedTitle) + title = quote_from_bytes(encodedTitle, safe='') if as_filename: # Replace characters that are not possible in file names on some # systems. diff --git a/tests/page_tests.py b/tests/page_tests.py index 14556b3..08cb8de 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -1106,16 +1106,16 @@ p1 = pywikibot.Page(site, 'User:Framawiki/pwb_tests/permalink') self.assertEqual(p1.permalink(), '//test.wikipedia.org/w/index.php?title=User%3A' - 'Framawiki/pwb_tests/permalink&oldid=340685') + 'Framawiki%2Fpwb_tests%2Fpermalink&oldid=340685') self.assertEqual(p1.permalink(oldid='340684'), '//test.wikipedia.org/w/index.php?title=User%3A' - 'Framawiki/pwb_tests/permalink&oldid=340684') + 'Framawiki%2Fpwb_tests%2Fpermalink&oldid=340684') self.assertEqual(p1.permalink(percent_encoded=False), '//test.wikipedia.org/w/index.php?title=User:' 'Framawiki/pwb_tests/permalink&oldid=340685') self.assertEqual(p1.permalink(with_protocol=True), 'https://test.wikipedia.org/w/index.php?title=User%3A' - 'Framawiki/pwb_tests/permalink&oldid=340685') + 'Framawiki%2Fpwb_tests%2Fpermalink&oldid=340685') if __name__ == '__main__': # pragma: no cover -- To view, visit https://gerrit.wikimedia.org/r/404907 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib19e3004761dd29adab762ff3f5a9ec0c1a5d3ba Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 2 months

[Gerrit] pywikibot/core[master]: Add vcr cassettes for some classes in wikibase_tests.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404424 ) Change subject: Add vcr cassettes for some classes in wikibase_tests.py ...................................................................... Add vcr cassettes for some classes in wikibase_tests.py Add vcr cassettes for some classses in wikibase_tests.py: - TestRedirects - TestLinks - TestNamespaces This reverts commit a01a3780839552b850eb1ccac9f82ff5cf0e3367. Bug: T184081 Change-Id: I0ca9ffad52153a7a05450ea97381b00ea610f66b --- A tests/cassettes/wikidata.wikidata/TestNamespaces.test_empty_wikibase_page.yaml A tests/cassettes/wikidata.wikidata/TestNamespaces.test_item_unknown_namespace.yaml A tests/cassettes/wikidata.wikidata/TestNamespaces.test_wikibase_namespace_selection.yaml A tests/cassettes/wikidata.wikidata/TestRedirects.test_normal_item.yaml A tests/cassettes/wikidata.wikidata/TestRedirects.test_redirect_item.yaml A tests/cassettes/wikipedia.af/TestLinks.test_iterlinks_filtering.yaml M tests/wikibase_tests.py 7 files changed, 2,363 insertions(+), 0 deletions(-) Approvals: Dalba: Looks good to me, but someone else must approve jenkins-bot: Verified Xqt: Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/404424 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ca9ffad52153a7a05450ea97381b00ea610f66b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Rafidaslam <rafidteam(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 2 months

[Gerrit] pywikibot/core[master]: [TEST] Add tests for flow.Topic class

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405027 ) Change subject: [TEST] Add tests for flow.Topic class ...................................................................... [TEST] Add tests for flow.Topic class Page https://test.wikipedia.org/wiki/User:Framawiki/pwb_tests/flow_board was created for these tests. Bug: T60941 Change-Id: Idfbae75bd8fd2bbd342a769504b44fd3e3c2ed16 --- M tests/flow_tests.py 1 file changed, 31 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/flow_tests.py b/tests/flow_tests.py index dfc87f8..728db61 100644 --- a/tests/flow_tests.py +++ b/tests/flow_tests.py @@ -211,3 +211,34 @@ self.assertRaises(AssertionError, Post.fromJSON, real_topic, 'abc', {'posts': {'abc': ['123']}, 'revisions': {'123': {'content': 789}}}) + + +class TestFlowTopic(TestCase): + """Test Topic functions.""" + + family = 'test' + code = 'test' + + def test_topic(self): + """Test general functions of the Topic class.""" + topic = Topic(self.site, 'Topic:U5y4l1rzitlplyc5') + self.assertEqual(topic.root.uuid, 'u5y4l1rzitlplyc5') + replies = topic.replies() + self.assertEqual(len(replies), 3) + self.assertTrue(all(isinstance(reply, Post) + for reply in replies)) + self.assertEqual(replies[1].uuid, 'u5y5lysqcvyne4k1') + + def test_topic_moderation(self): + """Test Topic functions about moderation.""" + topic_closed = Topic(self.site, 'Topic:U5y4efgaprfe7ssi') + self.assertTrue(topic_closed.is_locked) + self.assertTrue(topic_closed.is_moderated) + + topic_open = Topic(self.site, 'Topic:U5y4l1rzitlplyc5') + self.assertFalse(topic_open.is_locked) + self.assertFalse(topic_open.is_moderated) + + topic_hidden = Topic(self.site, 'Topic:U5y53rn0dp6h70nw') + self.assertFalse(topic_hidden.is_locked) + self.assertTrue(topic_hidden.is_moderated) -- To view, visit https://gerrit.wikimedia.org/r/405027 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idfbae75bd8fd2bbd342a769504b44fd3e3c2ed16 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 2 months

[Gerrit] pywikibot/core[master]: dev-requirements.txt: Add setuptools_scm to Python 2.6 requi...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405396 ) Change subject: dev-requirements.txt: Add setuptools_scm to Python 2.6 requirements ...................................................................... dev-requirements.txt: Add setuptools_scm to Python 2.6 requirements Bug: T185369 Change-Id: Ia3dff97a9b6739f910592a7776f58dfea6472eb4 --- M dev-requirements.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/dev-requirements.txt b/dev-requirements.txt index 4e1640d..5084cdf 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -35,3 +35,5 @@ # are not useful on the Appveyor Win32 builds since the relevant UI tests # also require accessing the menu of the console window, which doesnt exist # in the Appveyor environment. + +setuptools_scm ; python_version == '2.6' -- To view, visit https://gerrit.wikimedia.org/r/405396 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia3dff97a9b6739f910592a7776f58dfea6472eb4 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 2 months

[Gerrit] pywikibot/core[master]: Fix or suppress some of the expected warnings during dry tests

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405262 ) Change subject: Fix or suppress some of the expected warnings during dry tests ...................................................................... Fix or suppress some of the expected warnings during dry tests api_tests.py: - TestDryPageGenerator.setUp: The `titles` parameter is handled through Request.clean_kwargs which issues a DeprecationWarning about using parameters isntead. Do it to avoid the warning. - test_mixed_mode: Suppress parameters related warnings. pywikibot.diff.html_comparator: - Explicitly use html.parser to avoid "bs4/__init__.py:181: UserWarning: No parser was explicitly specified" + Similar suppressions in other dry test modules. Bug: T185296 Change-Id: Ib108e513b66112956c19ce62746510e34c594a93 --- M pywikibot/diff.py M tests/api_tests.py M tests/bot_tests.py M tests/dry_api_tests.py M tests/http_tests.py M tests/i18n_tests.py M tests/textlib_tests.py 7 files changed, 49 insertions(+), 26 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/diff.py b/pywikibot/diff.py index e7f029d..636be64 100644 --- a/pywikibot/diff.py +++ b/pywikibot/diff.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Diff module.""" # -# (C) Pywikibot team, 2014-2015 +# (C) Pywikibot team, 2014-2018 # # Distributed under the terms of the MIT license. # @@ -607,7 +607,7 @@ from bs4 import BeautifulSoup comparands = {'deleted-context': [], 'added-context': []} - soup = BeautifulSoup(compare_string) + soup = BeautifulSoup(compare_string, 'html.parser') for change_type, css_class in (('deleted-context', 'diff-deletedline'), ('added-context', 'diff-addedline')): crutons = soup.find_all('td', class_=css_class) diff --git a/tests/api_tests.py b/tests/api_tests.py index 7906847..c185ff5 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """API test module.""" # -# (C) Pywikibot team, 2007-2016 +# (C) Pywikibot team, 2007-2018 # # Distributed under the terms of the MIT license. # @@ -18,6 +18,7 @@ from pywikibot.throttle import Throttle from pywikibot.tools import ( + suppress_warnings, MediaWikiVersion, PY2, UnicodeType, @@ -143,6 +144,9 @@ for item in req.items(): self.assertEqual(len(item), 2, item) + @suppress_warnings( + 'Instead of using kwargs |Both kwargs and parameters are set', + DeprecationWarning) def test_mixed_mode(self): """Test if parameters is used with kwargs.""" req1 = api.Request(site=self.site, action='test', parameters='foo') @@ -570,7 +574,7 @@ mysite = self.get_site() self.gen = api.PageGenerator(site=mysite, generator="links", - titles="User:R'n'B") + parameters={'titles': "User:R'n'B"}) # following test data is copied from an actual api.php response, # but that query no longer matches this dataset. # http://en.wikipedia.org/w/api.php?action=query&generator=links&titles=User:… diff --git a/tests/bot_tests.py b/tests/bot_tests.py index 47c3618..5cfade3 100644 --- a/tests/bot_tests.py +++ b/tests/bot_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Bot tests.""" # -# (C) Pywikibot team, 2015 +# (C) Pywikibot team, 2015-2018 # # Distributed under the terms of the MIT license. # @@ -13,7 +13,7 @@ import pywikibot.bot from pywikibot import i18n -from pywikibot.tools import PY2 +from pywikibot.tools import PY2, suppress_warnings from tests.aspects import ( unittest, DefaultSiteTestCase, SiteAttributeTestCase, TestCase, @@ -222,6 +222,7 @@ self.bot.run() self.assertEqual(self.bot.site, self._treat_site) + @suppress_warnings('pywikibot.bot.MultipleSitesBot.site is deprecated') def test_MultipleSitesBot(self): """Test MultipleSitesBot class.""" # Assert no specific site diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index ed405af..8cef292 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """API tests which do not interact with a site.""" # -# (C) Pywikibot team, 2012-2014 +# (C) Pywikibot team, 2012-2018 # # Distributed under the terms of the MIT license. # @@ -17,8 +17,9 @@ QueryGenerator, ) from pywikibot.family import Family +from pywikibot.tools import suppress_warnings -from tests import join_images_path +from tests import join_images_path, patch from tests.utils import DummySiteinfo from tests.aspects import ( unittest, TestCase, DefaultDrySiteTestCase, SiteAttributeTestCase, @@ -58,10 +59,11 @@ expiry=1, site=self.altsite, parameters={'action': 'query', 'meta': 'userinfo'}) # When using ** the paramters are still unicode - self.deprecated_explicit = CachedRequest( - expiry=1, site=self.basesite, action='query', meta='userinfo') - self.deprecated_asterisks = CachedRequest( - expiry=1, site=self.basesite, **self.parms) + with suppress_warnings('Instead of using kwargs ', DeprecationWarning): + self.deprecated_explicit = CachedRequest( + expiry=1, site=self.basesite, action='query', meta='userinfo') + self.deprecated_asterisks = CachedRequest( + expiry=1, site=self.basesite, **self.parms) def test_expiry_formats(self): """Test using a timedelta as expiry.""" @@ -250,8 +252,9 @@ site = self.get_site() site._userinfo = {'name': 'other_username', 'groups': []} site._username[0] = 'myusername' - - Request(site=site, parameters={'action': 'edit'}) + # Ignore warning: API write action by unexpected username commenced. + with patch('pywikibot.warning'): + Request(site=site, parameters={'action': 'edit'}) def test_normal(self): """Test Request object when username is correct.""" diff --git a/tests/http_tests.py b/tests/http_tests.py index bd296c8..f0829a7 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for http module.""" # -# (C) Pywikibot team, 2014-2017 +# (C) Pywikibot team, 2014-2018 # # Distributed under the terms of the MIT license. # @@ -19,10 +19,11 @@ from pywikibot.comms import http, threadedhttp from pywikibot.tools import ( PYTHON_VERSION, + suppress_warnings, UnicodeType as unicode, ) -from tests import join_images_path +from tests import join_images_path, patch from tests.aspects import ( unittest, TestCase, @@ -123,8 +124,12 @@ 'https://wmflabs.org': None, 'https://www.wikiquote.org/': None, } - for url, auth in pairs.items(): - self.assertEqual(http.get_authentication(url), auth) + with suppress_warnings( + r'config.authenticate\["\*.wmflabs.org"] has invalid value.', + UserWarning, + ): + for url, auth in pairs.items(): + self.assertEqual(http.get_authentication(url), auth) class HttpsCertificateTestCase(TestCase): @@ -546,7 +551,9 @@ """Test decoding with different charsets and valid header charset.""" req = CharsetTestCase._create_request('latin1') self.assertEqual('latin1', req.charset) - self.assertEqual('utf-8', req.encoding) + # Ignore WARNING: Encoding "latin1" requested but "utf-8" received + with patch('pywikibot.warning'): + self.assertEqual('utf-8', req.encoding) self.assertEqual(req.raw, CharsetTestCase.UTF8_BYTES) self.assertEqual(req.content, CharsetTestCase.STR) @@ -555,7 +562,9 @@ req = CharsetTestCase._create_request('latin1', CharsetTestCase.LATIN1_BYTES) self.assertEqual('latin1', req.charset) - self.assertEqual('latin1', req.encoding) + # Ignore WARNING: Encoding "latin1" requested but "utf-8" received + with patch('pywikibot.warning'): + self.assertEqual('latin1', req.encoding) self.assertEqual(req.raw, CharsetTestCase.LATIN1_BYTES) self.assertEqual(req.content, CharsetTestCase.STR) @@ -564,7 +573,11 @@ req = CharsetTestCase._create_request('utf16', CharsetTestCase.LATIN1_BYTES) self.assertEqual('utf16', req.charset) - self.assertRaisesRegex(UnicodeDecodeError, self.CODEC_CANT_DECODE_RE, lambda: req.encoding) + # Ignore WARNING: Encoding "utf16" requested but "utf-8" received + with patch('pywikibot.warning'): + self.assertRaisesRegex( + UnicodeDecodeError, self.CODEC_CANT_DECODE_RE, + lambda: req.encoding) self.assertEqual(req.raw, CharsetTestCase.LATIN1_BYTES) self.assertRaisesRegex(UnicodeDecodeError, self.CODEC_CANT_DECODE_RE, lambda: req.content) diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 12374f8..8b05058 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Test i18n module.""" # -# (C) Pywikibot team, 2007-2014 +# (C) Pywikibot team, 2007-2018 # # Distributed under the terms of the MIT license. # @@ -336,7 +336,7 @@ u'Robot: Changer seulement une page.') -class ScriptMessagesTestCase(TWNTestCaseBase): +class ScriptMessagesTestCase(TWNTestCaseBase, AutoDeprecationTestCase): """Real messages test.""" diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 476a7ba..6744d0b 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -18,7 +18,7 @@ from pywikibot import config, UnknownSite from pywikibot.site import _IWEntry -from pywikibot.tools import OrderedDict +from pywikibot.tools import OrderedDict, suppress_warnings from tests.aspects import ( unittest, require_modules, TestCase, DefaultDrySiteTestCase, @@ -580,7 +580,8 @@ self.assertIsNone(func('{{a|{{c}} }}')) self.assertIsNone(func('{{a|{{c|d}} }}')) - func = textlib.TEMP_REGEX.search + with suppress_warnings('textlib.TEMP_REGEX is deprecated'): + func = textlib.TEMP_REGEX.search self.assertIsNotNone(func('{{{1}}}')) self.assertIsNotNone(func('{{a|b={{c}} }}')) @@ -588,7 +589,8 @@ self.assertIsNotNone(func('{{a|{{c}} }}')) self.assertIsNotNone(func('{{a|{{c|d}} }}')) - func = textlib.TEMP_REGEX.match + with suppress_warnings('textlib.TEMP_REGEX is deprecated'): + func = textlib.TEMP_REGEX.match self.assertIsNotNone(func('{{#if:foo}}')) self.assertIsNotNone(func('{{foo:}}')) -- To view, visit https://gerrit.wikimedia.org/r/405262 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib108e513b66112956c19ce62746510e34c594a93 Gerrit-PatchSet: 14 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 3 months

[Gerrit] pywikibot/core[master]: Revert "Replace assertRaises with assertRaisesRegex in isbn_...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405292 ) Change subject: Revert "Replace assertRaises with assertRaisesRegex in isbn_tests.py" ...................................................................... Revert "Replace assertRaises with assertRaisesRegex in isbn_tests.py" This reverts commit 9a13055ce9c130d832ebd273681e7bf4d5dd71a7. We can use https://gerrit.wikimedia.org/r/#/c/399348/ instead. Bug: T185317 Change-Id: I9d2e576e386b04592520fa7533b58e03bc370f9d --- M tests/isbn_tests.py 1 file changed, 15 insertions(+), 53 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/isbn_tests.py b/tests/isbn_tests.py index ae867d2..df00417 100644 --- a/tests/isbn_tests.py +++ b/tests/isbn_tests.py @@ -34,29 +34,10 @@ else: AnyIsbnValidationException = IsbnExc -ISBNINVALIDCHECKSUM_RE = ( - r'The ISBN checksum of ([A-Z0-9]*) is incorrect' -) - -ISBNINVALIDLENGTH_RE = ( - r'The ISBN ([A-Z0-9]*) is not (10|13) digits long' -) - -ISBNINVALIDCHARACTERS_RE = ( - r'The ISBN ([A-Z0-9]*) contains invalid characters' -) - class TestCosmeticChangesISBN(DefaultDrySiteTestCase): """Test CosmeticChanges ISBN fix.""" - - INVALIDNUMBERLENGTH_RE = ( - r'The number has an invalid length' - ) - INVALIDNUMBERCHECKSUM_RE = ( - r'The number\'s checksum or check digit is invalid' - ) def test_valid_isbn(self): """Test ISBN.""" @@ -73,25 +54,17 @@ cc = CosmeticChangesToolkit(self.site, namespace=0) # Invalid characters - self.assertRaisesRegex(AnyIsbnValidationException, - (ISBNINVALIDLENGTH_RE + '|' + - self.INVALIDNUMBERLENGTH_RE), - cc.fix_ISBN, 'ISBN 0975229LOL') + self.assertRaises(AnyIsbnValidationException, + cc.fix_ISBN, 'ISBN 0975229LOL') # Invalid checksum - self.assertRaisesRegex(AnyIsbnValidationException, - (ISBNINVALIDCHECKSUM_RE + '|' + - self.INVALIDNUMBERCHECKSUM_RE), - cc.fix_ISBN, 'ISBN 0975229801') + self.assertRaises(AnyIsbnValidationException, + cc.fix_ISBN, 'ISBN 0975229801') # Invalid length - self.assertRaisesRegex(AnyIsbnValidationException, - (ISBNINVALIDLENGTH_RE + '|' + - self.INVALIDNUMBERLENGTH_RE), - cc.fix_ISBN, 'ISBN 09752298') + self.assertRaises(AnyIsbnValidationException, + cc.fix_ISBN, 'ISBN 09752298') # X in the middle - self.assertRaisesRegex(AnyIsbnValidationException, - (ISBNINVALIDCHARACTERS_RE + '|' + - self.INVALIDNUMBERLENGTH_RE), - cc.fix_ISBN, 'ISBN 09752X9801') + self.assertRaises(AnyIsbnValidationException, + cc.fix_ISBN, 'ISBN 09752X9801') def test_ignore_invalid_isbn(self): """Test fixing ISBN numbers with an invalid ISBN.""" @@ -104,10 +77,6 @@ class TestIsbn(TestCase): """Test ISBN-related classes and helper functions.""" - - ISBNXINTHEMIDDLE_RE = ( - r'ISBN ([A-Z0-9]*): X is only allowed at the end of the ISBN' - ) net = False @@ -125,14 +94,10 @@ self.assertEqual(isbn13.code, '978-0-9752298-0-4') # Errors - self.assertRaisesRegex(IsbnExc, ISBNINVALIDCHARACTERS_RE, - ISBN10, '0975229LOL') # Invalid characters - self.assertRaisesRegex(IsbnExc, ISBNINVALIDCHECKSUM_RE, - ISBN10, '0975229801') # Invalid checksum - self.assertRaisesRegex(IsbnExc, ISBNINVALIDLENGTH_RE, - ISBN10, '09752298') # Invalid length - self.assertRaisesRegex(IsbnExc, self.ISBNXINTHEMIDDLE_RE, - ISBN10, '09752X9801') # X in the middle + self.assertRaises(IsbnExc, ISBN10, '0975229LOL') # Invalid characters + self.assertRaises(IsbnExc, ISBN10, '0975229801') # Invalid checksum + self.assertRaises(IsbnExc, ISBN10, '09752298') # Invalid length + self.assertRaises(IsbnExc, ISBN10, '09752X9801') # X in the middle def test_isbn13(self): """Test ISBN13.""" @@ -146,12 +111,9 @@ self.assertEqual(isbn.code, '9788090273412') # Errors - self.assertRaisesRegex(IsbnExc, ISBNINVALIDCHARACTERS_RE, - ISBN13, '9783161484LOL') # Invalid characters - self.assertRaisesRegex(IsbnExc, ISBNINVALIDCHECKSUM_RE, - ISBN13, '9783161484105') # Invalid checksum - self.assertRaisesRegex(IsbnExc, ISBNINVALIDLENGTH_RE, - ISBN13, '9783161484') # Invalid length + self.assertRaises(IsbnExc, ISBN13, '9783161484LOL') # Invalid chars + self.assertRaises(IsbnExc, ISBN13, '9783161484105') # Invalid checksum + self.assertRaises(IsbnExc, ISBN13, '9783161484') # Invalid length def test_general(self): """Test things that apply both to ISBN10 and ISBN13.""" -- To view, visit https://gerrit.wikimedia.org/r/405292 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d2e576e386b04592520fa7533b58e03bc370f9d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Divadsn <divad.nnamtdeis(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: MtDu <justin.d128(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 3 months

[Gerrit] pywikibot/core[master]: utils.py: Ignore unclosed SSLSocket ResourceWarning

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404953 ) Change subject: utils.py: Ignore unclosed SSLSocket ResourceWarning ...................................................................... utils.py: Ignore unclosed SSLSocket ResourceWarning Bug: T185188 Change-Id: I8bc32d8789916c59ffd6f6446fda605817811f72 --- M tests/utils.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/utils.py b/tests/utils.py index dde0993..eaf68c4 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -259,7 +259,8 @@ # Ignore socket IO warnings (T183696, T184996) if (PYTHON_VERSION >= (3, 2) and issubclass(warn_msg.category, ResourceWarning) - and 'unclosed <socket.socket' in str(warn_msg.message) + and any(str(warn_msg.message).startswith(msg) for msg in ( + 'unclosed <ssl.SSLSocket', 'unclosed <socket.socket')) and warn_msg.filename.rpartition('/')[2] in ( 'cookiejar.py', 'inspect.py', 'socket.py')): return -- To view, visit https://gerrit.wikimedia.org/r/404953 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8bc32d8789916c59ffd6f6446fda605817811f72 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 3 months

[Gerrit] pywikibot/core[master]: [IMPR] Remove unneeded initializer from download_dump.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403910 ) Change subject: [IMPR] Remove unneeded initializer from download_dump.py ...................................................................... [IMPR] Remove unneeded initializer from download_dump.py Change-Id: I7159beb8bf482aa735a0553ed225c3e12aa34b70 --- M scripts/maintenance/download_dump.py 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified Zoranzoki21: Looks good to me, but someone else must approve diff --git a/scripts/maintenance/download_dump.py b/scripts/maintenance/download_dump.py index 91c2394..7b27c6d 100644 --- a/scripts/maintenance/download_dump.py +++ b/scripts/maintenance/download_dump.py @@ -61,10 +61,6 @@ 'revision': 'latest', } - def __init__(self, **kwargs): - """Constructor.""" - super(DownloadDumpBot, self).__init__(**kwargs) - def get_dump_name(self, db_name, typ): """Check if dump file exists locally in a Toolforge server.""" db_path = '/public/dumps/public/{0}/'.format(db_name) -- To view, visit https://gerrit.wikimedia.org/r/403910 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7159beb8bf482aa735a0553ed225c3e12aa34b70 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2018