Pywikibot-commits March 2020

pywikibot-commits@lists.wikimedia.org

1 participants
124 discussions

[Gerrit] pywikibot/core[master]: Enable pywikibot run even there is a package version conflict
by jenkins-bot (Code Review) 25 Mar '20

25 Mar '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/583293 ) Change subject: Enable pywikibot run even there is a package version conflict ...................................................................... Enable pywikibot run even there is a package version conflict Bug: T248376 Bug: T248377 Change-Id: Id5e35c657022cca227ef0d85e42b5cfb07419825 --- M pwb.py 1 file changed, 34 insertions(+), 12 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 3d1c8a5..66ec4b3 100755 --- a/pwb.py +++ b/pwb.py @@ -139,6 +139,24 @@ return fname, list(args[index + int(bool(fname)):]), args[:index] +def _print_requirements(requirements, script, variant): + """Print pip command to install requirements.""" + if not requirements: + return + + if len(requirements) > 1: + format_string = '\nPackages necessary for {} are {}.' + else: + format_string = '\nA package necessary for {} is {}.' + print(format_string.format(script or 'pywikibot', variant)) + print('Please update required module{} with:\n\n' + .format('s' if len(requirements) > 1 else '')) + + for requirement in requirements: + print(' pip install "{}"\n' + .format(str(requirement).partition(';')[0])) + + def check_modules(script=None): """Check whether mandatory modules are present.""" import pkg_resources @@ -153,29 +171,33 @@ from setup import dependencies missing_requirements = [] - + version_conflicts = [] for requirement in pkg_resources.parse_requirements(dependencies): if requirement.marker is None \ or pkg_resources.evaluate_marker(str(requirement.marker)): try: pkg_resources.resource_exists(requirement, requirement.name) - except (pkg_resources.DistributionNotFound, - pkg_resources.VersionConflict) as e: - print(e) + except pkg_resources.DistributionNotFound as e: missing_requirements.append(requirement) + print(e) + except pkg_resources.VersionConflict as e: + version_conflicts.append(requirement) + print(e) del pkg_resources del dependencies - if not missing_requirements: - return True + _print_requirements(missing_requirements, script, 'missing') + _print_requirements(version_conflicts, script, 'outdated') - print('\nPlease install/update required module{} with:\n\n' - .format('s' if len(missing_requirements) > 1 else '')) - for requirement in missing_requirements: - print(' pip install "{}"\n' - .format(str(requirement).partition(';')[0])) - return False + if version_conflicts and not missing_requirements: + print('\nYou may continue on your own risk; type CTRL-C to stop.') + try: + sleep(5) + except KeyboardInterrupt: + return False + + return not missing_requirements # Establish a normalised path for the directory containing pwb.py. -- To view, visit https://gerrit.wikimedia.org/r/583293 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: Id5e35c657022cca227ef0d85e42b5cfb07419825 Gerrit-Change-Number: 583293 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Revi <wiki(a)revi.dev> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [L10N] Localize deprecated templates for ur-wiki
by jenkins-bot (Code Review) 25 Mar '20

