Pywikibot-commits February 2017

pywikibot-commits@lists.wikimedia.org

2 participants
113 discussions

Errored: wikimedia/pywikibot-core#3845 (master - a86fc57)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3845 Status: Errored Duration: 21 minutes and 32 seconds Commit: a86fc57 (master) Author: jenkins-bot Message: Merge "archivebot.py: do not encode key twice" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/660774a39c79...a86fc573… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/201164609 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 3 months

Errored: wikimedia/pywikibot-core#3844 (master - 660774a)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3844 Status: Errored Duration: 51 minutes and 27 seconds Commit: 660774a (master) Author: jenkins-bot Message: Merge "getCategoryLinks should catch invalid category title exceptions" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/75e1b13f741b...660774a3… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/201163815 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 3 months

[Gerrit] pywikibot/core[master]: [IMPR] Return self when data_repository() is called on DataSite

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/336433 ) Change subject: [IMPR] Return self when data_repository() is called on DataSite ...................................................................... [IMPR] Return self when data_repository() is called on DataSite This motivated by the fact that a data repository doesn't need another one as it can provide its data to itself. It also saves some time on initialization because this information is retrieved from the API. Change-Id: Ia245a7bb29f1260f3f690b07c3b1222e4addf755 --- M pywikibot/site.py 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Zhuyifei1999: Looks good to me, but someone else must approve jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/site.py b/pywikibot/site.py index 2491a54..e5f537b 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -7160,6 +7160,18 @@ # not implemented yet raise NotImplementedError + def data_repository(self): + """ + Override parent method. + + This avoids pointless API queries since the data repository + is this site by definition. + + @return: this Site object + @rtype: DataSite + """ + return self + def loadcontent(self, identification, *props): """ Fetch the current content of a Wikibase item. -- To view, visit https://gerrit.wikimedia.org/r/336433 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia245a7bb29f1260f3f690b07c3b1222e4addf755 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years, 3 months

Errored: wikimedia/pywikibot-core#3843 (master - 75e1b13)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3843 Status: Errored Duration: 47 minutes and 22 seconds Commit: 75e1b13 (master) Author: jenkins-bot Message: Merge "[IMPR] Fix html2unicode" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/e7a31af5c755...75e1b13f… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/201156559 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 3 months

[Gerrit] pywikibot/core[master]: archivebot.py: do not encode key twice

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/337278 ) Change subject: archivebot.py: do not encode key twice ...................................................................... archivebot.py: do not encode key twice Change-Id: I530e986f591dd8fbb7c0310f408d8d3b4c5e211c --- M scripts/archivebot.py 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 8adb204..e664952 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -553,8 +553,7 @@ def key_ok(self): """Return whether key is valid.""" - hexdigest = calc_md5_hexdigest(self.page.title().encode('utf8'), - self.salt) + hexdigest = calc_md5_hexdigest(self.page.title(), self.salt) return self.get_attr('key') == hexdigest def load_config(self): -- To view, visit https://gerrit.wikimedia.org/r/337278 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I530e986f591dd8fbb7c0310f408d8d3b4c5e211c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 3 months

[Gerrit] pywikibot/core[master]: getCategoryLinks should catch invalid category title exceptions

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329656 ) Change subject: getCategoryLinks should catch invalid category title exceptions ...................................................................... getCategoryLinks should catch invalid category title exceptions Bug: T154309 Change-Id: Id12ca20f7acbaac78bd3afe76970d3cd7631e1b1 --- M pywikibot/textlib.py 1 file changed, 12 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 57c338a..c8e2926 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -1103,11 +1103,18 @@ title, sortKey = rest.split('|', 1) else: title, sortKey = rest, None - cat = pywikibot.Category(pywikibot.Link( - '%s:%s' % (match.group('namespace'), title), - site), - sortKey=sortKey) - result.append(cat) + try: + cat = pywikibot.Category(pywikibot.Link( + '%s:%s' % (match.group('namespace'), title), + site), + sortKey=sortKey) + except InvalidTitle: + # Category title extracted contains invalid characters + # Likely due to on-the-fly category name creation, see T154309 + pywikibot.warning('Invalid category title extracted: %s' % title) + else: + result.append(cat) + return result -- To view, visit https://gerrit.wikimedia.org/r/329656 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id12ca20f7acbaac78bd3afe76970d3cd7631e1b1 Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <Ladsgroup(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 3 months

