Pywikibot-commits March 2020

pywikibot-commits@lists.wikimedia.org

1 participants
124 discussions

[Gerrit] pywikibot/core[master]: Remove cgi_interface from docs and tox
by jenkins-bot (Code Review) 24 Mar '20

24 Mar '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/582940 ) Change subject: Remove cgi_interface from docs and tox ...................................................................... Remove cgi_interface from docs and tox Change-Id: Ie6e31bb1819b7e04d5c9f6f37e4400be05562ccd --- M docs/api_ref/pywikibot.userinterfaces.rst M tox.ini 2 files changed, 0 insertions(+), 6 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/api_ref/pywikibot.userinterfaces.rst b/docs/api_ref/pywikibot.userinterfaces.rst index 4fa1d2e..3dc96ac 100644 --- a/docs/api_ref/pywikibot.userinterfaces.rst +++ b/docs/api_ref/pywikibot.userinterfaces.rst @@ -6,11 +6,6 @@ Submodules ---------- -pywikibot.userinterfaces.cgi\_interface module ----------------------------------------------- - -.. automodule:: pywikibot.userinterfaces.cgi_interface - pywikibot.userinterfaces.gui module ----------------------------------- diff --git a/tox.ini b/tox.ini index 92ddbac..ff2e75e 100644 --- a/tox.ini +++ b/tox.ini @@ -149,7 +149,6 @@ pywikibot/throttle.py: N802 pywikibot/tools/_logging.py: N802 pywikibot/tools/ip.py : N803, N802 - pywikibot/userinterfaces/cgi_interface.py : N803 pywikibot/userinterfaces/gui.py : N812, N803, N806, N802 pywikibot/userinterfaces/terminal_interface.py : N814 pywikibot/userinterfaces/terminal_interface_base.py : N802, N803, N806, N816 -- To view, visit https://gerrit.wikimedia.org/r/582940 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: Ie6e31bb1819b7e04d5c9f6f37e4400be05562ccd Gerrit-Change-Number: 582940 Gerrit-PatchSet: 2 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Fix script_tests failing assert
by jenkins-bot (Code Review) 24 Mar '20

24 Mar '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/582936 ) Change subject: [bugfix] Fix script_tests failing assert ...................................................................... [bugfix] Fix script_tests failing assert Change-Id: I44ee792ece5cd2c4cc721cb0fe094df98906d8f7 --- M tests/script_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/script_tests.py b/tests/script_tests.py index cd85361..dac48de 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -297,7 +297,7 @@ if stdout is not None and out_result: self.assertIn(stdout, out_result) else: - self.assertIsNone(out_result) + self.assertIsEmpty(out_result) self.assertIn(result['exit_code'], exit_codes) sys.stdout.flush() -- To view, visit https://gerrit.wikimedia.org/r/582936 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: I44ee792ece5cd2c4cc721cb0fe094df98906d8f7 Gerrit-Change-Number: 582936 Gerrit-PatchSet: 2 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bufix] Skip TestScriptSimulate test with open dependencies
by jenkins-bot (Code Review) 24 Mar '20