25 Mar '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/481605 ) Change subject: [L10N] Localize deprecated templates for ur-wiki ...................................................................... [L10N] Localize deprecated templates for ur-wiki Bug: T212704 Change-Id: Id88eaa9d7ee5d5ec3059dcacf25af8e1f373560b --- M pywikibot/cosmetic_changes.py 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index 85ff485..8c01fa0 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -158,6 +158,12 @@ ('Quellen', 'Belege fehlen\\g<parameters>'), ('Quellen fehlen', 'Belege fehlen\\g<parameters>'), ], + 'ur': [ + ('Infobox former country', + 'خانہ معلومات سابقہ ملک\\g<parameters>'), + ('Infobox Former Country', + 'خانہ معلومات سابقہ ملک\\g<parameters>'), + ], } } -- To view, visit https://gerrit.wikimedia.org/r/481605 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: Id88eaa9d7ee5d5ec3059dcacf25af8e1f373560b Gerrit-Change-Number: 481605 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [tests] `setup.py test` is being deprecated
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/569362 ) Change subject: [tests] `setup.py test` is being deprecated ...................................................................... [tests] `setup.py test` is being deprecated This fixes discovery issues in commit 4e6ea497d47cafc7f1863103b04e028c1387cd88 and reverts it. + fix typo in tests/README.rst Bug: T243224 Change-Id: I3647a77c46ab9e890c5702e2504cb2831356d754 --- M .appveyor.yml M .travis.yml M tests/README.rst M tox.ini 4 files changed, 7 insertions(+), 11 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index a60f3aa..34d4536 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -111,7 +111,7 @@ - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT_USER_CONFIG, 'usernames[''wikidata''][''test''] = ''$env:PYWIKIBOT_USERNAME'';')" - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT_USER_CONFIG, 'usernames[''commons''][''commons''] = ''$env:PYWIKIBOT_USERNAME'';')" - - "%CMD_IN_ENV% coverage run setup.py test" + - "%CMD_IN_ENV% coverage run -m unittest discover -vv -p \"*_tests.py\"" on_finish: - codecov diff --git a/.travis.yml b/.travis.yml index 9caf0ec..4605961 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,7 +108,7 @@ python setup.py pytest --addopts="-vvv -s --timeout=$TEST_TIMEOUT --cov=. -rsxX" ; fi else - coverage run setup.py test ; + coverage run -m unittest discover -vv -p "*_tests.py" ; fi after_success: diff --git a/tests/README.rst b/tests/README.rst index 56984ec..ec821b9 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -28,10 +28,6 @@ :: - python setup.py test - -:: - python setup.py nosetests --tests tests :: @@ -44,7 +40,7 @@ :: - python -m unittest -v + python -m unittest discover -v -p "*_tests.py" nose ~~~~ @@ -88,7 +84,7 @@ :: nosetests -v tests.api_tests tests.site_tests - python -m unittest -v tests.api_tests:TestParamInfo.test_init + python -m nose -v tests.api_tests:TestParamInfo.test_init pytest ~~~~~~ @@ -113,7 +109,7 @@ :: - PYWIKIBOT_TEST_MODULES=api,site python setup.py test + PYWIKIBOT_TEST_MODULES=api,site python -m unittest -v Travis CI @@ -199,7 +195,7 @@ 5. push changes into the forked git repository 6. watch the build at https://circleci.com/gh/<username>/pywikibot -PYWIKIBOT_NO_USER_CONFIG=2 is needed because 'python setup.py test' is run. +PYWIKIBOT_NO_USER_CONFIG=2 is needed because 'python -m unittest' is run. TOXENV=py27,py34 is a workaround because CircleCI runs 'tox', but there is a bug in the CircleCI default 'py26' implementation. diff --git a/tox.ini b/tox.ini index ff2e75e..b0c26f8 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,7 @@ usedevelop = True commands = flake8: flake8 --doctests {posargs} - test: python setup.py test + test: python -m unittest discover -vv -p "*_tests.py" fasttest: python -W error::UserWarning -m generate_user_files -family:wikipedia -lang:test -v fasttest: nosetests --version -- To view, visit https://gerrit.wikimedia.org/r/569362 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: I3647a77c46ab9e890c5702e2504cb2831356d754 Gerrit-Change-Number: 569362 Gerrit-PatchSet: 4 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] Desupport functions dealing with stars list
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/583107 ) Change subject: [cleanup] Desupport functions dealing with stars list ...................................................................... [cleanup] Desupport functions dealing with stars list stars lists functionality was replaced by wikidata and related templates where deleted around 2015 Change-Id: I8da14f8d1646eb7322daccb612cb7d573224089e --- M pywikibot/textlib.py 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 8a7a10c..5cb8f63 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -1915,9 +1915,9 @@ return '{{%s\n%s}}' % (template, text) -# --------------------------------- -# functions dealing with stars list -# --------------------------------- +# ---------------------------------------------- +# functions dealing with stars list (deprecated) +# ---------------------------------------------- starsList = [ 'bueno', @@ -1950,6 +1950,7 @@ ] +@deprecated(future_warning=True, since='20200324') def get_stars(text): """ Extract stars templates from wikitext. @@ -1970,6 +1971,7 @@ return allstars +@deprecated(future_warning=True, since='20200324') def remove_stars(text, stars_list): """ Remove stars templates from text. @@ -1985,6 +1987,7 @@ return text +@deprecated(future_warning=True, since='20200324') def append_stars(text, stars_list, site=None): """ Remove stars templates from text. @@ -2009,6 +2012,7 @@ return text +@deprecated(future_warning=True, since='20200324') def standardize_stars(text): """Make sure that star templates are in the right order.""" allstars = get_stars(text) -- To view, visit https://gerrit.wikimedia.org/r/583107 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: I8da14f8d1646eb7322daccb612cb7d573224089e Gerrit-Change-Number: 583107 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [doc] Fix several doc warnings caused by @deprecated_args
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/583058 ) Change subject: [doc] Fix several doc warnings caused by @deprecated_args ...................................................................... [doc] Fix several doc warnings caused by @deprecated_args @deprecated_args adds deprecated parameters to method's internal OrderedDict for parameters. The order is the order of addition, which adds POSITIONAL-OR-KEYWORD kind parameters after *args, KEYWORD-ONLY kind parameters and **kwargs. Sort OrderedDict according to parameters' kind there should fix the issue. See also: https://docs.python.org/3/library/inspect.html#inspect.Parameter.kind Bug: T244674 Change-Id: I40528a8e67c6a64730b35ad050bfbe4f521c270d --- M pywikibot/tools/__init__.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index a4d2219..6c6b364 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -1806,6 +1806,8 @@ default='[deprecated name of ' + new_arg + ']' if new_arg not in [True, False, None] else NotImplemented) + params = collections.OrderedDict(sorted(params.items(), + key=lambda x: x[1].kind)) wrapper.__signature__ = inspect.Signature() wrapper.__signature__._parameters = params -- To view, visit https://gerrit.wikimedia.org/r/583058 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: I40528a8e67c6a64730b35ad050bfbe4f521c270d Gerrit-Change-Number: 583058 Gerrit-PatchSet: 5 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [cleanup] Remove old compat line_separator config variable
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/583057 ) Change subject: [cleanup] Remove old compat line_separator config variable ...................................................................... [cleanup] Remove old compat line_separator config variable line_separator was introduced due to different behaviour when page content was retrieved by api and screen scraping. Therefore the LS at core is '\n' whereas at compat it was '\r\n'. That config variable was mainly for having scripts in sync for the both framework variants compat and core; the scripts where mainly the same but the LS was different in config files. Replace all occurences with '\n' Change-Id: Ia7fe8d56c52a8430385dc4dc9014b5fad758c27e --- M pywikibot/config2.py M pywikibot/cosmetic_changes.py M pywikibot/family.py M pywikibot/textlib.py M scripts/add_text.py M tests/textlib_tests.py 6 files changed, 32 insertions(+), 57 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 9b5b4d4..da754de 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -112,8 +112,9 @@ _private_values = {'authenticate', 'db_password'} _deprecated_variables = {'available_ssl_project', 'fake_user_agent', - 'panoramio', 'proxy', 'special_page_limit', - 'sysopnames', 'use_SSL_onlogin', 'use_SSL_always'} + 'line_separator', 'LS', 'panoramio', 'proxy', + 'special_page_limit', 'sysopnames', 'use_SSL_onlogin', + 'use_SSL_always'} # ############# ACCOUNT SETTINGS ############## @@ -875,12 +876,6 @@ # processing. As higher this value this effect will decrease. max_queue_size = 64 -# Define the line separator. Pages retrieved via API have "\n" whereas -# pages fetched from screen (mostly) have "\r\n". Interwiki and category -# separator settings in family files should use multiplied of this. -# LS is a shortcut alias. -line_separator = LS = '\n' - # Settings to enable mwparserfromhell # <https://mwparserfromhell.readthedocs.org/en/latest/> # Currently used in textlib.extract_templates_and_params diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index 051b06f..c40fc49 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -68,8 +68,8 @@ import pywikibot -from pywikibot import config, textlib from pywikibot.page import url2unicode +from pywikibot import textlib from pywikibot.textlib import (_MultiTemplateMatchBuilder, FILE_LINK_REGEX, _get_regexes) from pywikibot.tools import deprecated_args, first_lower, first_upper @@ -711,7 +711,7 @@ return textlib.replaceExcept( text, r'(?m)^(={1,6})[ \t]*(?P<title>.*[^\s=])[ \t]*\1[ \t]*\r?\n', - r'\1 \g<title> \1%s' % config.LS, + r'\1 \g<title> \1\n', ['comment', 'math', 'nowiki', 'pre']) def putSpacesInLists(self, text): diff --git a/pywikibot/family.py b/pywikibot/family.py index c413503..43e5e65 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -817,7 +817,7 @@ # one-after-another on a single line interwiki_on_one_line = [] # String used as separator between interwiki links and the text - interwiki_text_separator = config.line_separator * 2 + interwiki_text_separator = '\n\n' # Similar for category category_attop = [] @@ -825,7 +825,7 @@ # one-after-another on a single line category_on_one_line = [] # String used as separator between category links and the text - category_text_separator = config.line_separator * 2 + category_text_separator = '\n\n' # When both at the bottom should categories come after interwikilinks? # TODO: T86284 Needed on Wikia sites, as it uses the CategorySelect # extension which puts categories last on all sites. TO BE DEPRECATED! diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 4723749..8a7a10c 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -7,7 +7,7 @@ """ # -# (C) Pywikibot team, 2008-2019 +# (C) Pywikibot team, 2008-2020 # # Distributed under the terms of the MIT license. # @@ -1230,9 +1230,8 @@ if insite.code in insite.family.interwiki_on_one_line: sep = ' ' else: - sep = config.line_separator - s = sep.join(s) + config.line_separator - return s + sep = '\n' + return sep.join(s) + '\n' def interwikiSort(sites, insite=None): @@ -1334,7 +1333,7 @@ site=site) if marker: # avoid having multiple linefeeds at the end of the text - text = re.sub(r'\s*%s' % re.escape(marker), config.LS + marker, + text = re.sub(r'\s*%s' % re.escape(marker), '\n' + marker, text.strip()) return text.strip() @@ -1449,7 +1448,7 @@ site = pywikibot.Site() if re.search(r'\{\{ *(' + r'|'.join(site.getmagicwords('defaultsort')) + r')', oldtext, flags=re.I): - separator = config.line_separator + separator = '\n' else: separator = site.family.category_text_separator iseparator = site.family.interwiki_text_separator @@ -1560,10 +1559,10 @@ if insite.category_on_one_line(): sep = ' ' else: - sep = config.line_separator + sep = '\n' # Some people don't like the categories sorted # catLinks.sort() - return sep.join(catLinks) + config.line_separator + return sep.join(catLinks) + '\n' # ------------------------------------- @@ -1996,18 +1995,17 @@ @type stars_list: list @param site: a site where the given text is used. interwiki_text_separator is used when a site object is given. - Otherwise line_separator is used twice to separate stars list. + Otherwise two line separators are used to separate stars list. @type site: BaseSite @return: modified text @rtype: str """ - LS = (config.line_separator * 2 - if not site else site.family.interwiki_text_separator) + LS = '\n\n' if not site else site.family.interwiki_text_separator text = text.strip() + LS stars = stars_list[:] stars.sort() for element in stars: - text += element.strip() + config.line_separator + text += element.strip() + '\n' return text diff --git a/scripts/add_text.py b/scripts/add_text.py index 04f893f..43e80c3 100755 --- a/scripts/add_text.py +++ b/scripts/add_text.py @@ -56,7 +56,7 @@ # # (C) Filnik, 2007-2010 -# (C) Pywikibot team, 2007-2019 +# (C) Pywikibot team, 2007-2020 # # Distributed under the terms of the MIT license. # @@ -223,8 +223,8 @@ if not up: newtext = text # Translating the \\n into binary \n - addText = addText.replace('\\n', config.line_separator) - if (reorderEnabled): + addText = addText.replace('\\n', '\n') + if reorderEnabled: # Getting the categories categoriesInside = textlib.getCategoryLinks(newtext, site) # Deleting the categories @@ -235,7 +235,7 @@ newtext = textlib.removeLanguageLinks(newtext, site) # Adding the text - newtext += '{}{}'.format(config.line_separator, addText) + newtext += '\n' + addText # Reputting the categories newtext = textlib.replaceCategoryLinks(newtext, categoriesInside, site, @@ -244,9 +244,9 @@ newtext = textlib.replaceLanguageLinks(newtext, interwikiInside, site) else: - newtext += '{}{}'.format(config.line_separator, addText) + newtext += '\n' + addText else: - newtext = addText + config.line_separator + text + newtext = addText + '\n' + text if putText and text != newtext: pywikibot.output(color_format( diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 6ae076d..1cf7791 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Test textlib module.""" # -# (C) Pywikibot team, 2011-2019 +# (C) Pywikibot team, 2011-2020 # # Distributed under the terms of the MIT license. # @@ -44,8 +44,7 @@ def setUp(self): """Setup tests.""" - self.catresult1 = ('[[Category:Cat1]]%(LS)s[[Category:Cat2]]%(LS)s' - % {'LS': config.LS}) + self.catresult1 = '[[Category:Cat1]]\n[[Category:Cat2]]\n' super(TestSectionFunctions, self).setUp() def contains(self, fn, sn): @@ -126,8 +125,7 @@ 'de': pywikibot.Page(pywikibot.Link('de:German', self.site)), 'fr': pywikibot.Page(pywikibot.Link('fr:French', self.site)) } - self.assertEqual('[[de:German]]%(LS)s[[fr:French]]%(LS)s' - % {'LS': config.LS}, + self.assertEqual('[[de:German]]\n[[fr:French]]\n', textlib.interwikiFormat(interwikis, self.site)) def test_interwiki_format_Link(self): @@ -136,8 +134,7 @@ 'de': pywikibot.Link('de:German', self.site), 'fr': pywikibot.Link('fr:French', self.site), } - self.assertEqual('[[de:German]]%(LS)s[[fr:French]]%(LS)s' - % {'LS': config.LS}, + self.assertEqual('[[de:German]]\n[[fr:French]]\n', textlib.interwikiFormat(interwikis, self.site)) @@ -145,8 +142,7 @@ """Test category formatting.""" - catresult = ('[[Category:Cat1]]%(LS)s[[Category:Cat2]]%(LS)s' - % {'LS': config.LS}) + catresult = '[[Category:Cat1]]\n[[Category:Cat2]]\n' def test_category_format_raw(self): """Test formatting categories as strings formatted as links.""" @@ -184,9 +180,8 @@ with both a newline and an empty string as separators. """ - old = ('[[Category:Cat1]]%(LS)s[[Category:Cat2|]]%(LS)s' - '[[Category:Cat1| ]]%(LS)s[[Category:Cat2|key]]' - % {'LS': config.LS}) + old = ('[[Category:Cat1]]\n[[Category:Cat2|]]\n' + '[[Category:Cat1| ]]\n[[Category:Cat2|key]]') def test_standard_links(self): """Test getting and replacing categories.""" @@ -194,29 +189,16 @@ new = textlib.replaceCategoryLinks(self.old, cats, site=self.site) self.assertEqual(self.old, new) - def test_adjoining_links(self): - """Test getting and replacing adjacent categories.""" - cats_std = textlib.getCategoryLinks(self.old, site=self.site) - old = self.old.replace(config.LS, '') - cats = textlib.getCategoryLinks(old, site=self.site) - self.assertEqual(cats_std, cats) - sep = config.LS - config.line_separator = '' # use an empty separator temporarily - new = textlib.replaceCategoryLinks(old, cats, site=self.site) - # Restore the default separator. - config.line_separator = sep - self.assertEqual(old, new) - def test_indentation(self): """Test indentation from previous block.""" # Block of text - old = 'Some text%(LS)s%(LS)s' % {'LS': config.LS} + self.old + old = 'Some text\n\n' + self.old cats = textlib.getCategoryLinks(old, site=self.site) new = textlib.replaceCategoryLinks(old, cats, site=self.site) self.assertEqual(old, new) # DEFAULTSORT - old_ds = '{{DEFAULTSORT:key}}%(LS)s' % {'LS': config.LS} + self.old + old_ds = '{{DEFAULTSORT:key}}\n' + self.old cats_ds = textlib.getCategoryLinks(old_ds, site=self.site) new_ds = textlib.replaceCategoryLinks(old_ds, cats_ds, site=self.site) self.assertEqual(old_ds, new_ds) -- To view, visit https://gerrit.wikimedia.org/r/583057 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: Ia7fe8d56c52a8430385dc4dc9014b5fad758c27e Gerrit-Change-Number: 583057 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]: [doc] Explain config parser for clean_sandbox.py
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/583040 ) Change subject: [doc] Explain config parser for clean_sandbox.py ...................................................................... [doc] Explain config parser for clean_sandbox.py Change-Id: Ice338e8a6e2eeb6cbe4c8c06b3c2667c24dc9c91 --- M scripts/clean_sandbox.py 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py index 8d16d9d..b775d90 100755 --- a/scripts/clean_sandbox.py +++ b/scripts/clean_sandbox.py @@ -21,8 +21,21 @@ -text The text that substitutes in the sandbox, you can use this when you haven't configured clean_candbox for your wiki. - -summary Summary of the edit made by bot. + -summary Summary of the edit made by bot. Overrides the default + from i18n. +All local parameters can be given inside a scripts.ini file. Options +passed to the script are priorized over options read from ini file. See: +https://docs.python.org/3/library/configparser.html#supported-ini-file-structure + +For example: + + [clean_sandbox] + # the parameter section for clean_sandbox script + summary = Bot: Cleaning sandbox + text = {{subst:Clean Sandbox}} + hours: 0.5 + delay: 7 """ # # (C) Leonardo Gregianin, 2006 -- To view, visit https://gerrit.wikimedia.org/r/583040 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: Ice338e8a6e2eeb6cbe4c8c06b3c2667c24dc9c91 Gerrit-Change-Number: 583040 Gerrit-PatchSet: 2 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]: [cleanup] remove rewrite_path duplication
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/583036 ) Change subject: [cleanup] remove rewrite_path duplication ...................................................................... [cleanup] remove rewrite_path duplication Change-Id: I110eec8fbbe4069732a6b2ddfc4607c45aec477d --- M pwb.py 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 228c307..d820522 100755 --- a/pwb.py +++ b/pwb.py @@ -182,10 +182,9 @@ # Either it is '.' if the user's current working directory is the same, # or it is the absolute path for the directory of pwb.py absolute_path = abspath(os.path.dirname(sys.argv[0])) -rewrite_path = absolute_path -if rewrite_path not in sys.path[:2]: - sys.path.insert(1, rewrite_path) +if absolute_path not in sys.path[:2]: + sys.path.insert(1, absolute_path) if not check_modules(): sys.exit() -- To view, visit https://gerrit.wikimedia.org/r/583036 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: I110eec8fbbe4069732a6b2ddfc4607c45aec477d Gerrit-Change-Number: 583036 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] user_script_path must be a list
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/582965 ) Change subject: [bugfix] user_script_path must be a list ...................................................................... [bugfix] user_script_path must be a list A tuple cannot be concatenated with a list; otherwise TypeError: can only concatenate tuple (not "list") to tuple occures. Change-Id: I6b9122cd30532bfa34a5d7d82a9aba9616b5bf60 --- M pwb.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 228c307..c8dc83e 100755 --- a/pwb.py +++ b/pwb.py @@ -288,10 +288,10 @@ 'scripts.userscripts'] if config.user_script_paths: - if isinstance(config.user_script_paths, (tuple, list)): + if isinstance(config.user_script_paths, list): script_paths = config.user_script_paths + script_paths else: - warn("'user_script_paths' must be a list or tuple,\n" + warn("'user_script_paths' must be a list,\n" 'found: {0}. Ignoring this setting.' .format(type(config.user_script_paths))) -- To view, visit https://gerrit.wikimedia.org/r/582965 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: I6b9122cd30532bfa34a5d7d82a9aba9616b5bf60 Gerrit-Change-Number: 582965 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] use path's stem of filename
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/582964 ) Change subject: [bugfix] use path's stem of filename ...................................................................... [bugfix] use path's stem of filename Change-Id: I4dee6096262dae554e636f8c3241087b5cc601b5 --- M pwb.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 228c307..dc9b554 100755 --- a/pwb.py +++ b/pwb.py @@ -359,7 +359,7 @@ if check_modules(filename) or '-help' in args: run_python_file(filename, [filename] + args, - [Path(relative_filename).stem] + argvu[1:], + [Path(filename).stem] + argvu[1:], file_package) return True -- To view, visit https://gerrit.wikimedia.org/r/582964 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: I4dee6096262dae554e636f8c3241087b5cc601b5 Gerrit-Change-Number: 582964 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Vladis13 <wikimail2013(a)yandex.ru> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits March 2020