Pywikibot-commits December 2017

pywikibot-commits@lists.wikimedia.org

1 participants
74 discussions

[Gerrit] pywikibot/core[master]: [bugfix] Catch AttributeError and raise the ValueError

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/396917 ) Change subject: [bugfix] Catch AttributeError and raise the ValueError ...................................................................... [bugfix] Catch AttributeError and raise the ValueError Bug: T181913 Change-Id: Id03f32e8dc422a22f9998030836da5be8d25af52 --- M pywikibot/proofreadpage.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified Zoranzoki21: Looks good to me, but someone else must approve diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index f4e6a08..2919514 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -532,12 +532,12 @@ soup = Soup(response.content) try: - # None if nothing is found by .find() self._url_image = soup.find(class_='prp-page-image') + # if None raises AttributeError self._url_image = self._url_image.find('img') # if None raises TypeError. self._url_image = self._url_image['src'] - except TypeError: + except (TypeError, AttributeError): raise ValueError('No prp-page-image src found for %s.' % self) else: self._url_image = 'https:' + self._url_image -- To view, visit https://gerrit.wikimedia.org/r/396917 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id03f32e8dc422a22f9998030836da5be8d25af52 Gerrit-PatchSet: 2 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: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 4 months

[Gerrit] pywikibot/core[master]: Fix regex in namespace_tests.py for py3.4+

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/396930 ) Change subject: Fix regex in namespace_tests.py for py3.4+ ...................................................................... Fix regex in namespace_tests.py for py3.4+ Bug: T182527 Change-Id: I1187bdb8ad396d97b07e84458828c3287f523764 --- M tests/namespace_tests.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index d88bf5f..0e658e6 100644 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -233,7 +233,8 @@ r'identifiers contains inappropriate types: (.*?)' ) INTARGNOTSTRINGORNUMBER_RE = ( - r"int\(\) argument must be a string or a number, not '(.*?)'" + r"int\(\) argument must be a string(, a bytes-like object)? " + r"or a number, not '(.*?)'" ) NAMESPACEIDNOTRECOGNISED_RE = ( r'Namespace identifier\(s\) not recognised: (.*?)' -- To view, visit https://gerrit.wikimedia.org/r/396930 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1187bdb8ad396d97b07e84458828c3287f523764 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Divadsn <divad.nnamtdeis(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Divadsn <divad.nnamtdeis(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.kreuz(a)wikimedia.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 4 months

[Gerrit] pywikibot/core[master]: Add commit-message-validator to jenkins' envlist

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/397531 ) Change subject: Add commit-message-validator to jenkins' envlist ...................................................................... Add commit-message-validator to jenkins' envlist Also, use dashes instead of underscores for flake8-invalid-escape-sequences. Apparently, it's more customary to write package names with dashes and that's how setuptools treats them anyway.[1] [1]: https://mail.python.org/pipermail/distutils-sig/2011-August/017936.html Change-Id: I88d2f39fad7c6ef9a11f33b30e1be67f5dcdcafe --- M tox.ini 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tox.ini b/tox.ini index 422ac52..a59f7be 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ # Override default for WM Jenkins # Others are run in their own individual jobs on WM Jenkins # Wikimedia Jenkins does not have Python 2.6 -envlist = flake8,pyflakes-{py3,pypy} +envlist = commit-message,flake8,pyflakes-{py3,pypy} [params] doctest_skip = --ignore-files=(gui\.py|botirc\.py|eventstreams\.py) @@ -69,7 +69,7 @@ flake8-print>=2.0.1 flake8-mock>=0.3 pep8-naming - flake8_invalid_escape_sequences + flake8-invalid-escape-sequences # 4a226d07 is https://github.com/erikrose/blessings/pull/104 [testenv:flake8-diff] -- To view, visit https://gerrit.wikimedia.org/r/397531 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I88d2f39fad7c6ef9a11f33b30e1be67f5dcdcafe Gerrit-PatchSet: 6 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, 4 months

