Pywikibot-commits July 2016

pywikibot-commits@lists.wikimedia.org

2 participants
53 discussions

[Gerrit] Fix travis global environment variables - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix travis global environment variables ...................................................................... Fix travis global environment variables Remove the secure variable, which is available in the Travis settings. Change-Id: Id8162623647ea88c65bf6e2cd2bf5925e94b05bd (manually cherry-picked from f5aaf8534b) --- M .travis.yml 1 file changed, 0 insertions(+), 7 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index e0720f5..0823589 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,13 +70,6 @@ fi env: - global: - # This is the encrypted password for Wikimedia SUL user 'Pywikibot-test', - # and is only decrypted by Travis when running builds of code merged into - # the github repository 'wikimedia/pywikibot-core'. - # See http://docs.travis-ci.com/user/encryption-keys/ for more information. - - secure: kofInMlisiTBt9o/Ustc/vySlkKfxGzGCX2LwA1D2waym8sDTS0o5gMJ5LsrT/BUKwZbe1vLozPHqZrrkQvsdTml+DpZuotzdILs0m0f3BUoexEC6OON5IDljuxFyETrD1Ug44ih5Mc4lVFOdTcBzg501ZmswGwQrBvg/OyEFfE= - matrix: - LANGUAGE=en FAMILY=wikipedia EXTERNALS_HTTPLIB2=1 PYWIKIBOT2_TEST_PROD_ONLY=1 - LANGUAGE=fr FAMILY=wiktionary PYSETUP_TEST_EXTRAS=1 PYWIKIBOT2_TEST_PROD_ONLY=1 PYWIKIBOT2_TEST_NO_RC=1 -- To view, visit https://gerrit.wikimedia.org/r/297420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8162623647ea88c65bf6e2cd2bf5925e94b05bd Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: 2.0 Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 9 months

Errored: wikimedia/pywikibot-core#3511 (master - b6e933d)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3511 Status: Errored Duration: 2 hours, 8 minutes, and 13 seconds Commit: b6e933d (master) Author: jenkins-bot Message: Merge "Fix travis global environment variables" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/f2ffba5022b6...b6e933d4… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/142497088 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 9 months

[Gerrit] Fix travis global environment variables - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix travis global environment variables ...................................................................... Fix travis global environment variables Remove the secure variable, which is available in the Travis settings. Change the syntax for TEST_TIMEOUT, as shippable can not understand the existing a: b syntax Change-Id: Id8162623647ea88c65bf6e2cd2bf5925e94b05bd --- M .travis.yml 1 file changed, 1 insertion(+), 6 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index a0186ad..5dc947f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -121,12 +121,7 @@ env: global: - # This is the encrypted password for Wikimedia SUL user 'Pywikibot-test', - # and is only decrypted by Travis when running builds of code merged into - # the github repository 'wikimedia/pywikibot-core'. - # See http://docs.travis-ci.com/user/encryption-keys/ for more information. - - secure: kofInMlisiTBt9o/Ustc/vySlkKfxGzGCX2LwA1D2waym8sDTS0o5gMJ5LsrT/BUKwZbe1vLozPHqZrrkQvsdTml+DpZuotzdILs0m0f3BUoexEC6OON5IDljuxFyETrD1Ug44ih5Mc4lVFOdTcBzg501ZmswGwQrBvg/OyEFfE= - - TEST_TIMEOUT: 300 + - TEST_TIMEOUT=300 matrix: - LANGUAGE=en FAMILY=wikipedia PYWIKIBOT2_TEST_PROD_ONLY=1 -- To view, visit https://gerrit.wikimedia.org/r/297366 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8162623647ea88c65bf6e2cd2bf5925e94b05bd Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: AbdealiJK <abdealikothari(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 9 months