24 Mar '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/582830 ) Change subject: [bufix] Skip TestScriptSimulate test with open dependencies ...................................................................... [bufix] Skip TestScriptSimulate test with open dependencies - Skip tests inside TestScriptMeta if script_name in failed_dep_script_set and arguments == '-simulate' - simplify tests Bug: T248297 Bug: T233438 Change-Id: Id044bb2424f62f37839dcec22a694ca452f62118 --- M tests/script_tests.py 1 file changed, 36 insertions(+), 43 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/script_tests.py b/tests/script_tests.py index e7cff05..cd85361 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -10,7 +10,7 @@ import os import sys -from pywikibot.tools import has_module, PY2, StringTypes +from pywikibot.tools import has_module, PY2 from tests import join_root_path, unittest_print from tests.aspects import (unittest, DefaultSiteTestCase, MetaTestCaseClass, @@ -224,40 +224,34 @@ def testScript(self): global_args = 'Global arguments available for all' - cmd = [script_name] - - if args: - cmd += args - + cmd = [script_name] + args data_in = script_input.get(script_name) + timeout = 5 if is_autorun else None - if is_autorun: - timeout = 5 - else: - timeout = None - + stdout, error = None, None if self._results and script_name in self._results: error = self._results[script_name] - if isinstance(error, StringTypes): - stdout = None - else: + if isinstance(error, tuple): stdout, error = error - else: - stdout = None - error = None test_overrides = {} if not hasattr(self, 'net') or not self.net: test_overrides['pywikibot.Site'] = 'None' + # run the script result = execute_pwb(cmd, data_in, timeout=timeout, error=error, overrides=test_overrides) - stderr = result['stderr'].splitlines() - stderr_sleep = [l for l in stderr - if l.startswith('Sleeping for ')] - stderr_other = [l for l in stderr - if not l.startswith('Sleeping for ')] + err_result = result['stderr'] + out_result = result['stdout'] + + stderr_sleep, stderr_other = [], [] + for line in err_result.splitlines(): + if line.startswith('Sleeping for '): + stderr_sleep.append(line) + else: + stderr_other.append(line) + if stderr_sleep: unittest_print('\n'.join(stderr_sleep)) @@ -266,52 +260,46 @@ if error: self.assertIn(error, result['stderr']) - exit_codes = [0, 1, 2, -9] + elif not is_autorun: - if stderr_other == []: - stderr_other = None - if stderr_other is not None: + if not stderr_other: + self.assertIn(global_args, out_result) + else: self.assertIn('Use -help for further information.', stderr_other) self.assertNotIn('-help', args) - else: - self.assertIn(global_args, result['stdout']) - exit_codes = [0] + else: # auto-run exit_codes = [0, -9] - - if (not result['stdout'] and not result['stderr']): + if not out_result and not err_result: unittest_print(' auto-run script unresponsive after ' '{} seconds'.format(timeout), end=' ') - elif 'SIMULATION: edit action blocked' in result['stderr']: + elif 'SIMULATION: edit action blocked' in err_result: unittest_print(' auto-run script simulated edit ' 'blocked', end=' ') else: unittest_print( ' auto-run script stderr within {} seconds: {!r}' - .format(timeout, result['stderr']), end=' ') + .format(timeout, err_result), end=' ') self.assertNotIn('Traceback (most recent call last)', - result['stderr']) - self.assertNotIn('deprecated', result['stderr'].lower()) + err_result) + self.assertNotIn('deprecated', err_result.lower()) # If stdout doesn't include global help.. - if global_args not in result['stdout']: + if global_args not in out_result: # Specifically look for deprecated - self.assertNotIn('deprecated', result['stdout'].lower()) - if result['stdout'] == '': - result['stdout'] = None + self.assertNotIn('deprecated', out_result.lower()) # But also complain if there is any stdout - if stdout is not None and result['stdout'] is not None: - self.assertIn(stdout, result['stdout']) + if stdout is not None and out_result: + self.assertIn(stdout, out_result) else: - self.assertIsNone(result['stdout']) + self.assertIsNone(out_result) self.assertIn(result['exit_code'], exit_codes) - sys.stdout.flush() if not enable_autorun_tests and is_autorun: @@ -342,6 +330,11 @@ dct[test_name] = unittest.skip( '{} is in _allowed_failures list' .format(script_name))(dct[test_name]) + elif script_name in failed_dep_script_set \ + and arguments == '-simulate': + dct[test_name] = unittest.skip( + '{} has dependencies; skipping' + .format(script_name))(dct[test_name]) # Disable test by default in nosetests if script_name in unrunnable_script_set: -- To view, visit https://gerrit.wikimedia.org/r/582830 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: Id044bb2424f62f37839dcec22a694ca452f62118 Gerrit-Change-Number: 582830 Gerrit-PatchSet: 3 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)

1 0

[Gerrit] pywikibot/i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 23 Mar '20