[Gerrit] pywikibot/core[master]: tox.ini: Add flake8_invalid_escape_sequences

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/396918 ) Change subject: tox.ini: Add flake8_invalid_escape_sequences ...................................................................... tox.ini: Add flake8_invalid_escape_sequences This pluging will tell if there are invalid escape sequences in the source code. Also fix exising errors. Keep lines under 80 characters. Change-Id: Ibb8b4a799304134edb4f4c8fc81ef1874e36a993 --- M tests/category_tests.py M tests/namespace_tests.py M tox.ini 3 files changed, 13 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/category_tests.py b/tests/category_tests.py index 0d3f2d6..671317d 100644 --- a/tests/category_tests.py +++ b/tests/category_tests.py @@ -18,7 +18,7 @@ """Test Category object.""" NOCATEGORYNAMESPACE_RE = '\'(.*?)\' is not in the category namespace!' - NOREDIRECTPAGE_RE = 'Page \[\[(.*?)\]\] is not a redirect page.' + NOREDIRECTPAGE_RE = r'Page \[\[(.*?)\]\] is not a redirect page.' family = 'wikipedia' code = 'en' diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index 1b35582..d88bf5f 100644 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -229,9 +229,15 @@ """Test static/classmethods in Namespace replaced by NamespacesDict.""" - CONTAINSINAPPROPRIATE_RE = 'identifiers contains inappropriate types: (.*?)' - INTARGNOTSTRINGORNUMBER_RE = 'int\(\) argument must be a string or a number, not \'(.*?)\'' - NAMESPACEIDNOTRECOGNISED_RE = 'Namespace identifier\(s\) not recognised: (.*?)' + CONTAINSINAPPROPRIATE_RE = ( + r'identifiers contains inappropriate types: (.*?)' + ) + INTARGNOTSTRINGORNUMBER_RE = ( + r"int\(\) argument must be a string or a number, not '(.*?)'" + ) + NAMESPACEIDNOTRECOGNISED_RE = ( + r'Namespace identifier\(s\) not recognised: (.*?)' + ) net = False @@ -377,8 +383,8 @@ """Test NamespacesDict.__getitem__.""" - VALIDNUMBER_RE = '-?(0|[1-9]\d*)' - EMPTYTEXT_RE = '\s*' + VALIDNUMBER_RE = r'-?(0|[1-9]\d*)' + EMPTYTEXT_RE = r'\s*' net = False diff --git a/tox.ini b/tox.ini index 4221381..422ac52 100644 --- a/tox.ini +++ b/tox.ini @@ -69,6 +69,7 @@ flake8-print>=2.0.1 flake8-mock>=0.3 pep8-naming + flake8_invalid_escape_sequences # 4a226d07 is https://github.com/erikrose/blessings/pull/104 [testenv:flake8-diff] -- To view, visit https://gerrit.wikimedia.org/r/396918 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb8b4a799304134edb4f4c8fc81ef1874e36a993 Gerrit-PatchSet: 4 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, 4 months

