Pywikibot-commits March 2017

pywikibot-commits@lists.wikimedia.org

2 participants
115 discussions

Errored: wikimedia/pywikibot-core#3877 (master - 1ef1513)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3877 Status: Errored Duration: 39 minutes and 10 seconds Commit: 1ef1513 (master) Author: jenkins-bot Message: Merge "archivebot.py:Fix string checking in all functions" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/9b9222574ac1...1ef1513c… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/206999405 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 1 month

[Gerrit] pywikibot/core[master]: __init__.py:Added extra checking for more descriptive error ...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339946 ) Change subject: __init__.py:Added extra checking for more descriptive error raising ...................................................................... __init__.py:Added extra checking for more descriptive error raising Bug: T151526 Change-Id: Iea120e768289f869fcb1c3afa691271e037621b4 --- M pywikibot/__init__.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index b980330..5434f75 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -497,6 +497,8 @@ if calendarmodel is None: if site is None: site = Site().data_repository() + if site is None: + raise ValueError('Site %s has no data repository' % Site()) calendarmodel = site.calendarmodel() self.calendarmodel = calendarmodel -- To view, visit https://gerrit.wikimedia.org/r/339946 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea120e768289f869fcb1c3afa691271e037621b4 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Honeypot95 <iulian.birlica(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Strainu <wiki(a)strainu.ro> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 1 month

[Gerrit] pywikibot/core[master]: archivebot.py:Fix string checking in all functions

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339938 ) Change subject: archivebot.py:Fix string checking in all functions ...................................................................... archivebot.py:Fix string checking in all functions Bug: T157742 Change-Id: Id3a668755ae03cdb444e22eb249201e59e5dac1c --- M scripts/archivebot.py M tests/archivebot_tests.py 2 files changed, 37 insertions(+), 10 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/archivebot.py b/scripts/archivebot.py index e664952..baefcef 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -168,9 +168,9 @@ Translates a duration written in the shorthand notation (ex. "24h", "7d") into an expression in the local language of the wiki ("24 hours", "7 days"). """ - template = site.mediawiki_message(MW_KEYS[string[-1]]) + key, duration = checkstr(string) + template = site.mediawiki_message(MW_KEYS[key]) if template: - duration = string[:-1] # replace plural variants exp = i18n.translate(site.code, template, {'$1': int(duration)}) return exp.replace('$1', to_local_digits(duration, site.code)) @@ -195,14 +195,7 @@ @return: the corresponding timedelta object @rtype: datetime.timedelta """ - key = string[-1] - if string.isdigit(): - key = 's' - duration = string - issue_deprecation_warning('Time period without qualifier', - string + key, 1, UserWarning) - else: - duration = string[:-1] + key, duration = checkstr(string) if duration.isdigit(): duration = int(duration) @@ -226,6 +219,31 @@ return datetime.timedelta(days=days) +def checkstr(string): + """ + Return the key and duration extracted from the string. + + @param string: a string defining a time period: + 300s - 300 seconds + 36h - 36 hours + 7d - 7 days + 2w - 2 weeks (14 days) + 1y - 1 year + @type string: str + @return: key and duration extracted form the string + @rtype: (str, str) + """ + key = string[-1] + if string.isdigit(): + key = 's' + duration = string + issue_deprecation_warning('Time period without qualifier', + string + key, 1, UserWarning) + else: + duration = string[:-1] + return key, duration + + def str2size(string): """ Return a size for a shorthand size. diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index 6f56259..dc0e890 100644 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -97,6 +97,15 @@ self.assertRaises(archivebot.MalformedConfigError, archivebot.str2time, '4000@') self.assertRaises(archivebot.MalformedConfigError, archivebot.str2time, '$1') + def test_checkstr(self): + """Test for extracting key and duration from shorthand notation of durations.""" + self.assertEqual(archivebot.checkstr('400s'), ('s', '400')) + self.assertEqual(archivebot.checkstr('3000'), ('s', '3000')) + self.assertEqual(archivebot.checkstr('7d'), ('d', '7')) + self.assertEqual(archivebot.checkstr('3y'), ('y', '3')) + # Should pass, because the key is verified in str2time + self.assertEqual(archivebot.checkstr('4000@'), ('@', '4000')) + def test_str2size(self): """Test for parsing the shorthand notation of sizes.""" self.assertEqual(archivebot.str2size('0'), (0, 'B')) -- To view, visit https://gerrit.wikimedia.org/r/339938 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3a668755ae03cdb444e22eb249201e59e5dac1c Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Honeypot95 <iulian.birlica(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Strainu <wiki(a)strainu.ro> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 1 month

Errored: wikimedia/pywikibot-core#3876 (master - 9b92225)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3876 Status: Errored Duration: 1 hour, 45 minutes, and 3 seconds Commit: 9b92225 (master) Author: jenkins-bot Message: Merge "Add Šteins as a valid globe due to usage on Wikidata" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/26a7d4ece07a...9b922257… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/206669242 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 1 month

[Gerrit] pywikibot/core[master]: Add Šteins as a valid globe due to usage on Wikidata

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339908 ) Change subject: Add Šteins as a valid globe due to usage on Wikidata ...................................................................... Add Šteins as a valid globe due to usage on Wikidata See https://www.wikidata.org/wiki/Special:WhatLinksHere/Q150249 for usage. Change-Id: I90c06637769d62f2538bda6c29fa0c71a6c937be --- M pywikibot/families/wikidata_family.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Lokal Profil: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikidata_family.py b/pywikibot/families/wikidata_family.py index b2f8d44..f695a20 100644 --- a/pywikibot/families/wikidata_family.py +++ b/pywikibot/families/wikidata_family.py @@ -79,6 +79,7 @@ 'phoebe': 'http://www.wikidata.org/entity/Q17975', 'pluto': 'http://www.wikidata.org/entity/Q339', 'rhea': 'http://www.wikidata.org/entity/Q15050', + 'steins': 'http://www.wikidata.org/entity/Q150249', 'tethys': 'http://www.wikidata.org/entity/Q15047', 'titan': 'http://www.wikidata.org/entity/Q2565', 'titania': 'http://www.wikidata.org/entity/Q3322', -- To view, visit https://gerrit.wikimedia.org/r/339908 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I90c06637769d62f2538bda6c29fa0c71a6c937be Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Smalyshev <smalyshev(a)wikimedia.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Smalyshev <smalyshev(a)wikimedia.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 1 month

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits March 2017