23 Mar '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/582812 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I08f8a9c573c4398b610bbc9358ce6e8cd77958b5 --- M category/ml.json M category_redirect/ml.json M checkimages/ml.json M pywikibot/ml.json A states_redirect/ml.json 5 files changed, 25 insertions(+), 6 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/ml.json b/category/ml.json index 299d5ec..91b8f45 100644 --- a/category/ml.json +++ b/category/ml.json @@ -1,7 +1,8 @@ { "@metadata": { "authors": [ - "Praveenp" + "Praveenp", + "Jinoytommanjaly" ] }, "category-adding": "യന്ത്രം: ചേർക്കുന്നു category [[:Category:%(newcat)s|%(newcat)s]]", @@ -12,6 +13,8 @@ "category-replacing": "യന്ത്രം: %(oldcat)s എന്ന വർഗ്ഗം %(newcat)s എന്നതുപയോഗിച്ച് മാറ്റിച്ചേർക്കുന്നു", "category-section-title": "പഴയ %(oldcat)s എന്നതിന്റെ നാൾ ചരിത്രം", "category-strip-cfd-templates": "യന്ത്രം: പ്രവൃത്തി പൂർത്തിയാക്കാൻ സി.എഫ്.ഡി. ഫലകങ്ങൾ നീക്കംചെയ്യുന്നു", + "category-strip-sort-keys": "യന്ത്രം: പൂർത്തിയാക്കിയ പ്രവർത്തനങ്ങളുടെ സോർട്ട് കീകൾ നീക്കംചെയ്യുന്നു", + "category-strip-both": "യന്ത്രം: പ്രവൃത്തി പൂർത്തിയാക്കാൻ സി.എഫ്.ഡി. ഫലകങ്ങൾ നീക്കംചെയ്യുന്നു", "category-version-history": "യന്ത്രം: പഴയ %(oldcat)s എന്നതിന്റെ നാൾപ്പതിപ്പ് ചരിത്രം സേവ് ചെയ്യുന്നു", "category-was-disbanded": "യന്ത്രം: വർഗ്ഗം ഒഴിവാക്കിയിരിക്കുന്നു", "category-was-moved": "യന്ത്രം: വർഗ്ഗം [[:Category:%(newcat)s|%(title)s]] എന്നാക്കി മാറ്റിയിരിക്കുന്നു" diff --git a/category_redirect/ml.json b/category_redirect/ml.json index 4c8a6d4..e5e349a 100644 --- a/category_redirect/ml.json +++ b/category_redirect/ml.json @@ -1,7 +1,8 @@ { "@metadata": { "authors": [ - "Praveenp" + "Praveenp", + "Jinoytommanjaly" ] }, "category_redirect-add-template": "യന്ത്രം: പരിപാലനത്തിനായി വർഗ്ഗ തിരിച്ചുവിടൽ ഫലകം കൂട്ടിച്ചേർക്കുന്നു", @@ -14,6 +15,9 @@ "category_redirect-log-add-failed": "* %(oldcat)s എന്നതിലേക്ക് [[%(ns)s%(template)s]] ചേർക്കൽ പരാജയപ്പെട്ടു", "category_redirect-log-double": "* ഇരട്ട-തിരിച്ചുവിടൽ ശരിയാക്കി: %(oldcat)s -> %(newcat)s -> %(targetcat)s", "category_redirect-log-failed": "** പരാജയപ്പെട്ടു: %(error)s", + "category_redirect-log-false-positive": "* അപ്രതീക്ഷിത തിരിച്ചുവിടൽ അല്ലാത്തവ: %(oldcat)s", "category_redirect-log-ignoring": "* %(oldcat)s അവഗണിക്കുന്നു", + "category_redirect-log-loop": "* %(oldcat)s ഇതിൽ നിന്ന് തിരിച്ചുവിട്ട ലൂപ്പ്", + "category_redirect-log-new": "അവസാന റിപ്പോർട്ടിന് ശേഷമുള്ള തിരിച്ചുവിടലുകൾ:", "category_redirect-older-logs": "'''[%(oldlogs)s പഴയ രേഖകൾ]'''" } diff --git a/checkimages/ml.json b/checkimages/ml.json index 6340073..df18ef9 100644 --- a/checkimages/ml.json +++ b/checkimages/ml.json @@ -1,7 +1,8 @@ { "@metadata": { "authors": [ - "Praveenp" + "Praveenp", + "Jinoytommanjaly" ] }, "checkimages-deletion-comment": "യന്ത്രം: %(adding)s ചേർക്കുന്നു", @@ -11,5 +12,6 @@ "checkimages-log-comment": "യന്ത്രം: രേഖ പുതുക്കുന്നു", "checkimages-no-license-head": "ഉപയോഗാനുമതി ഇല്ലാത്ത ചിത്രം", "checkimages-source-tag-comment": "യന്ത്രം: പുതിയതായി അപ്‌ലോഡ് ചെയ്ത ടാഗ് ചെയ്യാത്ത പ്രമാണം അടയാളപ്പെടുത്തുന്നു", - "checkimages-source-notice-comment": "യന്ത്രം: സ്രോതസ്സ് വിവരങ്ങൾ അഭ്യർത്ഥിക്കുന്നു." + "checkimages-source-notice-comment": "യന്ത്രം: സ്രോതസ്സ് വിവരങ്ങൾ അഭ്യർത്ഥിക്കുന്നു.", + "checkimages-unknown-extension-head": "അജ്ഞാത വിപുലീകരണം!" } diff --git a/pywikibot/ml.json b/pywikibot/ml.json index fc84583..7429c2e 100644 --- a/pywikibot/ml.json +++ b/pywikibot/ml.json @@ -1,7 +1,8 @@ { "@metadata": { "authors": [ - "Praveenp" + "Praveenp", + "Jinoytommanjaly" ] }, "pywikibot-enter-category-name": "ദയവായി വർഗ്ഗത്തിന്റെ പേര് നൽകുക:", @@ -13,5 +14,6 @@ "pywikibot-enter-xml-filename": "ദയവായി എക്സ്.എം.എൽ. ഡമ്പിന്റെ ഫയൽനേം നൽകുക:", "pywikibot-fixes-fckeditor": "യന്ത്രം: വിപുല-തിരുത്തൽ എച്ച്.റ്റി.എം.എൽ. ശരിയാക്കുന്നു", "pywikibot-fixes-html": "യന്ത്രം: എച്ച്.റ്റി.എം.എൽ. മാറ്റുന്നു/ശരിയാക്കുന്നു", - "pywikibot-fixes-syntax": "യന്ത്രം: വിക്കി എഴുത്തുരീതി ശരിയാക്കുന്നു" + "pywikibot-fixes-syntax": "യന്ത്രം: വിക്കി എഴുത്തുരീതി ശരിയാക്കുന്നു", + "pywikibot-touch": "പൈവിക്കിബോട്ട് ടച്ച് എഡിറ്റ്" } diff --git a/states_redirect/ml.json b/states_redirect/ml.json new file mode 100644 index 0000000..9e84c58 --- /dev/null +++ b/states_redirect/ml.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Praveenp" + ] + }, + "states_redirect-comment": "യന്ത്രം: തിരിച്ചുവിടലിനുവേണ്ടി സ്റ്റേറ്റ് ചുരുക്കെഴുത്ത് സൃഷ്ടിക്കുന്നു" +} -- To view, visit https://gerrit.wikimedia.org/r/582812 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: I08f8a9c573c4398b610bbc9358ce6e8cd77958b5 Gerrit-Change-Number: 582812 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)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Remove disfunctional cgi_interface.py
by jenkins-bot (Code Review) 23 Mar '20

23 Mar '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/483764 ) Change subject: [bugfix] Remove disfunctional cgi_interface.py ...................................................................... [bugfix] Remove disfunctional cgi_interface.py Bug: T248250 Bug: T248292 Bug: T193978 Change-Id: Ib838d5d7bff021849798be1a35a1ddd00fa8281b --- M pywikibot/CONTENT.rst M pywikibot/config2.py D pywikibot/userinterfaces/cgi_interface.py 3 files changed, 1 insertion(+), 28 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/CONTENT.rst b/pywikibot/CONTENT.rst index 7d56f9d..1069f55 100644 --- a/pywikibot/CONTENT.rst +++ b/pywikibot/CONTENT.rst @@ -147,8 +147,6 @@ +-----------------------------------------------------------------------------------+ | User Interface | +============================+======================================================+ - | cgi_interface.py | CGI user interface | - +----------------------------+------------------------------------------------------+ | gui.py | GUI with a unicode textfield where the user can edit | +----------------------------+------------------------------------------------------+ | terminal_interface.py | Platform independent terminal interface module | diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 08de9c4..b36531b 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -456,7 +456,7 @@ # https://docs.python.org/3/library/codecs.html#standard-encodings textfile_encoding = 'utf-8' -# tkinter isn't yet ready +# currently terminal is the only userinterface supported userinterface = 'terminal' # this can be used to pass variables to the UI init function diff --git a/pywikibot/userinterfaces/cgi_interface.py b/pywikibot/userinterfaces/cgi_interface.py deleted file mode 100644 index 44a5cbb..0000000 --- a/pywikibot/userinterfaces/cgi_interface.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -"""CGI user interface.""" -# -# (C) Pywikibot team, 2007-2018 -# -# Distributed under the terms of the MIT license. -# -from __future__ import absolute_import, division, unicode_literals - -import sys - - -class UI(object): - - """CGI user interface.""" - - def output(self, text, colors=None, newline=True, toStdout=False): - """Output text to CGI stream if toStdout is True.""" - if not toStdout: - return - sys.stdout.write(text.encode('UTF-8', 'replace')) - - def input(self, question, colors=None): - """Output question to CGI stream.""" - self.output(question + ' ', newline=False, toStdout=True) -- To view, visit https://gerrit.wikimedia.org/r/483764 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: Ib838d5d7bff021849798be1a35a1ddd00fa8281b Gerrit-Change-Number: 483764 Gerrit-PatchSet: 11 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Fix logout on MW < 1.24
by jenkins-bot (Code Review) 23 Mar '20

23 Mar '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/582610 ) Change subject: [bugfix] Fix logout on MW < 1.24 ...................................................................... [bugfix] Fix logout on MW < 1.24 - avoid Error as csrf token was introduced in MW 1.24 - don't test Fandom wikis as they don't support API action=logout Bug: T214009 Change-Id: Ic2569e4ca02bce6fefee7b7b19a90769bdca7990 --- M pywikibot/site/__init__.py M tests/site_tests.py 2 files changed, 9 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index f9a4f64..59ae4ab 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -2120,8 +2120,13 @@ """ if self.is_oauth_token_available(): pywikibot.warning('Using OAuth suppresses logout function') - uirequest = self._simple_request(action='logout', - token=self.tokens['csrf']) + req_params = {'action': 'logout'} + # csrf token introduced in MW 1.24 + try: + req_params['token'] = self.tokens['csrf'] + except Error: + pass + uirequest = self._simple_request(**req_params) uirequest.submit() self._loginstatus = LoginStatus.NOT_LOGGED_IN diff --git a/tests/site_tests.py b/tests/site_tests.py index 7a6de8d..e772cdc 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -3854,7 +3854,8 @@ loginstatus.AS_USER)) self.assertIn('_userinfo', site.__dict__.keys()) - else: + # Fandom family wikis don't support API action=logout + elif 'fandom.com' not in site.hostname(): site.logout() self.assertFalse(site.logged_in()) self.assertEqual(site._loginstatus, loginstatus.NOT_LOGGED_IN) -- To view, visit https://gerrit.wikimedia.org/r/582610 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: Ic2569e4ca02bce6fefee7b7b19a90769bdca7990 Gerrit-Change-Number: 582610 Gerrit-PatchSet: 7 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [deps] Update scripts dependencies
by jenkins-bot (Code Review) 23 Mar '20

23 Mar '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/582582 ) Change subject: [deps] Update scripts dependencies ...................................................................... [deps] Update scripts dependencies - match_images.py only depends on Pillow which is defined in extra_deps['Tkinter'] but not on flickrrapi - add dependency for flickrripper.py from extra_deps['Tkinter'] to remove code duplication - Remove import error warning in weblinkchecker.py to prevent script_tests failing. The warning is already printed by the pwb.py wrapper and by the suggest_help method later Change-Id: I18f9c69c7c2e8457f350183a24363a931da15d3f --- M scripts/weblinkchecker.py M setup.py 2 files changed, 6 insertions(+), 14 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index db0556a..93d3285 100755 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -121,7 +121,6 @@ import time from functools import partial -from warnings import warn try: import memento_client @@ -958,10 +957,6 @@ xmlFilename = None HTTPignore = [] - if isinstance(memento_client, ImportError): - warn('memento_client not imported: {0}'.format(memento_client), - ImportWarning) - # Process global args and prepare generator args parser local_args = pywikibot.handle_args(args) genFactory = pagegenerators.GeneratorFactory() diff --git a/setup.py b/setup.py index df7560f..af8b022 100644 --- a/setup.py +++ b/setup.py @@ -81,21 +81,18 @@ # ------- setup extra_requires for scripts ------- # script_deps = { + 'data_ingestion.py': extra_deps['csv'], 'flickrripper.py': [ 'flickrapi<3.0.0;python_version<"3.5"', 'flickrapi>=2.2;python_version>="3.5"', - 'Pillow<7.0.0;python_version<"3"', - 'Pillow<6.0.0;python_version=="3.4"', - 'Pillow;python_version>="3.5"', - ], - 'patrol.py': ['mwparserfromhell>=0.3.3'], + ] + extra_deps['Tkinter'], + 'imageharvest.py': extra_deps['html'], + 'isbn.py': extra_deps['isbn'], + 'match_images.py': extra_deps['Tkinter'], + 'patrol.py': extra_deps['mwparserfromhell'], 'states_redirect.py': ['pycountry'], 'weblinkchecker.py': ['memento_client!=0.6.0,>=0.5.1'], } -script_deps['data_ingestion.py'] = extra_deps['csv'] -script_deps['imageharvest.py'] = extra_deps['html'] -script_deps['isbn.py'] = extra_deps['isbn'] -script_deps['match_images.py'] = script_deps['flickrripper.py'] extra_deps.update(script_deps) extra_deps.update({'scripts': [i for k, v in script_deps.items() for i in v]}) -- To view, visit https://gerrit.wikimedia.org/r/582582 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: I18f9c69c7c2e8457f350183a24363a931da15d3f Gerrit-Change-Number: 582582 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: component: pywikibot-core
by jenkins-bot (Code Review) 22 Mar '20

22 Mar '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/582588 ) Change subject: component: pywikibot-core ...................................................................... component: pywikibot-core Fixed TypeError in getFileVersionHistoryTable method Bug: T248266 Change-Id: I6f705373e1b69341410dee2a0eb23353b2e6d068 --- M pywikibot/page/__init__.py 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 2f27c25..ecbeaa1 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -2665,11 +2665,12 @@ def getFileVersionHistoryTable(self): """Return the version history in the form of a wiki table.""" lines = [] - for info in self.get_file_history(): - dimension = '{width}×{height} px ({size} bytes)'.format(**info) + for info in self.get_file_history().values(): + dimension = '{width}×{height} px ({size} bytes)'.format( + **info.__dict__) lines.append('| {timestamp} || {user} || {dimension} |' '| <nowiki>{comment}</nowiki>' - ''.format(dimension=dimension, **info)) + ''.format(dimension=dimension, **info.__dict__)) return ('{| class="wikitable"\n' '! {{int:filehist-datetime}} || {{int:filehist-user}} |' '| {{int:filehist-dimensions}} || {{int:filehist-comment}}\n' -- To view, visit https://gerrit.wikimedia.org/r/582588 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: I6f705373e1b69341410dee2a0eb23353b2e6d068 Gerrit-Change-Number: 582588 Gerrit-PatchSet: 2 Gerrit-Owner: RLuts <lutsromans(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [deps] Remove pycparser dependency
by jenkins-bot (Code Review) 22 Mar '20

22 Mar '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/582572 ) Change subject: [deps] Remove pycparser dependency ...................................................................... [deps] Remove pycparser dependency 'pycparser!=2.14' was introduced as security dependency for cryptography needed by requests[security] for older Python versions due to a bug with release 2.14. It is not necessary for Python newer than 2.7.8 and can be removed because 2.20 was published. Change-Id: I5f588e6091b7642fde0b2dbb4df30527df6a2af2 --- M setup.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index dd4c784..df7560f 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,6 @@ 'security': [ 'requests[security]' ';python_full_version=="2.7.7" or python_full_version=="2.7.8"', - 'pycparser!=2.14', ], 'mwoauth': ['mwoauth!=0.3.1,>=0.2.4'], 'html': ['BeautifulSoup4'], -- To view, visit https://gerrit.wikimedia.org/r/582572 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: I5f588e6091b7642fde0b2dbb4df30527df6a2af2 Gerrit-Change-Number: 582572 Gerrit-PatchSet: 1 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)

1 0

[Gerrit] pywikibot/core[master]: [IMPR] Use string formatting specifier only once
by jenkins-bot (Code Review) 22 Mar '20

22 Mar '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/579866 ) Change subject: [IMPR] Use string formatting specifier only once ...................................................................... [IMPR] Use string formatting specifier only once instead of '%s %s %s' % (ident, ident, ident) use '{ident} {ident} {ident}'.format(ident=ident) Change-Id: If7a09d12ea771b6845048527aba4c113ba132a8d --- M pywikibot/date.py 1 file changed, 11 insertions(+), 11 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/date.py b/pywikibot/date.py index 345032e..578c213 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-2019 +# (C) Pywikibot team, 2004-2020 # # Distributed under the terms of the MIT license. # @@ -2037,19 +2037,19 @@ for i in (0, 1, 2, 4, 5, 6, 8, 10, 11): formats[dayMnthFmts[i]]['wa'] = eval( 'lambda m: multi(m, [' - '(lambda v: dh_dayOfMnth(v, "%%dî d\' %s"), lambda p: p == 1), ' - '(lambda v: dh_dayOfMnth(v, "%%d d\' %s"), ' + '(lambda v: dh_dayOfMnth(v, "%dî d\' {mname}"), lambda p: p == 1), ' + '(lambda v: dh_dayOfMnth(v, "%d d\' {mname}"), ' 'lambda p: p in [2,3,20,22,23]), ' - '(lambda v: dh_dayOfMnth(v, "%%d di %s"), alwaysTrue)])' - % (waMonthNames[i], waMonthNames[i], waMonthNames[i])) + '(lambda v: dh_dayOfMnth(v, "%d di {mname}"), alwaysTrue)])' + .format(mname=waMonthNames[i])) # For month names beginning with a vowel... for i in (3, 7, 9): formats[dayMnthFmts[i]]['wa'] = eval( 'lambda m: multi(m, [' - '(lambda v: dh_dayOfMnth(v, "%%dî d\' %s"), lambda p: p == 1), ' - '(lambda v: dh_dayOfMnth(v, "%%d d\' %s"), alwaysTrue)])' - % (waMonthNames[i], waMonthNames[i])) + '(lambda v: dh_dayOfMnth(v, "%dî d\' {mname}"), lambda p: p == 1), ' + '(lambda v: dh_dayOfMnth(v, "%d d\' {mname}"), alwaysTrue)])' + .format(mname=waMonthNames[i])) # Brazil uses '1añ' for the 1st of every month, and number without suffix for # all other days @@ -2057,9 +2057,9 @@ for i in range(0, 12): formats[dayMnthFmts[i]]['br'] = eval( 'lambda m: multi(m, [' - '(lambda v: dh_dayOfMnth(v, "%%dañ %s"), lambda p: p == 1), ' - '(lambda v: dh_dayOfMnth(v, "%%d %s"), alwaysTrue)])' - % (brMonthNames[i], brMonthNames[i])) + '(lambda v: dh_dayOfMnth(v, "%dañ {mname}"), lambda p: p == 1), ' + '(lambda v: dh_dayOfMnth(v, "%d {mname}"), alwaysTrue)])' + .format(mname=brMonthNames[i])) # # Month of the Year: "en:May 1976" -- To view, visit https://gerrit.wikimedia.org/r/579866 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: If7a09d12ea771b6845048527aba4c113ba132a8d Gerrit-Change-Number: 579866 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
13
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits March 2020