[Gerrit] pywikibot/core[master]: [IMPR] Fix html2unicode

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/337290 ) Change subject: [IMPR] Fix html2unicode ...................................................................... [IMPR] Fix html2unicode - Fix ignoring of convertIllegalHtmlEntities. Previously, ignoring any entity inside range(128, 160) would work. - Do not attempt to resolve protected entites (note that this didn't work when '&' was protected different way). - Add a lot of tests. Bug: T130925 Change-Id: Ibb115606920cf945b4bdf366fc0b415028aff050 --- M pywikibot/page.py M tests/page_tests.py 2 files changed, 23 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/page.py b/pywikibot/page.py index b77ba4a..c401000 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -5535,7 +5535,7 @@ # This regular expression will match any decimal and hexadecimal entity and # also entities that might be named entities. entityR = re.compile( - r'&(?:amp;)?(#(?P<decimal>\d+)|#x(?P<hex>[0-9a-fA-F]+)|(?P<name>[A-Za-z]+));') + r'&(#(?P<decimal>\d+)|#x(?P<hex>[0-9a-fA-F]+)|(?P<name>[A-Za-z]+));') # These characters are Html-illegal, but sadly you *can* find some of # these and converting them to chr(decimal) is unsuitable convertIllegalHtmlEntities = { @@ -5569,7 +5569,8 @@ } # ensuring that illegal   and &#157, which have no known values, # don't get converted to chr(129), chr(141) or chr(157) - ignore = set(ignore) | set([129, 141, 157]) + ignore = (set(map(lambda x: convertIllegalHtmlEntities.get(x, x), ignore)) | + set([129, 141, 157])) def handle_entity(match): if match.group('decimal'): @@ -5583,10 +5584,10 @@ unicodeCodepoint = htmlentitydefs.name2codepoint[name] else: unicodeCodepoint = False - try: + + if unicodeCodepoint in convertIllegalHtmlEntities: unicodeCodepoint = convertIllegalHtmlEntities[unicodeCodepoint] - except KeyError: - pass + if unicodeCodepoint and unicodeCodepoint not in ignore: if unicodeCodepoint > sys.maxunicode: # solve narrow Python 2 build exception (UTF-16) diff --git a/tests/page_tests.py b/tests/page_tests.py index deb0274..fd7b63f 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -1020,14 +1020,30 @@ net = False + def test_no_entities(self): + """Test that text is left unchanged.""" + self.assertEqual(pywikibot.page.html2unicode('foobar'), 'foobar') + self.assertEqual(pywikibot.page.html2unicode(' '), ' ') + def test_valid_entities(self): """Test valid entities.""" self.assertEqual(pywikibot.page.html2unicode('A&O'), 'A&O') self.assertEqual(pywikibot.page.html2unicode('py'), 'py') self.assertEqual(pywikibot.page.html2unicode('𐀀'), u'\U00010000') self.assertEqual(pywikibot.page.html2unicode('p&y'), 'p&y') + self.assertEqual(pywikibot.page.html2unicode(''), '€') - @unittest.expectedFailure + def test_ignore_entities(self): + """Test ignore entities.""" + self.assertEqual(pywikibot.page.html2unicode('A&O', [38]), 'A&O') + self.assertEqual(pywikibot.page.html2unicode('A&O', [38]), 'A&O') + self.assertEqual(pywikibot.page.html2unicode('A&O', [38]), 'A&O') + self.assertEqual(pywikibot.page.html2unicode('A&O', [37]), 'A&O') + self.assertEqual(pywikibot.page.html2unicode('', [128]), '') + self.assertEqual(pywikibot.page.html2unicode('', [8364]), '') + self.assertEqual(pywikibot.page.html2unicode('&#157'), + '&#157') + def test_recursive_entities(self): """Test recursive entities.""" self.assertEqual(pywikibot.page.html2unicode('A&amp;O'), 'A&O') -- To view, visit https://gerrit.wikimedia.org/r/337290 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb115606920cf945b4bdf366fc0b415028aff050 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years, 3 months

Errored: wikimedia/pywikibot-core#3842 (master - e7a31af)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3842 Status: Errored Duration: 46 minutes and 39 seconds Commit: e7a31af (master) Author: jenkins-bot Message: Merge "Remove imagetransfer.py from T001/T003 testing" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/8a8d7c2c2563...e7a31af5… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/201024877 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 3 months

[Gerrit] pywikibot/core[master]: Remove imagetransfer.py from T001/T003 testing

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/274054 ) Change subject: Remove imagetransfer.py from T001/T003 testing ...................................................................... Remove imagetransfer.py from T001/T003 testing (omit print function) - replace print statements with pywikibot.output() in imagetransfer.py Change-Id: I92cfddafe56ae10c2f83c087bda2b6f1333d6901 --- M scripts/imagetransfer.py M tox.ini 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py index 7c2a0fe..bcac3db 100755 --- a/scripts/imagetransfer.py +++ b/scripts/imagetransfer.py @@ -163,10 +163,11 @@ description += u'\r\n\r\n{0}'.format(sourceImagePage) except pywikibot.NoPage: description = '' - print("Image does not exist or description page is empty.") + pywikibot.output( + 'Image does not exist or description page is empty.') except pywikibot.IsRedirectPage: description = '' - print("Image description page is redirect.") + pywikibot.output('Image description page is redirect.') else: bot = upload.UploadRobot(url=url, description=description, targetSite=self.targetSite, @@ -201,7 +202,7 @@ """Print image list.""" for i in range(len(imagelist)): image = imagelist[i] - print("-" * 60) + pywikibot.output('-' * 60) pywikibot.output(u"%s. Found image: %s" % (i, image.title(asLink=True))) try: @@ -219,7 +220,7 @@ targetImage.get() pywikibot.output(u"Image with this name is already on %s." % self.targetSite) - print("-" * 60) + pywikibot.output('-' * 60) pywikibot.output(targetImage.get()) sys.exit() except pywikibot.NoPage: @@ -231,7 +232,7 @@ except pywikibot.NoPage: break - print("=" * 60) + pywikibot.output('=' * 60) def run(self): """Run the bot.""" diff --git a/tox.ini b/tox.ini index c436cf8..ec36625 100644 --- a/tox.ini +++ b/tox.ini @@ -154,7 +154,6 @@ tests/__init__.py,tests/aspects.py,tests/script_tests.py,tests/site_detect_tests.py : +T001, T003 tests/pwb/ : +T001, T003 tests/,/from pywikibot.tools import/ : +N813 - scripts/imagetransfer.py : +T001, T003 scripts/checkimages.py,scripts/imagecopy.py,scripts/imagecopy_self.py : +N801 scripts/maintenance/make_i18n_dict.py : +T001, T003 scripts/archive/featured.py : +D102, D103 -- To view, visit https://gerrit.wikimedia.org/r/274054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I92cfddafe56ae10c2f83c087bda2b6f1333d6901 Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Andre Engels <andreengels(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 3 months

Errored: wikimedia/pywikibot-core#3841 (master - 8a8d7c2)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3841 Status: Errored Duration: 47 minutes and 7 seconds Commit: 8a8d7c2 (master) Author: zhuyifei1999 Message: checkimages.py: Prevent TypeError when self.num_notify is None When the max notification is not set, self.num_notify will be None instead of defaultdict, and attempting to reduce the value of an element will result in: TypeError: 'NoneType' object has no attribute '__getitem__' We check if self.num_notify is not None earlier in order to prevent this exception. The logic of checking if the counter has ran out has also been changed from `not value` to `value == 0` for clarity. Follow up for I9e25b35d42af3c73c581c6d05a6a4a8dc8ef62c6 Bug: T157728 Change-Id: I7d5966c52dff4b342942abe030295f3e3c1f422f View the changeset: https://github.com/wikimedia/pywikibot-core/compare/3fe50790a031...8a8d7c2c… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/200929360 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 3 months

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2017