[Gerrit] pywikibot/core[master]: Replace assertRaises with assertRaisesRegex in namespace_tes...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/396589 ) Change subject: Replace assertRaises with assertRaisesRegex in namespace_tests.py ...................................................................... Replace assertRaises with assertRaisesRegex in namespace_tests.py assertRaises is not as good of a test as asserRaisesRegex. The latter has an extra parameter to match the exception message, allowing more more precision when checking an error. Bug: T154281 Change-Id: Ie6d334b2225cde1b2c4380b5e62b9860ba42a2fc --- M tests/namespace_tests.py 1 file changed, 38 insertions(+), 20 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/namespace_tests.py b/tests/namespace_tests.py index 9897f03..1b35582 100644 --- a/tests/namespace_tests.py +++ b/tests/namespace_tests.py @@ -229,6 +229,10 @@ """Test static/classmethods in Namespace replaced by NamespacesDict.""" + CONTAINSINAPPROPRIATE_RE = 'identifiers contains inappropriate types: (.*?)' + INTARGNOTSTRINGORNUMBER_RE = 'int\(\) argument must be a string or a number, not \'(.*?)\'' + NAMESPACEIDNOTRECOGNISED_RE = 'Namespace identifier\(s\) not recognised: (.*?)' + net = False def test_resolve_equal(self): @@ -269,26 +273,33 @@ def test_resolve_exceptions(self): """Test Namespace.resolve failure.""" - self.assertRaises(TypeError, Namespace.resolve, [True]) - self.assertRaises(TypeError, Namespace.resolve, [False]) - self.assertRaises(TypeError, Namespace.resolve, [None]) - self.assertRaises(TypeError, Namespace.resolve, True) - self.assertRaises(TypeError, Namespace.resolve, False) - self.assertRaises(TypeError, Namespace.resolve, None) + self.assertRaisesRegex(TypeError, self.CONTAINSINAPPROPRIATE_RE, + Namespace.resolve, [True]) + self.assertRaisesRegex(TypeError, self.CONTAINSINAPPROPRIATE_RE, + Namespace.resolve, [False]) + self.assertRaisesRegex(TypeError, self.INTARGNOTSTRINGORNUMBER_RE, + Namespace.resolve, [None]) + self.assertRaisesRegex(TypeError, self.CONTAINSINAPPROPRIATE_RE, + Namespace.resolve, True) + self.assertRaisesRegex(TypeError, self.CONTAINSINAPPROPRIATE_RE, + Namespace.resolve, False) + self.assertRaisesRegex(TypeError, self.INTARGNOTSTRINGORNUMBER_RE, + Namespace.resolve, None) - self.assertRaises(KeyError, Namespace.resolve, -10) - self.assertRaises(KeyError, Namespace.resolve, '-10') - self.assertRaises(KeyError, Namespace.resolve, 'foo') - self.assertRaises(KeyError, Namespace.resolve, ['foo']) + self.assertRaisesRegex(KeyError, self.NAMESPACEIDNOTRECOGNISED_RE, + Namespace.resolve, -10) + self.assertRaisesRegex(KeyError, self.NAMESPACEIDNOTRECOGNISED_RE, + Namespace.resolve, '-10') + self.assertRaisesRegex(KeyError, self.NAMESPACEIDNOTRECOGNISED_RE, + Namespace.resolve, 'foo') + self.assertRaisesRegex(KeyError, self.NAMESPACEIDNOTRECOGNISED_RE, + Namespace.resolve, ['foo']) - self.assertRaisesRegex(KeyError, - r'Namespace identifier\(s\) not recognised: -10', + self.assertRaisesRegex(KeyError, self.NAMESPACEIDNOTRECOGNISED_RE, Namespace.resolve, [-10, 0]) - self.assertRaisesRegex(KeyError, - r'Namespace identifier\(s\) not recognised: foo', + self.assertRaisesRegex(KeyError, self.NAMESPACEIDNOTRECOGNISED_RE, Namespace.resolve, [0, 'foo']) - self.assertRaisesRegex(KeyError, - r'Namespace identifier\(s\) not recognised: -10,-11', + self.assertRaisesRegex(KeyError, self.NAMESPACEIDNOTRECOGNISED_RE, Namespace.resolve, [-10, 0, -11]) def test_lookup_name(self): @@ -366,6 +377,9 @@ """Test NamespacesDict.__getitem__.""" + VALIDNUMBER_RE = '-?(0|[1-9]\d*)' + EMPTYTEXT_RE = '\s*' + net = False def test_ids(self): @@ -385,8 +399,10 @@ namespaces = builtin_NamespacesDict() lower = min(namespaces.keys()) - 1 higher = max(namespaces.keys()) + 1 - self.assertRaises(KeyError, namespaces.__getitem__, lower) - self.assertRaises(KeyError, namespaces.__getitem__, higher) + with self.assertRaisesRegex(KeyError, self.VALIDNUMBER_RE): + namespaces[lower] + with self.assertRaisesRegex(KeyError, self.VALIDNUMBER_RE): + namespaces[higher] def test_canonical_name(self): """Test lookup by canonical namespace name.""" @@ -418,9 +434,11 @@ def test_invalid_name(self): """Test lookup by invalid name.""" namespaces = builtin_NamespacesDict() - self.assertRaises(KeyError, namespaces.__getitem__, 'FOO') + with self.assertRaisesRegex(KeyError, self.EMPTYTEXT_RE): + namespaces['FOO'] # '|' is not permitted in namespace names - self.assertRaises(KeyError, namespaces.__getitem__, '|') + with self.assertRaisesRegex(KeyError, self.EMPTYTEXT_RE): + namespaces['|'] if __name__ == '__main__': # pragma: no cover -- To view, visit https://gerrit.wikimedia.org/r/396589 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie6d334b2225cde1b2c4380b5e62b9860ba42a2fc Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Divadsn <divad.nnamtdeis(a)gmail.com> Gerrit-Reviewer: Divadsn <divad.nnamtdeis(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: MtDu <justin.d128(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 4 months

[Gerrit] pywikibot/core[master]: [bugfix] Fix default alias for "thumb"

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/396588 ) Change subject: [bugfix] Fix default alias for "thumb" ...................................................................... [bugfix] Fix default alias for "thumb" - "mini" is the new default alias for "thumb" in German after https://phabricator.wikimedia.org/rMW4c2c2ef01a6251f68d813977068ce66187c3be… Bug: T182500 Change-Id: I6b4fb5f11015df4b60919f7b78107a2e5a369c9d --- M tests/cosmetic_changes_tests.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py index 6900b3e..6e22088 100644 --- a/tests/cosmetic_changes_tests.py +++ b/tests/cosmetic_changes_tests.py @@ -264,18 +264,18 @@ def test_translateMagicWords(self): """Test translateMagicWords method.""" self.assertEqual( - '[[File:Foo.bar|miniatur]]', + '[[File:Foo.bar|mini]]', self.cct.translateMagicWords('[[File:Foo.bar|thumb]]')) self.assertEqual( - '[[File:Foo.bar|miniatur]]', - self.cct.translateMagicWords('[[File:Foo.bar|mini]]')) + '[[File:Foo.bar|mini]]', + self.cct.translateMagicWords('[[File:Foo.bar|miniatur]]')) # test local namespace self.assertEqual( - '[[Datei:Foo.bar|miniatur]]', + '[[Datei:Foo.bar|mini]]', self.cct.translateMagicWords('[[Datei:Foo.bar|thumb]]')) # test multiple magic words self.assertEqual( - '[[File:Foo.bar|links|miniatur]]', + '[[File:Foo.bar|links|mini]]', self.cct.translateMagicWords('[[File:Foo.bar|left|thumb]]')) # test magic words at the end self.assertEqual( -- To view, visit https://gerrit.wikimedia.org/r/396588 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b4fb5f11015df4b60919f7b78107a2e5a369c9d Gerrit-PatchSet: 2 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: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 4 months

[Gerrit] pywikibot/core[master]: Replace assertRaises with assertRaisesRegex in category_test...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/396576 ) Change subject: Replace assertRaises with assertRaisesRegex in category_tests.py ...................................................................... Replace assertRaises with assertRaisesRegex in category_tests.py assertRaises is not as good of a test as asserRaisesRegex. The latter has an extra parameter to match the exception message, allowing more more precision when checking an error. Bug: T154281 Change-Id: Ia941decd329640a4e043208b52e5ce581b2bf0c0 --- M tests/category_tests.py 1 file changed, 11 insertions(+), 4 deletions(-) Approvals: John Vandenberg: Looks good to me, approved MtDu: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/tests/category_tests.py b/tests/category_tests.py index e4b4ba1..0d3f2d6 100644 --- a/tests/category_tests.py +++ b/tests/category_tests.py @@ -17,6 +17,9 @@ """Test Category object.""" + NOCATEGORYNAMESPACE_RE = '\'(.*?)\' is not in the category namespace!' + NOREDIRECTPAGE_RE = 'Page \[\[(.*?)\]\] is not a redirect page.' + family = 'wikipedia' code = 'en' @@ -25,7 +28,8 @@ def test_init(self): """Test the category's __init__ for one condition that can't be dry.""" site = self.get_site() - self.assertRaises(ValueError, pywikibot.Category, site, 'Wikipedia:Test') + self.assertRaisesRegex(ValueError, self.NOCATEGORYNAMESPACE_RE, + pywikibot.Category, site, 'Wikipedia:Test') def test_is_empty(self): """Test if category is empty or not.""" @@ -146,13 +150,15 @@ self.assertEqual(tgt, cat2) # Raise exception if target is fetched for non Category redirects. - self.assertRaises(pywikibot.IsNotRedirectPage, - cat2.getCategoryRedirectTarget) + self.assertRaisesRegex(pywikibot.IsNotRedirectPage, + self.NOREDIRECTPAGE_RE, cat2.getCategoryRedirectTarget) class TestCategoryDryObject(TestCase): """Test the category object with dry tests.""" + + NOCATEGORYNAMESPACE_RE = '\'(.*?)\' is not in the category namespace!' family = 'wikipedia' code = 'en' @@ -178,7 +184,8 @@ self.assertTrue(cat_dup_ns.title(withNamespace=False), 'Page:Foo') self.assertTrue(cat_dup_ns.namespace(), 14) - self.assertRaises(ValueError, pywikibot.Category, site, 'Talk:Foo') + self.assertRaisesRegex(ValueError, self.NOCATEGORYNAMESPACE_RE, + pywikibot.Category, site, 'Talk:Foo') def test_section(self): """Test the section method.""" -- To view, visit https://gerrit.wikimedia.org/r/396576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia941decd329640a4e043208b52e5ce581b2bf0c0 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Divadsn <divad.nnamtdeis(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: MtDu <justin.d128(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 4 months

[Gerrit] pywikibot/core[master]: Enable hacking rule H201

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/236495 ) Change subject: Enable hacking rule H201 ...................................................................... Enable hacking rule H201 Prevent use of `except:`; require `except Exception:` or a more specific exception class. Signed-off-by: xqt <info(a)gno.de> Change-Id: Ie71c2062d9cf04715fa76da500d55a6103726fbd --- M generate_user_files.py M pywikibot/config2.py M pywikibot/data/api.py M pywikibot/pagegenerators.py M scripts/script_wui.py M tox.ini 6 files changed, 10 insertions(+), 11 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/generate_user_files.py b/generate_user_files.py index faf7cda..92bd19e 100755 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -295,11 +295,9 @@ config_text=config_text)) pywikibot.output(u"'%s' written." % _fnc) - except Exception: - try: + except BaseException: + if os.path.exists(_fnc): os.remove(_fnc) - except Exception: - pass raise diff --git a/pywikibot/config2.py b/pywikibot/config2.py index e42c75c..f19f37b 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -418,7 +418,7 @@ console_encoding = sys.stdout.encoding else: console_encoding = sys.stdout.encoding.decode('ascii') -except Exception: +except AttributeError: # When using pywikibot inside a daemonized twisted application, # we get "StdioOnnaStick instance has no attribute 'encoding'" console_encoding = None @@ -474,7 +474,9 @@ try: # Don't print colorized when the output is, for example, piped to a file. colorized_output = sys.stdout.isatty() -except Exception: +except AttributeError: + # When using pywikibot inside a daemonized twisted application, + # we get "StdioOnnaStick instance has no attribute 'isatty'" colorized_output = False # An indication of the size of your screen, or rather the size of the screen diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index cdbcfea..9e2627d 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1998,7 +1998,7 @@ self._params[param] = [str(int(value) // 2)] pywikibot.output(u"Set %s = %s" % (param, self._params[param])) - except Exception: + except ValueError: pass self.wait() continue diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 0389c7c..4c5addc 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1008,7 +1008,7 @@ if value: try: total = int(value) - except Exception: + except ValueError: params = value.split(';') if len(params) == 2: value, total = params diff --git a/scripts/script_wui.py b/scripts/script_wui.py index 9fadbeb..5e61c61 100755 --- a/scripts/script_wui.py +++ b/scripts/script_wui.py @@ -355,7 +355,7 @@ bot = ScriptWUIBot(site, chan, site.user() + "_WUI", "irc.wikimedia.org") try: bot.start() - except Exception: + except BaseException: bot.t.cancel() raise diff --git a/tox.ini b/tox.ini index a378065..4221381 100644 --- a/tox.ini +++ b/tox.ini @@ -151,7 +151,6 @@ # D102: Missing docstring in public method # D103: Missing docstring in public function # E402: module level import not at top of file; see T87409 -# H201: Except: format # N802, N803, N806 : naming convention # P102,P103: string does contain unindexed parameters; see I36355923 @@ -160,7 +159,7 @@ # D413: Missing blank line after last section # D412: No blank lines allowed between a section header and its content -ignore = C401,C402,C405,E402,D105,D211,FI10,FI12,FI13,FI15,FI16,FI17,FI5,H101,H201,H236,H301,H404,H405,H903,I100,I101,I202,N802,N803,N806,D401,D413,D103,D412 +ignore = C401,C402,C405,E402,D105,D211,FI10,FI12,FI13,FI15,FI16,FI17,FI5,H101,H236,H301,H404,H405,H903,I100,I101,I202,N802,N803,N806,D401,D413,D103,D412 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* min-version = 2.6 max_line_length = 100 -- To view, visit https://gerrit.wikimedia.org/r/236495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie71c2062d9cf04715fa76da500d55a6103726fbd Gerrit-PatchSet: 10 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

