Pywikibot-commits October 2013

pywikibot-commits@lists.wikimedia.org

1 participants
94 discussions

[Gerrit] Use the API to retrieve redirects to the category redirect t... - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Use the API to retrieve redirects to the category redirect template (this time with caching) ...................................................................... Use the API to retrieve redirects to the category redirect template (this time with caching) Change-Id: I7af283b3b7a18bd713627cb5f1d8667773e3f3c6 --- M pywikibot/families/wikipedia_family.py M pywikibot/family.py 2 files changed, 24 insertions(+), 10 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 0149a8e..67f3fd4 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -54,11 +54,7 @@ 'arz': (u'تحويل تصنيف',), 'cs': (u'Zastaralá kategorie',), 'da': (u'Kategoriomdirigering',), - 'en': (u'Category redirect', - u'Category Redirect', - u"Categoryredirect", - u'Catredirect', - u'Cat redirect',), + 'en': (u'Category redirect',), 'es': (u'Categoría redirigida',), 'eu': (u'Kategoria redirect',), 'fa': (u'رده بهتر', diff --git a/pywikibot/family.py b/pywikibot/family.py index 59484c9..a7c58d4 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -653,7 +653,6 @@ } # A list of category redirect template names in different languages - # Note: It *is* necessary to list template redirects here self.category_redirect_templates = { '_default': [] } @@ -858,15 +857,34 @@ % {'language_code': code}) def category_redirects(self, code, fallback="_default"): - if code in self.category_redirect_templates: - return self.category_redirect_templates[code] - elif fallback: - return self.category_redirect_templates[fallback] + if not hasattr(self, "_catredirtemplates") or code not in self._catredirtemplates: + self.get_cr_templates(code, fallback) + if code in self._catredirtemplates: + return self._catredirtemplates[code] else: raise KeyError( "ERROR: title for category redirect template in language '%s' unknown" % code) + def get_cr_templates(self, code, fallback): + if not hasattr(self, "_catredirtemplates"): + self._catredirtemplates = {} + if code in self.category_redirect_templates: + cr_template = self.category_redirect_templates[code][0] + else: + cr_template = self.category_redirect_templates[fallback][0] + # start with list of category redirect templates from family file + cr_page = pywikibot.Page(pywikibot.Site(code, self), + "Template:" + cr_template) + cr_list = list(self.category_redirect_templates[code]) + # retrieve all redirects to primary template from API, + # add any that are not already on the list + for t in cr_page.backlinks(filterRedirects=True, namespaces=10): + newtitle = t.title(withNamespace=False) + if newtitle not in cr_list: + cr_list.append(newtitle) + self._catredirtemplates[code] = cr_list + def disambig(self, code, fallback='_default'): if code in self.disambiguationTemplates: return self.disambiguationTemplates[code] -- To view, visit https://gerrit.wikimedia.org/r/85203 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7af283b3b7a18bd713627cb5f1d8667773e3f3c6 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 7 months