[Gerrit] [IMPR] Improvements for interwikidata.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [IMPR] Improvements for interwikidata.py ...................................................................... [IMPR] Improvements for interwikidata.py - Add doc for already implemented option -summary. - Align explanation to the same column like for -help documentation - Add additional TODO hint (a separate phab task will be done). - fallback is enabled by default for i18n.twtranslate - Simplify arg parsing. Change-Id: I5a1629c4708a4c08898dc5f50977512859e6157e --- M scripts/interwikidata.py 1 file changed, 16 insertions(+), 18 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/interwikidata.py b/scripts/interwikidata.py index 1d3c1f3..50ee841 100644 --- a/scripts/interwikidata.py +++ b/scripts/interwikidata.py @@ -14,12 +14,14 @@ Furthermore, the following command line parameters are supported: --clean Clean pages. +-clean Clean pages. --create Create items only. +-create Create items only. + +-summary: Use your own edit summary for cleaning the page. """ -# (C) Pywikibot team, 2015 +# (C) Pywikibot team, 2015-2016 # # Distributed under the terms of the MIT license. # @@ -42,8 +44,8 @@ # Allowed namespaces. main, project, template, category namespaces = [0, 4, 10, 14] -# TODO: Some templates on pages, like csd and afd templates, -# should cause the bot to skip the page +# TODO: Some templates on pages, like csd, inuse and afd templates, +# should cause the bot to skip the page, see T134497 class IWBot(ExistingPageBot, SingleSiteBot): @@ -56,7 +58,7 @@ 'clean': False, 'create': False, 'summary': None, - 'ignore_ns': False + 'ignore_ns': False, # used by interwikidata_tests only }) super(IWBot, self).__init__(generator=generator, site=site, **kwargs) if not self.site.has_data_repository: @@ -66,7 +68,7 @@ self.repo = site.data_repository() if not self.getOption('summary'): self.options['summary'] = pywikibot.i18n.twtranslate( - site, 'interwikidata-clean-summary', fallback=True) + site, 'interwikidata-clean-summary') def treat_page(self): """Check page.""" @@ -181,25 +183,21 @@ @type args: list of unicode """ generator = None - clean = False - create = False - always = False local_args = pywikibot.handle_args(args) genFactory = pagegenerators.GeneratorFactory() options = {} for arg in local_args: - if arg == '-clean': - clean = True - elif arg == '-create': - create = True - elif arg.startswith('-always'): - always = True + option, sep, value = arg.partition(':') + option = option[1:] if option.startswith('-') else None + if genFactory.handleArg(arg): + continue + if option == 'summary': + options[option] = value else: - genFactory.handleArg(arg) + options[option] = True site = pywikibot.Site() - options = {'always': always, 'create': create, 'clean': clean} if not generator: generator = genFactory.getCombinedGenerator() if generator: -- To view, visit https://gerrit.wikimedia.org/r/287096 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a1629c4708a4c08898dc5f50977512859e6157e Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <Ladsgroup(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 9 months

