Pywikibot-commits December 2019

pywikibot-commits@lists.wikimedia.org

1 participants
44 discussions

[Gerrit] pywikibot/core[master]: [tests] Remove test_kino_skirpov

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/554043 ) Change subject: [tests] Remove test_kino_skirpov ...................................................................... [tests] Remove test_kino_skirpov kino.skripov.com is redirected to Kino-wiki.com but no longer a mediawiki site. The domain name is expired since few days. Bug: T239595 Change-Id: I272b731122ee48aded320de367d997cf964c16d2 --- M tests/site_detect_tests.py 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index 0b7048a..7cd9082 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -92,10 +92,6 @@ """Test detection of MediaWiki sites for bluwiki.com.""" self.assertSite('http://bluwiki.com/go/$1') - def test_kino_skirpov(self): - """Test detection of MediaWiki sites for kino.skripov.com.""" - self.assertSite('http://kino.skripov.com/index.php/$1') - class NonStandardVersionSiteTestCase(SiteDetectionTestCase): -- To view, visit https://gerrit.wikimedia.org/r/554043 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: I272b731122ee48aded320de367d997cf964c16d2 Gerrit-Change-Number: 554043 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

4 years, 4 months

[Gerrit] pywikibot/core[master]: Use Python 3.5 for Jenkins tests

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/553871 ) Change subject: Use Python 3.5 for Jenkins tests ...................................................................... Use Python 3.5 for Jenkins tests Bug: T239548 Depends-On: Ic9eda44451ad284de768b8b9a929e8a16a205d43 Change-Id: Ie2f9b19368bc3662c8ed57c341fe9d4b730c5d10 --- M tox.ini 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index 40a17a5..63d1c50 100644 --- a/tox.ini +++ b/tox.ini @@ -6,8 +6,8 @@ envlist = commit-message flake8-{py27,py3,pypy} - doctest-{py27,py34} - test-{py27,py34} + doctest-{py27,py35} + test-{py27,py35} [tox:jenkins] # Override default for WM Jenkins @@ -40,10 +40,10 @@ fasttest-py27: nose-detecthttp fasttest-py27: unicodecsv - fasttest-py34: mwparserfromhell - fasttest-py34: beautifulsoup4 - fasttest-py34: nose-detecthttp>=0.1.3 - fasttest-py34: six + fasttest-py35: mwparserfromhell + fasttest-py35: beautifulsoup4 + fasttest-py35: nose-detecthttp>=0.1.3 + fasttest-py35: six [testenv:commit-message] deps = commit-message-validator @@ -57,7 +57,7 @@ nosetests --with-doctest pywikibot {[params]doctest_skip} basepython = py27: python2.7 - py34: python3.4 + py35: python3.5 deps = nose six @@ -70,7 +70,7 @@ pip install -e .[security] make html -C ./docs rstcheck --recursive --report warning --ignore-directives automodule,autoclass,autofunction . -basepython = python3.4 +basepython = python3.5 deps = -rrequirements.txt -rdocs/requirements-py3.txt -- To view, visit https://gerrit.wikimedia.org/r/553871 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: Ie2f9b19368bc3662c8ed57c341fe9d4b730c5d10 Gerrit-Change-Number: 553871 Gerrit-PatchSet: 6 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Hashar <hashar(a)free.fr> Gerrit-Reviewer: Jforrester <jforrester(a)wikimedia.org> Gerrit-Reviewer: jenkins-bot (75)

4 years, 4 months

[Gerrit] pywikibot/core[master]: [bugfix] Evaluate LoginStatus object

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/553855 ) Change subject: [bugfix] Evaluate LoginStatus object ...................................................................... [bugfix] Evaluate LoginStatus object With Id92f646 the repr of the LoginStatus object has been changed to a printable representation which can be directly evaluated to the object according to the Python doc. Bug: T239533 Change-Id: I58115dd7e25b09e994949e724332f3f62156ae7e --- M scripts/maintenance/cache.py 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py index a83f10e..7e5ea68 100755 --- a/scripts/maintenance/cache.py +++ b/scripts/maintenance/cache.py @@ -204,8 +204,7 @@ raise ParseError('No Site') self.site = eval(site) if login_status: - self.site._loginstatus = eval('LoginStatus.%s' - % login_status[12:-1]) + self.site._loginstatus = eval(login_status) if username: self.site._username = [username, username] if not params: -- To view, visit https://gerrit.wikimedia.org/r/553855 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: I58115dd7e25b09e994949e724332f3f62156ae7e Gerrit-Change-Number: 553855 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