[Gerrit] tests: Use unittest2 on python 2.6 - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: tests: Use unittest2 on python 2.6 ...................................................................... tests: Use unittest2 on python 2.6 unittest2 is a backport of python 2.7s unittest features to 2.6. Use it when running the tests that already use those features. Change-Id: I5332e9e0815475d4bb4147bb5c1ef0d0ddc5c3bd --- M setup.py M tests/api_tests.py M tests/dry_api_tests.py M tests/dry_site_tests.py M tests/i18n_tests.py M tests/page_tests.py M tests/pwb_tests.py M tests/site_tests.py M tests/textlib_tests.py M tests/ui_tests.py M tests/utils.py M tests/wikibase_tests.py 12 files changed, 61 insertions(+), 32 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index a38cfe8..b022d2f 100644 --- a/setup.py +++ b/setup.py @@ -17,10 +17,17 @@ from setuptools import setup, find_packages from setuptools.command import install +test_deps = [] + if sys.version_info[0] != 2: raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2") elif sys.version_info[1] < 6: raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2.6 or higher") +elif sys.version_info[1] == 6: + test_deps = ['unittest2'] + testcollector = "tests.utils.collector" +else: + testcollector = "tests" class pwb_install(install.install): @@ -47,7 +54,8 @@ dependency_links=[ 'https://git.wikimedia.org/zip/?r=pywikibot/externals/httplib2.git&format=gz…' ], - test_suite="tests", + test_suite=testcollector, + tests_require=test_deps, classifiers=[ 'License :: OSI Approved :: MIT License', 'Development Status :: 4 - Beta' diff --git a/tests/api_tests.py b/tests/api_tests.py index 7c21ff0..4437036 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -9,8 +9,7 @@ import datetime import pywikibot import pywikibot.data.api as api -import unittest -from utils import PywikibotTestCase +from utils import PywikibotTestCase, unittest mysite = pywikibot.Site('en', 'wikipedia') diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index cc18083..82437af 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -1,11 +1,11 @@ -import datetime -import pywikibot -from pywikibot.data.api import CachedRequest -import unittest - - -class DryAPITests(unittest.TestCase): - +import datetime +import pywikibot +from pywikibot.data.api import CachedRequest +from utils import unittest + + +class DryAPITests(unittest.TestCase): + def setUp(self): self.parms = {'site': pywikibot.Site('en'), 'action': 'query', diff --git a/tests/dry_site_tests.py b/tests/dry_site_tests.py index 8847345..61b6452 100644 --- a/tests/dry_site_tests.py +++ b/tests/dry_site_tests.py @@ -1,8 +1,9 @@ -import pywikibot -import unittest - - -class DrySite(pywikibot.site.APISite): +import pywikibot + +from utils import unittest + + +class DrySite(pywikibot.site.APISite): @property def userinfo(self): return self._userinfo diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 8bef1e6..104f308 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -6,11 +6,12 @@ # __version__ = '$Id$' -import unittest import os from pywikibot import i18n import shutil +from utils import unittest + class TestTranslate(unittest.TestCase): def setUp(self): diff --git a/tests/page_tests.py b/tests/page_tests.py index 5a60678..d764f68 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -10,11 +10,10 @@ __version__ = '$Id$' -import unittest import pywikibot import pywikibot.page -from utils import PywikibotTestCase +from utils import PywikibotTestCase, unittest site = pywikibot.Site('en', 'wikipedia') mainpage = pywikibot.Page(pywikibot.page.Link("Main Page", site)) diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index bd30b33..51db60b 100644 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -9,15 +9,18 @@ import os import sys import subprocess - -import unittest - import pywikibot + +from utils import unittest pypath = sys.executable basepath = os.path.split(os.path.split(__file__)[0])[0] pwbpath = os.path.join(basepath, 'pwb.py') testbasepath = os.path.join(basepath, 'tests', 'pwb') + + +def check_output(command): + return subprocess.Popen(command, stdout=subprocess.PIPE).communicate()[0] class TestPwb(unittest.TestCase): @@ -35,8 +38,8 @@ the environment we get when directly running a script.""" test = os.path.join(testbasepath, 'print_locals.py') - direct = subprocess.check_output([pypath, test]) - vpwb = subprocess.check_output([pypath, pwbpath, test]) + direct = check_output([pypath, test]) + vpwb = check_output([pypath, pwbpath, test]) self.assertEqual(direct, vpwb) if __name__ == "__main__": diff --git a/tests/site_tests.py b/tests/site_tests.py index 3958601..a3f6d81 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -10,11 +10,10 @@ __version__ = '$Id$' -import unittest import pywikibot import warnings from tests import patch_request, unpatch_request -from utils import PywikibotTestCase +from utils import PywikibotTestCase, unittest mysite = None mainpage = None @@ -35,7 +34,6 @@ def testBaseMethods(self): """Test cases for BaseSite methods""" - self.assertEqual(mysite.family.name, self.family) self.assertEqual(mysite.code, self.code) self.assertType(mysite.lang, basestring) diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 3f504c0..52aa8e2 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -10,13 +10,14 @@ import mwparserfromhell except ImportError: mwparserfromhell = False -import unittest import codecs import os import pywikibot import pywikibot.textlib as textlib +from utils import unittest + files = {} dirname = os.path.join(os.path.dirname(__file__), "pages") diff --git a/tests/ui_tests.py b/tests/ui_tests.py index d4ba066..2f01410 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -9,13 +9,14 @@ # __version__ = '$Id$' -import unittest import cStringIO import StringIO import logging import os import sys +from utils import unittest + if os.name == "nt": from multiprocessing.managers import BaseManager import threading diff --git a/tests/utils.py b/tests/utils.py index adb31b7..bccf715 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,4 +1,23 @@ -import unittest +try: + # Unittest2 is a backport of python 2.7s unittest module to python 2.6 + # Trying to import unittest2 has to happen first because 2.6 does have a + # unittest module in the standard library but that doesn't support all the + # features of the one found in python 2.7, so importing unittest first and + # then trying to figure out if it supports the features used would mean + # checking the module contents etc. Just catching an ImportError once is + # much easier. + import unittest2 as unittest +except ImportError: + import unittest + + +def collector(): + # This test collector loads tests from the `tests` directory in files + # matching the pattern `*tests.py`. This gets used by `setup.py test` when + # running on Python 2.6 to use the unittest2 test runner instead of the + # unittest one. + return unittest.loader.defaultTestLoader.discover("tests", "*tests.py") + from tests import patch_request, unpatch_request diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index ef39990..eb653d8 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -10,11 +10,10 @@ __version__ = '$Id$' import os -import unittest import pywikibot import json -from utils import PywikibotTestCase +from utils import PywikibotTestCase, unittest site = pywikibot.Site('en', 'wikipedia') mainpage = pywikibot.Page(pywikibot.page.Link("Main Page", site)) -- To view, visit https://gerrit.wikimedia.org/r/86436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5332e9e0815475d4bb4147bb5c1ef0d0ddc5c3bd Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mineo <themineo(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 7 months

[Gerrit] Aligned help with implementation - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Aligned help with implementation ...................................................................... Aligned help with implementation Change-Id: I32340b0ed4e6bf39a793ccb6b7288c02ed1b941c --- M pywikibot/config2.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index ee62581..1085ddc 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -105,7 +105,8 @@ provided in this argument 2. If the user has a PYWIKIBOT2_DIR environment variable, use the value of it - 3. Use (and if necessary create) a 'pywikibot' folder (Windows) or + 3. Use (and if necessary create) a 'pywikibot' folder under + 'Application Data' or 'AppData\Roaming' (Windows) or '.pywikibot' directory (Unix and similar) under the user's home directory. -- To view, visit https://gerrit.wikimedia.org/r/87016 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I32340b0ed4e6bf39a793ccb6b7288c02ed1b941c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 7 months

[Gerrit] Enabling usage of Disambiguator - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Enabling usage of Disambiguator ...................................................................... Enabling usage of Disambiguator Per help page [1] and some examples [2] [3] when someone runs isDisambig method this code checks if the Disambiguator is enabled, By checking list of extensions in siteinfo, if the extension is not enabaled (like [4]) returns the old way but if exists (like [5]) uses API to check being disambiguation. For more info see the examples I showed in [2] and [3] It's prttey important, and please review as soon as possible because if the extension is enabled, the old way doens't work now. See the bug. [1]: https://www.mediawiki.org/wiki/Extension:Disambiguator [2]: https://en.wikipedia.org/w/api.php?action=query&titles=Aa%20River&prop=page… [3]: https://en.wikipedia.org/w/api.php?action=query&titles=Tehran&prop=pageprop… [4]: http://tools.wmflabs.org/wikitest-rtl/w/index.php?title=Special:Disambiguat… [5]: https://en.wikipedia.org/wiki/Special:DisambiguationPages Bug: 54480 Change-Id: Ie3c46671d888cf917640fc732a28cc827028d0de --- M wikipedia.py 1 file changed, 31 insertions(+), 6 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia.py b/wikipedia.py index a044026..15a40f2 100644 --- a/wikipedia.py +++ b/wikipedia.py @@ -1510,11 +1510,38 @@ def isImage(self): """Return True if this is an image description page, False otherwise.""" return self.namespace() == 6 - def isDisambig(self, get_Index=True): - """Return True if this is a disambiguation page, False otherwise. + """Return True if this is a disambiguation page, False otherwise.""" + if not hasattr(self, "_isDisambig"): + extensions = self._site.siteinfo('extensions') + namesofextensions = [] + for extension in extensions: + namesofextensions.append(extension['name']) + if not u'Disambiguator' in namesofextensions: + return self._isDisambig_disambiguationspage(get_Index) + else: + return self._isDisambig_disambiguator(get_Index) + else: + return self._isDisambig - Relies on the presence of specific templates, identified in + def _isDisambig_disambiguator(self, get_Index=True): + params = { + 'action' : 'query', + 'titles' : self.title(), + 'prop' : 'pageprops', + 'ppprop' : 'disambiguation' + } + data = query.GetData(params, self._site)['query']['pages'].values()[0] + self._isDisambig = False + if data.has_key(u'missing'): + raise NoPage('Page %s does not exist' % self.title(asLink=True)) + if data.has_key(u'pageprops'): + if data[u'pageprops'].has_key(u'disambiguation'): + self._isDisambig = True + return self._isDisambig + + def _isDisambig_disambiguationspage(self, get_Index=True): + """Relies on the presence of specific templates, identified in the Family file or on a wiki page, to identify disambiguation pages. @@ -1527,9 +1554,7 @@ which are given on en-wiki Template:Disambig is always assumed to be default, and will be - appended regardless of its existence. - - """ + appended regardless of its existence.""" if not hasattr(self, "_isDisambig"): if not hasattr(self._site, "_disambigtemplates"): try: -- To view, visit https://gerrit.wikimedia.org/r/86047 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie3c46671d888cf917640fc732a28cc827028d0de Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits October 2013