[Gerrit] movepages.py: deprecation of -pairs fails to recognise -pair... - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: movepages.py: deprecation of -pairs fails to recognise -pairsfile ...................................................................... movepages.py: deprecation of -pairs fails to recognise -pairsfile Bug: T139243 Change-Id: Iaa0f8c174caf2438a5b6398e4493cba6b2f04aa9 --- M scripts/movepages.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/movepages.py b/scripts/movepages.py index 0a1174b..96c8a0d 100755 --- a/scripts/movepages.py +++ b/scripts/movepages.py @@ -193,7 +193,7 @@ genFactory = pagegenerators.GeneratorFactory() for arg in local_args: - if arg.startswith('-pairs'): + if arg == '-pairs' or arg.startswith('-pairs:'): issue_deprecation_warning( '-pairs', '-pairsfile', -- To view, visit https://gerrit.wikimedia.org/r/297136 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaa0f8c174caf2438a5b6398e4493cba6b2f04aa9 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years, 9 months

[Gerrit] Remove old code dealing with starsList - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Remove old code dealing with starsList ...................................................................... Remove old code dealing with starsList - stars has been replaces with Wikidata's sitelinks and the code is no longer needed. Remove these code parts from add_text.py and cosmetic_changes.py (but keep featured.py unchanged which is in archive folder now. - put code parts into textlib which can be used with version history contents - change add_text_tests - change test_standardizePageFolder test is cosmetic_changes_test - add several tests to textlib_tests Bug: T123150 Change-Id: I06ca86805693f8ce57e78c34b2ee5ace2659a3ba --- M pywikibot/cosmetic_changes.py M pywikibot/textlib.py M scripts/add_text.py M tests/add_text_tests.py M tests/cosmetic_changes_tests.py M tests/textlib_tests.py 6 files changed, 172 insertions(+), 117 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index 6afa7b0..72b74d2 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -49,7 +49,7 @@ cosmetic_changes_deny_script += ['your_script_name_1', 'your_script_name_2'] """ # -# (C) xqt, 2009-2015 +# (C) xqt, 2009-2016 # (C) Pywikibot team, 2006-2016 # # Distributed under the terms of the MIT license. @@ -296,51 +296,18 @@ """ Standardize page footer. - Makes sure that interwiki links, categories and star templates are - put to the correct position and into the right order. This combines the - old instances standardizeInterwiki and standardizeCategories + Makes sure that interwiki links and categories are put to the correct + position and into the right order. This combines the old instances + standardizeInterwiki and standardizeCategories. The page footer has the following section in that sequence: 1. categories 2. ## TODO: template beyond categories ## 3. additional information depending on local site policy - 4. stars templates for featured and good articles - 5. interwiki links + 4. interwiki links """ - # TODO: T123150 - starsList = [ - u'bueno', - u'bom interwiki', - u'cyswllt[ _]erthygl[ _]ddethol', u'dolen[ _]ed', - u'destacado', u'destaca[tu]', - u'enllaç[ _]ad', - u'enllaz[ _]ad', - u'leam[ _]vdc', - u'legătură[ _]a[bcf]', - u'liamm[ _]pub', - u'lien[ _]adq', - u'lien[ _]ba', - u'liên[ _]kết[ _]bài[ _]chất[ _]lượng[ _]tốt', - u'liên[ _]kết[ _]chọn[ _]lọc', - u'ligam[ _]adq', - u'ligazón[ _]a[bd]', - u'ligoelstara', - u'ligoleginda', - u'link[ _][afgu]a', u'link[ _]adq', u'link[ _]f[lm]', u'link[ _]km', - u'link[ _]sm', u'linkfa', - u'na[ _]lotura', - u'nasc[ _]ar', - u'tengill[ _][úg]g', - u'ua', - u'yüm yg', - u'רא', - u'وصلة مقالة جيدة', - u'وصلة مقالة مختارة', - ] - categories = None interwikiLinks = None - allstars = [] # Pywikibot is no longer allowed to touch categories on the # German Wikipedia. See @@ -367,15 +334,6 @@ # Removing the interwiki text = textlib.removeLanguageLinks(text, site=self.site) - # Removing the stars' issue - starstext = textlib.removeDisabledParts(text) - for star in starsList: - regex = re.compile(r'(\{\{(?:template:|)%s\|.*?\}\}[\s]*)' - % star, re.I) - found = regex.findall(starstext) - if found != []: - text = regex.sub('', text) - allstars += found # Adding categories if categories: @@ -390,13 +348,6 @@ # categories.insert(0, name) text = textlib.replaceCategoryLinks(text, categories, site=self.site) - # Adding stars templates - if allstars: - text = text.strip() + self.site.family.interwiki_text_separator - allstars.sort() - for element in allstars: - text += '%s%s' % (element.strip(), config.line_separator) - pywikibot.log(u'%s' % element.strip()) # Adding the interwiki if interwikiLinks: text = textlib.replaceLanguageLinks(text, interwikiLinks, diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 511f03e..32f8fe9 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -7,7 +7,7 @@ """ # -# (C) Pywikibot team, 2008-2015 +# (C) Pywikibot team, 2008-2016 # # Distributed under the terms of the MIT license. # @@ -1669,6 +1669,108 @@ return u'{{%s\n%s}}' % (template, text) +# --------------------------------- +# functions dealing with stars list +# --------------------------------- + +starsList = [ + 'bueno', + 'bom interwiki', + 'cyswllt[ _]erthygl[ _]ddethol', 'dolen[ _]ed', + 'destacado', 'destaca[tu]', + 'enllaç[ _]ad', + 'enllaz[ _]ad', + 'leam[ _]vdc', + 'legătură[ _]a[bcf]', + 'liamm[ _]pub', + 'lien[ _]adq', + 'lien[ _]ba', + 'liên[ _]kết[ _]bài[ _]chất[ _]lượng[ _]tốt', + 'liên[ _]kết[ _]chọn[ _]lọc', + 'ligam[ _]adq', + 'ligazón[ _]a[bd]', + 'ligoelstara', + 'ligoleginda', + 'link[ _][afgu]a', 'link[ _]adq', 'link[ _]f[lm]', 'link[ _]km', + 'link[ _]sm', 'linkfa', + 'na[ _]lotura', + 'nasc[ _]ar', + 'tengill[ _][úg]g', + 'ua', + 'yüm yg', + 'רא', + 'وصلة مقالة جيدة', + 'وصلة مقالة مختارة', +] + + +def get_stars(text): + """ + Extract stars templates from wikitext. + + @param text: a wiki text + @type text: str + @return: list of stars templates + @rtype: list + """ + allstars = [] + starstext = removeDisabledParts(text) + for star in starsList: + regex = re.compile('(\{\{(?:template:|)%s\|.*?\}\}[\s]*)' + % star, re.I) + found = regex.findall(starstext) + if found: + allstars += found + return allstars + + +def remove_stars(text, stars_list): + """ + Remove stars templates from text. + + @param text: a wiki text + @type text: str + @param start_list: list of stars templates previously found in text + @return: modified text + @rtype: str + """ + for star in stars_list: + text = text.replace(star, '') + return text + + +def append_stars(text, stars_list, site=None): + """ + Remove stars templates from text. + + @param text: a wiki text + @type text: str + @param stars_list: list of stars templates previously found in text + @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. + @type site: BaseSite + @return: modified text + @rtype: str + """ + LS = (config.line_separator * 2 + 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 + return text + + +def standardize_stars(text): + """Make sure that star templates are in the right order.""" + allstars = get_stars(text) + text = remove_stars(text, allstars) + return append_stars(text, allstars) + + # -------------------------- # Page parsing functionality # -------------------------- diff --git a/scripts/add_text.py b/scripts/add_text.py index a5b03f1..9beb31a 100755 --- a/scripts/add_text.py +++ b/scripts/add_text.py @@ -3,8 +3,7 @@ r""" This is a Bot to add a text at the end of the content of the page. -By default it adds the text above categories, interwiki and template -for the stars of the interwiki. +By default it adds the text above categories and interwiki. Alternatively it may also add a text at the top of the page. These command line parameters can be used to specify which pages to work on: @@ -80,37 +79,6 @@ } -starsList = [ - u'bueno', - u'bom interwiki', - u'cyswllt[ _]erthygl[ _]ddethol', u'dolen[ _]ed', - u'destacado', u'destaca[tu]', - u'enllaç[ _]ad', - u'enllaz[ _]ad', - u'leam[ _]vdc', - u'legătură[ _]a[bcf]', - u'liamm[ _]pub', - u'lien[ _]adq', - u'lien[ _]ba', - u'liên[ _]kết[ _]bài[ _]chất[ _]lượng[ _]tốt', - u'liên[ _]kết[ _]chọn[ _]lọc', - u'ligam[ _]adq', - u'ligazón[ _]a[bd]', - u'ligoelstara', - u'ligoleginda', - u'link[ _][afgu]a', u'link[ _]adq', u'link[ _]f[lm]', u'link[ _]km', - u'link[ _]sm', u'linkfa', - u'na[ _]lotura', - u'nasc[ _]ar', - u'tengill[ _][úg]g', - u'ua', - u'yüm yg', - u'רא', - u'وصلة مقالة جيدة', - u'وصلة مقالة مختارة', -] - - def add_text(page, addText, summary=None, regexSkip=None, regexSkipUrl=None, always=False, up=False, putText=True, oldTextGiven=None, reorderEnabled=True, create=False): @@ -123,10 +91,6 @@ if not summary: summary = i18n.twtranslate(site, 'add_text-adding', {'adding': addText[:200]}) - - # When a page is tagged as "really well written" it has a star in the - # interwiki links. This is a list of all the templates used (in regex - # format) to make the stars appear. errorCount = 0 @@ -188,22 +152,6 @@ newtext = textlib.replaceCategoryLinks(newtext, categoriesInside, site, True) - # Dealing the stars' issue - # TODO: T123150 - allstars = [] - starstext = textlib.removeDisabledParts(text) - for star in starsList: - regex = re.compile('(\{\{(?:template:|)%s\|.*?\}\}[\s]*)' - % star, re.I) - found = regex.findall(starstext) - if found != []: - newtext = regex.sub('', newtext) - allstars += found - if allstars != []: - newtext = newtext.strip() + config.line_separator * 2 - allstars.sort() - for element in allstars: - newtext += '%s%s' % (element.strip(), config.LS) # Adding the interwiki newtext = textlib.replaceLanguageLinks(newtext, interwikiInside, site) diff --git a/tests/add_text_tests.py b/tests/add_text_tests.py index 5430858..02d9bc8 100644 --- a/tests/add_text_tests.py +++ b/tests/add_text_tests.py @@ -16,9 +16,9 @@ from tests.aspects import unittest, TestCase -class TestStarList(TestCase): +class TestAdding(TestCase): - """Test starlist.""" + """Test adding text.""" family = 'wikipedia' code = 'en' @@ -26,7 +26,7 @@ dry = True def test_basic(self): - """Test adding text before {{linkfa}} without parameters.""" + """Test adding text.""" page = pywikibot.Page(self.site, 'foo') (text, newtext, always) = add_text( page, 'bar', putText=False, @@ -35,14 +35,14 @@ 'foo\n{{linkfa}}\nbar', newtext) - def test_with_params(self): - """Test adding text before {{linkfa|...}}.""" + def test_with_category(self): + """Test adding text before categories.""" page = pywikibot.Page(self.site, 'foo') (text, newtext, always) = add_text( page, 'bar', putText=False, - oldTextGiven='foo\n{{linkfa|...}}') + oldTextGiven='foo\n[[Category:Foo]]') self.assertEqual( - 'foo\nbar\n\n{{linkfa|...}}\n', + 'foo\nbar\n\n[[Category:Foo]]', newtext) diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py index 94c13c2..ad795a0 100644 --- a/tests/cosmetic_changes_tests.py +++ b/tests/cosmetic_changes_tests.py @@ -44,9 +44,9 @@ def test_standardizePageFooter(self): """Test standardizePageFooter method.""" - self.assertEqual('Foo\n{{link fa}}\n\n[[Category:Foo]]', + self.assertEqual('Foo\n{{any template}}\n\n[[Category:Foo]]', self.cct.standardizePageFooter( - 'Foo [[category:foo]] {{link fa}}')) + 'Foo\n[[category:foo]]\n{{any template}}')) def test_resolveHtmlEntities(self): """Test resolveHtmlEntities method.""" diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index e6d67ff..89093ac 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1455,6 +1455,60 @@ self.assertEqual(textlib.unescape('!23<>'"&&'), '!23<>\'"&&') + +class TestStarList(TestCase): + + """Test starlist.""" + + net = False + + def test_basic(self): + """Test standardizing {{linkfa}} without parameters.""" + self.assertEqual( + 'foo\n{{linkfa}}\nbar\n\n', + textlib.standardize_stars('foo\n{{linkfa}}\nbar')) + + def test_with_params(self): + """Test standardizing text with {{linkfa|...}}.""" + self.assertEqual( + 'foo\nbar\n\n{{linkfa|...}}\n', + textlib.standardize_stars('foo\n{{linkfa|...}}\nbar')) + + def test_with_sorting_params(self): + """Test standardizing text with sorting parameters.""" + self.assertEqual( + 'foo\n\n{{linkfa|bar}}\n{{linkfa|de}}\n' + '{{linkfa|en}}\n{{linkfa|fr}}\n', + textlib.standardize_stars( + 'foo\n{{linkfa|en}}\n{{linkfa|de}}\n' + '{{linkfa|fr}}\n{{linkfa|bar}}')) + + def test_get_stars(self): + """Test get_starts method.""" + self.assertEqual( + ['{{linkfa|en}}\n', '{{linkfa|de}}\n', + '{{linkfa|fr}}\n', '{{linkfa|bar}}'], + textlib.get_stars( + 'foo\n{{linkfa|en}}\n{{linkfa|de}}\n' + '{{linkfa|fr}}\n{{linkfa|bar}}')) + + def test_remove_stars(self): + """Test remove_stars method.""" + self.assertEqual( + 'foo\n{{linkfa|en}}\n{{linkfa|fr}}\n{{linkfa|bar}}', + textlib.remove_stars( + 'foo\n{{linkfa|en}}\n{{linkfa|de}}\n' + '{{linkfa|fr}}\n{{linkfa|bar}}', ['{{linkfa|de}}\n'])) + + def test_append_stars(self): + """Test append_stars method.""" + self.assertEqual( + 'foo\n\n{{linkfa|bar}}\n{{linkfa|de}}\n' + '{{linkfa|en}}\n{{linkfa|fr}}\n', + textlib.append_stars( + 'foo', ['{{linkfa|en}}\n', '{{linkfa|de}}\n', + '{{linkfa|fr}}\n', '{{linkfa|bar}}'])) + if __name__ == '__main__': # pragma: no cover try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/282352 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I06ca86805693f8ce57e78c34b2ee5ace2659a3ba Gerrit-PatchSet: 8 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 9 months

[Gerrit] bot_choice.py: Don't print the context when ContextOption.re... - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: bot_choice.py: Don't print the context when ContextOption.result is called ...................................................................... bot_choice.py: Don't print the context when ContextOption.result is called solve_disambiguation.py was printing the context twice when the user chose the "[m]ore context" option. This should fix that. Bug: T138670 Change-Id: If5dd70b51f6267f1ac7b5e629e18b786d9f6cfdd --- M pywikibot/bot_choice.py 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot_choice.py b/pywikibot/bot_choice.py index 6be7704..e116847 100755 --- a/pywikibot/bot_choice.py +++ b/pywikibot/bot_choice.py @@ -264,9 +264,8 @@ self.end = end def result(self, value): - """Add the delta to the context and output it.""" + """Add the delta to the context.""" self.context += self.delta - super(ContextOption, self).result(value) def output(self): """Output the context.""" -- To view, visit https://gerrit.wikimedia.org/r/297125 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If5dd70b51f6267f1ac7b5e629e18b786d9f6cfdd Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 9 months

Errored: wikimedia/pywikibot-core#3506 (2.0 - 18a1574)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3506 Status: Errored Duration: 27 minutes and 6 seconds Commit: 18a1574 (2.0) Author: APerson Message: Fix notifications building from JSON Sometimes (like in welcome messages), notifications don't have a 'title' property, so we shouldn't assume there is one. Bug: T139015 Change-Id: I83e480d04e8e09aa9bcb5edef4f56b47d150e199 (cherry picked from commit d387ab236634f91186805dd114ee85455d1244f8) View the changeset: https://github.com/wikimedia/pywikibot-core/compare/0af67511f023...18a15745… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/141816714 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 9 months

[Gerrit] Fix notifications building from JSON - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix notifications building from JSON ...................................................................... Fix notifications building from JSON Sometimes (like in welcome messages), notifications don't have a 'title' property, so we shouldn't assume there is one. Bug: T139015 Change-Id: I83e480d04e8e09aa9bcb5edef4f56b47d150e199 (cherry picked from commit d387ab236634f91186805dd114ee85455d1244f8) --- M pywikibot/echo.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/echo.py b/pywikibot/echo.py index 311827d..c42ddbb 100644 --- a/pywikibot/echo.py +++ b/pywikibot/echo.py @@ -27,8 +27,10 @@ notif.category = data['category'] notif.timestamp = pywikibot.Timestamp.fromtimestampformat(data['timestamp']['mw']) - # TODO: use 'namespace-key' + 'text' ? - notif.page = pywikibot.Page(site, data['title']['full']) + if 'title' in data and 'full' in data['title']: + notif.page = pywikibot.Page(site, data['title']['full']) + else: + notif.page = None if 'agent' in data and 'name' in data['agent']: notif.agent = pywikibot.User(site, data['agent']['name']) -- To view, visit https://gerrit.wikimedia.org/r/297119 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83e480d04e8e09aa9bcb5edef4f56b47d150e199 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: 2.0 Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: APerson <danielhglus(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 9 months

[Gerrit] Improve page depth counting efficiency - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Improve page depth counting efficiency ...................................................................... Improve page depth counting efficiency We don't need to listify a re.finditer result in order to count the number of forward slashes that appear in a page title - all we have to do is use the built-in function string.count(substr). Change-Id: Ia457c837380f4681046bca64243b826e3ae7a302 --- M pywikibot/page.py 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index a59d379..5c5f2e0 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -235,8 +235,7 @@ if not hasattr(self, '_depth'): # Check if the namespace allows subpages if self._namespace_obj.subpages: - # Count how many '/'s we have in the title - _depth = len(list(re.finditer('/', self.title()))) + _depth = self.title().count('/') else: # Does not allow subpages, which means depth is always 0 _depth = 0 -- To view, visit https://gerrit.wikimedia.org/r/297117 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia457c837380f4681046bca64243b826e3ae7a302 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: APerson <danielhglus(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Sn1per <geofbot(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits July 2016