4 years, 4 months

[Gerrit] pywikibot/core[master]: [cleanup] remove unused getOpenStreetMapCats parts

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/551815 ) Change subject: [cleanup] remove unused getOpenStreetMapCats parts ...................................................................... [cleanup] remove unused getOpenStreetMapCats parts Also cleanup imports Part 2 detached from I28d72f2 Change-Id: I18600b78397f1451495b1bfb44de3899fd22f94d --- M scripts/imagerecat.py 1 file changed, 1 insertion(+), 91 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/imagerecat.py b/scripts/imagerecat.py index 3a143ea..d4db6aa 100755 --- a/scripts/imagerecat.py +++ b/scripts/imagerecat.py @@ -19,19 +19,10 @@ # from __future__ import absolute_import, division, unicode_literals -import socket -import xml.etree.ElementTree - import pywikibot from pywikibot import pagegenerators, textlib -from pywikibot.comms.http import fetch -from pywikibot.tools import deprecated, PY2 - -if not PY2: - from urllib.parse import urlencode -else: - from urllib import urlencode +from pywikibot.tools import deprecated category_blacklist = [] @@ -91,87 +82,6 @@ return list(set(result)) -def getOpenStreetMapCats(latitude, longitude): - """Get a list of location categories based on the OSM nomatim tool.""" - result = [] - location_list = getOpenStreetMap(latitude, longitude) - for i, location in enumerate(location_list): - pywikibot.log('Working on {!r}'.format(location)) - if i <= len(location_list) - 3: - category = getCategoryByName(name=location, - parent=location_list[i + 1], - grandparent=location_list[i + 2]) - elif i == len(location_list) - 2: - category = getCategoryByName(name=location, - parent=location_list[i + 1]) - else: - category = getCategoryByName(name=location_list[i]) - if category and not category == '': - result.append(category) - return result - - -def getOpenStreetMap(latitude, longitude): - """ - Get the result from https://nominatim.openstreetmap.org/reverse . - - @rtype: list of tuples - """ - result = [] - gotInfo = False - parameters = urlencode({'lat': latitude, 'lon': longitude, - 'accept-language': 'en'}) - while not gotInfo: - try: - page = fetch( - 'https://nominatim.openstreetmap.org/reverse?format=xml&{}' - .format(parameters)) - et = xml.etree.ElementTree.fromstring(page.text) - gotInfo = True - except IOError: - pywikibot.output("Got an IOError, let's try again") - pywikibot.sleep(30) - except socket.timeout: - pywikibot.output("Got a timeout, let's try again") - pywikibot.sleep(30) - validParts = ['hamlet', 'village', 'city', 'county', 'country'] - invalidParts = ['path', 'road', 'suburb', 'state', 'country_code'] - addressparts = et.find('addressparts') - - for addresspart in addressparts.getchildren(): - if addresspart.tag in validParts: - result.append(addresspart.text) - elif addresspart.tag in invalidParts: - pywikibot.output('Dropping {}, {}' - .format(addresspart.tag, addresspart.text)) - else: - pywikibot.warning('{}, {} is not in addressparts lists' - .format(addresspart.tag, addresspart.text)) - return result - - -def getCategoryByName(name, parent='', grandparent=''): - """Get category by name.""" - if not parent == '': - workname = name.strip() + ',_' + parent.strip() - workcat = pywikibot.Category(pywikibot.Site('commons', 'commons'), - workname) - if workcat.exists(): - return workname - if not grandparent == '': - workname = name.strip() + ',_' + grandparent.strip() - workcat = pywikibot.Category(pywikibot.Site('commons', 'commons'), - workname) - if workcat.exists(): - return workname - workname = name.strip() - workcat = pywikibot.Category(pywikibot.Site('commons', 'commons'), - workname) - if workcat.exists(): - return workname - return '' - - def applyAllFilters(categories): """Apply all filters on categories.""" result = filterDisambiguation(categories) -- To view, visit https://gerrit.wikimedia.org/r/551815 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: I18600b78397f1451495b1bfb44de3899fd22f94d Gerrit-Change-Number: 551815 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

4 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2019