6 years, 4 months

[Gerrit] pywikibot/core[master]: [IMPR] A more preceese exception for patrol.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/395702 ) Change subject: [IMPR] A more preceese exception for patrol.py ...................................................................... [IMPR] A more preceese exception for patrol.py Change-Id: I56c0a598c3431f166e81fb077b1cee50ac771b14 --- M scripts/patrol.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/patrol.py b/scripts/patrol.py index a20484e..f21be42 100755 --- a/scripts/patrol.py +++ b/scripts/patrol.py @@ -279,7 +279,7 @@ author_ns = 0 try: author_ns = self.site.family.authornamespaces[self.site.lang][0] - except Exception: + except (AttributeError, KeyError): pass if author_ns: author_ns_prefix = self.site.namespace(author_ns) -- To view, visit https://gerrit.wikimedia.org/r/395702 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I56c0a598c3431f166e81fb077b1cee50ac771b14 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: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 4 months

[Gerrit] pywikibot/core[master]: [IMPR] code cleanup

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/395696 ) Change subject: [IMPR] code cleanup ...................................................................... [IMPR] code cleanup - remove obsolete pass statements - fix dicstring in imageuncat.py - use context manager to open a file in solve_disambiguation.py Change-Id: I5d0c862a9cdb11ce4bd12d9d68b397b19c62d602 --- M pywikibot/date.py M pywikibot/page.py M pywikibot/throttle.py M scripts/cfd.py M scripts/imageuncat.py M scripts/makecat.py M scripts/redirect.py M scripts/solve_disambiguation.py M scripts/upload.py M scripts/welcome.py M tests/aspects.py M tests/ui_tests.py 12 files changed, 19 insertions(+), 40 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/date.py b/pywikibot/date.py index a9b0e39..f3ec6fb 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -7,7 +7,7 @@ # (C) Andre Engels, 2004-2005 # (C) Yuri Astrakhan, 2005-2006 (<Firstname><Lastname>@gmail.com) # (years/decades/centuries/millenniums str <=> int conversions) -# (C) Pywikibot team, 2004-2016 +# (C) Pywikibot team, 2004-2017 # # Distributed under the terms of the MIT license. # @@ -377,10 +377,10 @@ decoders = [] for s in _reParameters.split(pattern): if s is None: - pass - elif (len(s) in (2, 3) and s[0] == '%' and - s[-1] in _digitDecoders and - (len(s) == 2 or s[1] in _decimalDigits)): + continue + if (len(s) in (2, 3) and s[0] == '%' and + s[-1] in _digitDecoders and + (len(s) == 2 or s[1] in _decimalDigits)): # Must match a "%2d" or "%d" style dec = _digitDecoders[s[-1]] if isinstance(dec, basestring): diff --git a/pywikibot/page.py b/pywikibot/page.py index ad87584..d9580b6 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -5978,6 +5978,5 @@ except UnicodeError as ex: if not firstException: firstException = ex - pass # Couldn't convert, raise the original exception raise firstException diff --git a/pywikibot/throttle.py b/pywikibot/throttle.py index 71c0da8..0f82b68 100644 --- a/pywikibot/throttle.py +++ b/pywikibot/throttle.py @@ -89,9 +89,7 @@ try: f = open(self.ctrlfilename, 'r') except IOError: - if not pid: - pass - else: + if pid: raise else: now = time.time() diff --git a/scripts/cfd.py b/scripts/cfd.py index b09db1f..7a56747 100755 --- a/scripts/cfd.py +++ b/scripts/cfd.py @@ -178,11 +178,7 @@ robot = CategoryMoveBot(oldcat=src, batch=True, comment=summary, deletion_comment=action_summary, inplace=True) - else: - # This line does not fit any of our regular expressions, - # so ignore it. - pass - if summary != "" and robot is not None: + if summary and robot is not None: pywikibot.stdout(summary) # Run, robot, run! robot.run() diff --git a/scripts/imageuncat.py b/scripts/imageuncat.py index 315f839..f285299 100755 --- a/scripts/imageuncat.py +++ b/scripts/imageuncat.py @@ -1294,7 +1294,7 @@ Add the uncat template to the page. @param page: Page to be modified - @rtype: Page + @type page: pywikibot.Page """ newtext = page.get() + puttext pywikibot.showDiff(page.get(), newtext) diff --git a/scripts/makecat.py b/scripts/makecat.py index c4c6f1b..0f647ad 100755 --- a/scripts/makecat.py +++ b/scripts/makecat.py @@ -79,7 +79,6 @@ pass except pywikibot.IsRedirectPage: cl = True - pass else: cats = [x for x in pl.categories()] if workingcat not in cats: diff --git a/scripts/redirect.py b/scripts/redirect.py index 4ce593a..4fd4448 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -291,7 +291,6 @@ pass except KeyError: result = None - pass yield (redirect, result, target, final) def retrieve_broken_redirects(self): @@ -513,10 +512,8 @@ pywikibot.warning( u'Redirect target %s is not a valid page title.' % str(e)[10:]) - pass except pywikibot.InvalidTitle: pywikibot.exception() - pass except pywikibot.NoPage: movedTarget = None try: @@ -611,8 +608,7 @@ u'Skipping: Redirect target %s is not a redirect.' % newRedir.title(asLink=True)) break # do nothing - else: - pass # target found + # else target found except pywikibot.SectionError: pywikibot.warning( u"Redirect target section %s doesn't exist." @@ -683,7 +679,6 @@ if targetPage.isStaticRedirect(): pywikibot.output( u" Redirect target is STATICREDIRECT.") - pass else: newRedir = targetPage continue diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index eb1b361..db7932c 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -462,15 +462,13 @@ try: # The file is stored in the disambiguation/ subdir. # Create if necessary. - f = codecs.open(filename, 'r', 'utf-8') - for line in f.readlines(): - # remove trailing newlines and carriage returns - while line[-1] in ['\n', '\r']: - line = line[:-1] - # skip empty lines - if line != '': - self.ignorelist.append(line) - f.close() + with codecs.open(filename, 'r', 'utf-8') as f: + for line in f: + # remove trailing newlines and carriage returns + line = line.rstrip('\r\n') + # skip empty lines + if line: + self.ignorelist.append(line) except IOError: pass diff --git a/scripts/upload.py b/scripts/upload.py index 9c27b78..db13900 100755 --- a/scripts/upload.py +++ b/scripts/upload.py @@ -129,8 +129,6 @@ suffix = 1 << 10 elif suffix == "mi": suffix = 1 << 20 - else: - pass # huh? else: suffix = 1 chunk_size = math.trunc(base * suffix) diff --git a/scripts/welcome.py b/scripts/welcome.py index eb1148f..d97f14b 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -748,10 +748,8 @@ if self.site.family.name != 'wikinews': welcome_text = (welcome_text % choice(self.defineSign())) - if self.site.family.name == 'wiktionary' and \ - self.site.code == 'it': - pass - else: + if self.site.family.name != 'wiktionary' or \ + self.site.code != 'it': welcome_text += timeselected elif (self.site.family.name != 'wikinews' and self.site.code != 'it'): diff --git a/tests/aspects.py b/tests/aspects.py index 9a60cfc..d132ad2 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -546,7 +546,6 @@ % (cls.__name__, hostname)) pywikibot.exception(e2, tb=True) e = e2 - pass if e: cls._checked_hostnames[hostname] = e diff --git a/tests/ui_tests.py b/tests/ui_tests.py index 228249e..3a98f9c 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for the user interface.""" # -# (C) Pywikibot team, 2008-2016 +# (C) Pywikibot team, 2008-2017 # # Distributed under the terms of the MIT license. # @@ -670,7 +670,6 @@ @classmethod def tearDownClass(cls): cls.tearDownProcess() - pass def testOutputUnicodeText_no_transliterate(self): self.sendstdin( -- To view, visit https://gerrit.wikimedia.org/r/395696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d0c862a9cdb11ce4bd12d9d68b397b19c62d602 Gerrit-PatchSet: 2 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: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

6 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2017