Pywikibot-commits January 2015

pywikibot-commits@lists.wikimedia.org

3 participants
206 discussions

Passed: wikimedia/pywikibot-core#1910 (master - 4163d96)
by Travis CI 10 Jan '15

10 Jan '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1910 Status: Passed Duration: 39 minutes and 6 seconds Commit: 4163d96 (master) Author: jenkins-bot Message: Merge "Add Wikidata support to isbn.py script" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/31c8bc644295...4163d968… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/46547351 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] L10N test for valid templates - change (pywikibot/core)
by jenkins-bot (Code Review) 10 Jan '15

10 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: L10N test for valid templates ...................................................................... L10N test for valid templates - test for redirect-broken-redirect-template - test for archivebot-archiveheader New parameter fallback for i18n.twtranslate() to disable language code fallback for test purposes and L10N. New method i18n.twget_keys to retrieve all language codes of a package. Add l10n_tests to flake8-docstrings-mandatory Change-Id: I891a4862e16d2d51eec0cca03367e74feedf4d2b --- M pywikibot/i18n.py A tests/l10n_tests.py M tox.ini 3 files changed, 107 insertions(+), 12 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 50cf790..ac10b82 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -347,16 +347,21 @@ return trans -def twtranslate(code, twtitle, parameters=None): +def twtranslate(code, twtitle, parameters=None, fallback=True): """ Translate a message. The translations are retrieved from i18n.<package>, based on the callers import table. + fallback parameter must be True for i18n and False for L10N or testing + purposes. + @param code: The language code @param twtitle: The TranslateWiki string title, in <package>-<key> format @param parameters: For passing parameters. + @param fallback: Try an alternate language code + @type fallback: boolean """ package = twtitle.split("-")[0] transdict = getattr(__import__(messages_package_name, fromlist=[package]), @@ -382,17 +387,19 @@ trans = transdict[lang][twtitle] except KeyError: # try alternative languages and English - for alt in _altlang(lang) + ['en']: - try: - trans = transdict[alt][twtitle] - if code_needed: - lang = alt - break - except KeyError: - continue - if trans is None: - raise TranslationError("No English translation has been defined " - "for TranslateWiki key %r" % twtitle) + if fallback: + for alt in _altlang(lang) + ['en']: + try: + trans = transdict[alt][twtitle] + if code_needed: + lang = alt + break + except KeyError: + continue + if trans is None: + raise TranslationError( + "No English translation has been defined " + "for TranslateWiki key %r" % twtitle) # send the language code back via the given list if code_needed: code.append(lang) @@ -499,6 +506,18 @@ return code in transdict and twtitle in transdict[code] +def twget_keys(twtitle): + """ + Return all language codes for a special message. + + @param twtitle: The TranslateWiki string title, in <package>-<key> format + """ + package = twtitle.split("-")[0] + transdict = getattr(__import__(messages_package_name, fromlist=[package]), + package).msg + return (lang for lang in sorted(transdict.keys()) if lang != 'qqq') + + def input(twtitle, parameters=None, password=False): """ Ask the user a question, return the user's answer. diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py new file mode 100644 index 0000000..e6bd7bc --- /dev/null +++ b/tests/l10n_tests.py @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- +"""Test valid templates.""" +# +# (C) Pywikibot team, 2015 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' + +import re +from tests.aspects import unittest, MetaTestCaseClass, TestCase +import pywikibot +from pywikibot import i18n + + +PACKAGES = ( + 'redirect-broken-redirect-template', # speedy deletion template + 'archivebot-archiveheader', # archive header template +) + + +class TestValidTemplateMeta(MetaTestCaseClass): + + """Test meta class.""" + + def __new__(cls, name, bases, dct): + """Create the new class.""" + # this comment is to avoid senseless flake8 warning + + def test_method(msg, code): + + def test_template(self): + """Test validity of template.""" + if msg: + # check whether the message contains a template + template = re.findall(u'.*?{{(.*?)[|}]', msg) + self.assertTrue(template) + + if template: + # check whether site is valid + site = pywikibot.Site('en', 'wikipedia') + self.assertTrue(code in site.languages()) + + # check whether template exists + title = template[0] + site = pywikibot.Site(code, 'wikipedia') + page = pywikibot.Page(site, title, ns=10) + self.assertTrue(page.exists()) + + return test_template + + # create test methods for package messages processed by unittest + for package in PACKAGES: + for lang in i18n.twget_keys(package): + template_msg = i18n.twtranslate(lang, package, fallback=False) + if template_msg is None: + continue + test_name = "test_%s_%s" % (package.replace('-', '_'), lang) + dct[test_name] = test_method(template_msg, lang) + return type.__new__(cls, name, bases, dct) + + +class TestValidTemplate(TestCase): + + """Test cases for date library processed by unittest.""" + + __metaclass__ = TestValidTemplateMeta + net = True # magic flag tells jenkins to not run the test. + + +if __name__ == '__main__': + try: + unittest.main() + except SystemExit: + pass diff --git a/tox.ini b/tox.ini index aa99a97..eb8cf2c 100644 --- a/tox.ini +++ b/tox.ini @@ -98,6 +98,7 @@ tests/exceptions_tests.py \ tests/family_tests.py \ tests/i18n/ \ + tests/l10n_tests.py \ tests/pwb/ \ tests/pwb_tests.py \ tests/script_tests.py \ -- To view, visit https://gerrit.wikimedia.org/r/137904 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I891a4862e16d2d51eec0cca03367e74feedf4d2b Gerrit-PatchSet: 9 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Add Wikidata support to isbn.py script - change (pywikibot/core)
by jenkins-bot (Code Review) 10 Jan '15

10 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: Add Wikidata support to isbn.py script ...................................................................... Add Wikidata support to isbn.py script The support is done via a separate Bot class. It can find ISBN-10 and ISBN-13 property IDs or they can be provided manually by the user. Also, the patch adds support for -always option in WikidataBot when using new method WikidataBot.userEditEntity. Bug: T85242 Change-Id: I38cf459d78eb02102da6a169c9c0633ee95b1f3b --- M pywikibot/bot.py M scripts/isbn.py M tests/isbn_tests.py 3 files changed, 259 insertions(+), 12 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index d56b526..0bb79ba 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1006,19 +1006,36 @@ if 'comment' in kwargs: pywikibot.output(u'Comment: %s' % kwargs['comment']) + page.text = newtext + self._save_page(page, page.save, **kwargs) + + def _save_page(self, page, func, *args, **kwargs): + """ + Helper function to handle page save-related option error handling. + + @param page: currently edited page + @param func: the function to call + @param args: passed to the function + @param kwargs: passed to the function + @kwarg ignore_server_errors: if True, server errors will be reported + and ignored (default: False) + @kwtype ignore_server_errors: bool + @kwarg ignore_save_related_errors: if True, errors related to + page save will be reported and ignored (default: False) + @kwtype ignore_save_related_errors: bool + """ if not self.user_confirm('Do you want to accept these changes?'): return if 'async' not in kwargs and self.getOption('always'): kwargs['async'] = True - page.text = newtext - - ignore_save_related_errors = kwargs.pop('ignore_save_related_errors', False) + ignore_save_related_errors = kwargs.pop('ignore_save_related_errors', + False) ignore_server_errors = kwargs.pop('ignore_server_errors', False) try: - page.save(**kwargs) + func(*args, **kwargs) except pywikibot.PageSaveRelatedError as e: if not ignore_save_related_errors: raise @@ -1164,6 +1181,67 @@ self.source_values[family_code][source_lang] = pywikibot.ItemPage(self.repo, family[source_lang]) + def get_property_by_name(self, property_name): + """ + Find given property and return its ID. + + Method first uses site.search() and if the property isn't found, then + asks user to provide the property ID. + + @param property_name: property to find + @type property_name: str + """ + ns = self.site.data_repository().property_namespace + for page in self.site.search(property_name, step=1, total=1, + namespaces=ns): + page = pywikibot.PropertyPage(self.site.data_repository(), + page.title()) + pywikibot.output(u"Assuming that %s property is %s." % + (property_name, page.id)) + return page.id + return pywikibot.input(u'Property %s was not found. Please enter the ' + u'property ID (e.g. P123) of it:' + % property_name).upper() + + def user_edit_entity(self, item, data=None, **kwargs): + """ + Edit entity with data provided, with user confirmation as required. + + @param item: page to be edited + @type item: ItemPage + @param data: data to be saved, or None if the diff should be created + automatically + @kwarg summary: revision comment, passed to ItemPage.editEntity + @kwtype summary: str + @kwarg show_diff: show changes between oldtext and newtext (default: + True) + @kwtype show_diff: bool + @kwarg ignore_server_errors: if True, server errors will be reported + and ignored (default: False) + @kwtype ignore_server_errors: bool + @kwarg ignore_save_related_errors: if True, errors related to + page save will be reported and ignored (default: False) + @kwtype ignore_save_related_errors: bool + """ + self.current_page = item + + show_diff = kwargs.pop('show_diff', True) + if show_diff: + if data is None: + diff = item.toJSON(diffto=( + item._content if hasattr(item, '_content') else None)) + else: + diff = pywikibot.WikibasePage._normalizeData(data) + pywikibot.output(json.dumps(diff, indent=4, sort_keys=True)) + + if 'summary' in kwargs: + pywikibot.output(u'Change summary: %s' % kwargs['summary']) + + # TODO async in editEntity should actually have some effect (bug T86074) + # TODO PageSaveRelatedErrors should be actually raised in editEntity + # (bug T86083) + self._save_page(item, item.editEntity, data, **kwargs) + def getSource(self, site): """ Create a Claim usable as a source for Wikibase statements. diff --git a/scripts/isbn.py b/scripts/isbn.py index 54b2eb5..412214e 100755 --- a/scripts/isbn.py +++ b/scripts/isbn.py @@ -27,6 +27,13 @@ -always Don't prompt you for each replacement. +-prop-isbn-10 Sets ISBN-10 property ID, so it's not tried to be found + automatically. + The usage is as follows: -prop-isbn-10:propid + +-prop-isbn-13 Sets ISBN-13 property ID. The format and purpose is the + same as in -prop-isbn-10. + """ # # (C) Pywikibot team, 2009-2014 @@ -38,7 +45,7 @@ import re import pywikibot -from pywikibot import i18n, pagegenerators, Bot +from pywikibot import i18n, pagegenerators, Bot, WikidataBot docuReplacements = { '&params;': pagegenerators.parameterHelp, @@ -1415,6 +1422,89 @@ self.treat(page) +class IsbnWikibaseBot(WikidataBot): + + """ISBN bot to be run on Wikibase sites.""" + + def __init__(self, generator, **kwargs): + self.availableOptions.update({ + 'to13': False, + 'format': False, + }) + self.isbn_10_prop_id = kwargs.pop('prop-isbn-10', None) + self.isbn_13_prop_id = kwargs.pop('prop-isbn-13', None) + + super(IsbnWikibaseBot, self).__init__(use_from_page=None, **kwargs) + + self.generator = generator + if self.isbn_10_prop_id is None: + self.isbn_10_prop_id = self.get_property_by_name('ISBN-10') + if self.isbn_13_prop_id is None: + self.isbn_13_prop_id = self.get_property_by_name('ISBN-13') + self.comment = i18n.twtranslate(pywikibot.Site(), 'isbn-formatting') + + def treat(self, page, item): + change_messages = [] + + if self.isbn_10_prop_id in item.claims: + for claim in item.claims[self.isbn_10_prop_id]: + try: + isbn = getIsbn(claim.getTarget()) + except InvalidIsbnException as e: + pywikibot.output(e) + continue + + old_code = claim.getTarget() + + if self.getOption('format'): + isbn.format() + + if self.getOption('to13'): + isbn = isbn.toISBN13() + + item.claims[claim.getID()].remove(claim) + claim = pywikibot.Claim(self.repo, self.isbn_13_prop_id) + claim.setTarget(isbn.code) + if self.isbn_13_prop_id in item.claims: + item.claims[self.isbn_13_prop_id].append(claim) + else: + item.claims[self.isbn_13_prop_id] = [claim] + change_messages.append('Changing %s (%s) to %s (%s)' % + (self.isbn_10_prop_id, old_code, + self.isbn_13_prop_id, isbn.code)) + continue + + if old_code == isbn.code: + continue + claim.setTarget(isbn.code) + change_messages.append('Changing %s (%s --> %s)' % + (self.isbn_10_prop_id, old_code, + isbn.code)) + + # -format is the only option that has any effect on ISBN13 + if self.getOption('format') and self.isbn_13_prop_id in item.claims: + for claim in item.claims[self.isbn_13_prop_id]: + try: + isbn = getIsbn(claim.getTarget()) + except InvalidIsbnException as e: + pywikibot.output(e) + continue + + old_code = claim.getTarget() + isbn.format() + if old_code == isbn.code: + continue + change_messages.append( + 'Changing %s (%s --> %s)' % (self.isbn_13_prop_id, + claim.getTarget(), isbn.code)) + claim.setTarget(isbn.code) + + if change_messages: + self.current_page = item + pywikibot.output('\n'.join(change_messages)) + self.user_edit_entity(item, summary=self.comment) + + def main(*args): """ Process command line arguments and invoke bot. @@ -1430,8 +1520,20 @@ local_args = pywikibot.handle_args(args) genFactory = pagegenerators.GeneratorFactory() + # Check whether we're running on Wikibase site or not + # FIXME: See T85483 and run() in WikidataBot + site = pywikibot.Site() + data_site = site.data_repository() + use_wikibase = (data_site is not None and + data_site.family == site.family and + data_site.code == site.code) + for arg in local_args: - if arg.startswith('-') and arg[1:] in ('always', 'to13', 'format'): + if arg.startswith('-prop-isbn-10:'): + options[arg[1:len('-prop-isbn-10')]] = arg[len('-prop-isbn-10:'):] + elif arg.startswith('-prop-isbn-13:'): + options[arg[1:len('-prop-isbn-13')]] = arg[len('-prop-isbn-13:'):] + elif arg.startswith('-') and arg[1:] in ('always', 'to13', 'format'): options[arg[1:]] = True else: genFactory.handleArg(arg) @@ -1439,7 +1541,10 @@ gen = genFactory.getCombinedGenerator() if gen: preloadingGen = pagegenerators.PreloadingGenerator(gen) - bot = IsbnBot(preloadingGen, **options) + if use_wikibase: + bot = IsbnWikibaseBot(preloadingGen, **options) + else: + bot = IsbnBot(preloadingGen, **options) bot.run() else: pywikibot.showHelp() diff --git a/tests/isbn_tests.py b/tests/isbn_tests.py index cd2c513..26ec753 100644 --- a/tests/isbn_tests.py +++ b/tests/isbn_tests.py @@ -9,10 +9,15 @@ __version__ = '$Id$' -from scripts.isbn import ISBN10, ISBN13, InvalidIsbnException as IsbnExc, \ - getIsbn, hyphenateIsbnNumbers, convertIsbn10toIsbn13, main -from tests.aspects import TestCase, unittest -from pywikibot import Bot +from scripts.isbn import ( + ISBN10, ISBN13, InvalidIsbnException as IsbnExc, + getIsbn, hyphenateIsbnNumbers, convertIsbn10toIsbn13, + main +) +from tests.aspects import ( + unittest, TestCase, WikibaseTestCase, ScriptMainTestCase +) +from pywikibot import Bot, Claim, ItemPage class TestIsbn(TestCase): @@ -89,7 +94,7 @@ isbn.format) -class TestIsbnBot(TestCase): +class TestIsbnBot(ScriptMainTestCase): """Test isbnbot with non-write patching (if the testpage exists).""" @@ -123,5 +128,64 @@ TestIsbnBot.newtext = newtext +class TestIsbnWikibaseBot(ScriptMainTestCase, WikibaseTestCase): + + """Test isbnbot on Wikibase site with non-write patching.""" + + family = 'wikidata' + code = 'test' + + @classmethod + def setUpClass(cls): + super(TestIsbnWikibaseBot, cls).setUpClass() + + # Check if the unit test item page and the property both exist + item_ns = cls.get_repo().item_namespace + for page in cls.get_site().search('IsbnWikibaseBotUnitTest', step=1, + total=1, namespaces=item_ns): + cls.test_page_qid = page.title() + item_page = ItemPage(cls.get_repo(), page.title()) + for pid, claims in item_page.get()['claims'].items(): + for claim in claims: + prop_page = pywikibot.PropertyPage(cls.get_repo(), + claim.getID()) + prop_page.get() + if ('ISBN-10' in prop_page.labels.values() and + claim.getTarget() == '097522980x'): + return + raise unittest.SkipTest( + u'%s: "ISBN-10" property was not found in ' + u'"IsbnWikibaseBotUnitTest" item page' % cls.__name__) + raise unittest.SkipTest( + u'%s: "IsbnWikibaseBotUnitTest" item page was not found' + % cls.__name__) + + def setUp(self): + TestIsbnWikibaseBot._original_setTarget = Claim.setTarget + Claim.setTarget = setTarget_dummy + TestIsbnWikibaseBot._original_editEntity = ItemPage.editEntity + ItemPage.editEntity = editEntity_dummy + super(TestIsbnWikibaseBot, self).setUp() + + def tearDown(self): + Claim.setTarget = TestIsbnWikibaseBot._original_setTarget + ItemPage.editEntity = TestIsbnWikibaseBot._original_editEntity + super(TestIsbnWikibaseBot, self).tearDown() + + def test_isbn(self): + main('-page:' + self.test_page_qid, '-always', '-format') + self.assertEqual(self.setTarget_value, '0-9752298-0-X') + main('-page:' + self.test_page_qid, '-always', '-to13') + self.assertTrue(self.setTarget_value, '978-0975229804') + + +def setTarget_dummy(self, value): + TestIsbnWikibaseBot.setTarget_value = value + TestIsbnWikibaseBot._original_setTarget(self, value) + + +def editEntity_dummy(self, data=None, **kwargs): + pass + if __name__ == "__main__": unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/182989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38cf459d78eb02102da6a169c9c0633ee95b1f3b Gerrit-PatchSet: 17 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: M4tx <m4tx(a)m4tx.pl> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: M4tx <m4tx(a)m4tx.pl> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Add classes for tests that alter mylang and family - change (pywikibot/core)
by jenkins-bot (Code Review) 10 Jan '15

10 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: Add classes for tests that alter mylang and family ...................................................................... Add classes for tests that alter mylang and family Change-Id: I247b44d55b2cf744b72fe0731b3beb67bb86ce1f --- M tests/aspects.py M tests/deletionbot_tests.py M tests/interwiki_link_tests.py M tests/link_tests.py M tests/reflinks_tests.py 5 files changed, 75 insertions(+), 93 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index 86d1341..b6b0956 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -913,6 +913,35 @@ code = config.mylang +class AlteredDefaultSiteTestCase(TestCase): + + """Save and restore the config.mylang and config.family.""" + + def setUp(self): + """Prepare the environment for running main() in a script.""" + self.original_family = pywikibot.config.family + self.original_code = pywikibot.config.mylang + super(AlteredDefaultSiteTestCase, self).setUp() + + def tearDown(self): + """Restore the environment.""" + pywikibot.config.family = self.original_family + pywikibot.config.mylang = self.original_code + super(AlteredDefaultSiteTestCase, self).tearDown() + + +class ScenarioDefinedDefaultSiteTestCase(AlteredDefaultSiteTestCase): + + """Tests that depend on the default site being set to the test site.""" + + def setUp(self): + """Prepare the environment for running main() in a script.""" + super(ScenarioDefinedDefaultSiteTestCase, self).setUp() + site = self.get_site() + pywikibot.config.family = site.family + pywikibot.config.mylang = site.code + + class DefaultDrySiteTestCase(DefaultSiteTestCase): """Run tests using the config specified site in offline mode.""" @@ -1072,6 +1101,13 @@ % (cls.__name__, cls.get_site())) +class ScriptMainTestCase(ScenarioDefinedDefaultSiteTestCase): + + """Test running a script main().""" + + pass + + class PwbTestCase(TestCase): """ diff --git a/tests/deletionbot_tests.py b/tests/deletionbot_tests.py index 7c0d893..1a8d5ed 100644 --- a/tests/deletionbot_tests.py +++ b/tests/deletionbot_tests.py @@ -12,10 +12,10 @@ from scripts import delete -from tests.aspects import unittest, TestCase +from tests.aspects import unittest, ScriptMainTestCase -class TestDeletionBotWrite(TestCase): +class TestDeletionBotWrite(ScriptMainTestCase): """Test deletionbot script.""" @@ -48,7 +48,7 @@ '-undelete', '-summary=pywikibot unit tests') -class TestDeletionBotUser(TestCase): +class TestDeletionBotUser(ScriptMainTestCase): """Test deletionbot as a user (not sysop).""" @@ -75,7 +75,7 @@ p1.save('unit test', botflag=True) -class TestDeletionBot(TestCase): +class TestDeletionBot(ScriptMainTestCase): """Test deletionbot with patching to make it non-write.""" diff --git a/tests/interwiki_link_tests.py b/tests/interwiki_link_tests.py index ea7ec08..d5b44fb 100644 --- a/tests/interwiki_link_tests.py +++ b/tests/interwiki_link_tests.py @@ -10,24 +10,20 @@ from pywikibot import config2 as config from pywikibot.page import Link from pywikibot.exceptions import InvalidTitle -from tests.aspects import unittest, TestCase +from tests.aspects import ( + unittest, + AlteredDefaultSiteTestCase as LinkTestCase, + TestCase, +) -class TestPartiallyQualifiedLinkDifferentCodeParser(TestCase): +class TestPartiallyQualifiedLinkDifferentCodeParser(LinkTestCase): """Tests for interwiki links to local sites.""" family = 'wikipedia' code = 'en' cached = True - - def setUp(self): - self.old_lang = config.mylang - self.old_family = config.family - - def tearDown(self): - config.mylang = self.old_lang - config.family = self.old_family def test_partially_qualified_NS0_family(self): """Test that Link uses config.family for namespace 0.""" diff --git a/tests/link_tests.py b/tests/link_tests.py index a378c65..ab80d0d 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -11,7 +11,13 @@ from pywikibot import config2 as config from pywikibot.page import Link from pywikibot.exceptions import Error, InvalidTitle -from tests.aspects import unittest, DefaultDrySiteTestCase, TestCase +from tests.aspects import ( + unittest, + AlteredDefaultSiteTestCase as LinkTestCase, + DefaultDrySiteTestCase, + WikimediaDefaultSiteTestCase, + TestCase, +) # ---- Tests checking if the parser does (not) accept (in)valid titles @@ -102,21 +108,13 @@ # ---- The first set of tests are explicit links, starting with a ':'. -class TestPartiallyQualifiedExplicitLinkSameSiteParser(TestCase): +class TestPartiallyQualifiedExplicitLinkSameSiteParser(LinkTestCase): """Link tests.""" family = 'wikipedia' code = 'en' cached = True - - def setUp(self): - self.old_lang = config.mylang - self.old_family = config.family - - def tearDown(self): - config.mylang = self.old_lang - config.family = self.old_family def test_partially_qualified_NS0_code(self): """Test ':wikipedia:Main Page' on enwp is namespace 4.""" @@ -159,21 +157,13 @@ self.assertEqual(link.namespace, 1) -class TestPartiallyQualifiedExplicitLinkDifferentCodeParser(TestCase): +class TestPartiallyQualifiedExplicitLinkDifferentCodeParser(LinkTestCase): """Link tests.""" family = 'wikipedia' code = 'en' cached = True - - def setUp(self): - self.old_lang = config.mylang - self.old_family = config.family - - def tearDown(self): - config.mylang = self.old_lang - config.family = self.old_family def test_partially_qualified_NS0_family(self): """Test ':en:Main Page' on dewp is namespace 0.""" @@ -196,21 +186,13 @@ self.assertEqual(link.namespace, 1) -class TestPartiallyQualifiedExplicitLinkDifferentFamilyParser(TestCase): +class TestPartiallyQualifiedExplicitLinkDifferentFamilyParser(LinkTestCase): """Link tests.""" family = 'wikipedia' code = 'en' cached = True - - def setUp(self): - self.old_lang = config.mylang - self.old_family = config.family - - def tearDown(self): - config.mylang = self.old_lang - config.family = self.old_family def test_partially_qualified_NS0_code(self): """Test ':wikipedia:Main Page' on enws is namespace 0.""" @@ -233,7 +215,7 @@ self.assertEqual(link.namespace, 1) -class TestFullyQualifiedSameNamespaceFamilyParser(TestCase): +class TestFullyQualifiedSameNamespaceFamilyParser(LinkTestCase): """Link tests.""" @@ -257,7 +239,7 @@ self.assertEqual(link.namespace, 4) -class TestFullyQualifiedExplicitLinkSameFamilyParser(TestCase): +class TestFullyQualifiedExplicitLinkSameFamilyParser(LinkTestCase): """Link tests.""" @@ -286,7 +268,7 @@ self.assertEqual(link.namespace, 4) -class TestFullyQualifiedExplicitLinkDifferentFamilyParser(TestCase): +class TestFullyQualifiedExplicitLinkDifferentFamilyParser(LinkTestCase): """Link tests.""" @@ -343,7 +325,7 @@ self.assertEqual(link.namespace, 1) -class TestFullyQualifiedExplicitLinkNoLangConfigFamilyParser(TestCase): +class TestFullyQualifiedExplicitLinkNoLangConfigFamilyParser(LinkTestCase): """Link tests.""" @@ -400,7 +382,7 @@ self.assertEqual(link.namespace, 1) -class TestFullyQualifiedNoLangFamilyExplicitLinkParser(TestCase): +class TestFullyQualifiedNoLangFamilyExplicitLinkParser(LinkTestCase): """Link tests.""" @@ -461,7 +443,7 @@ self.assertEqual(link.namespace, 1) -class TestFullyQualifiedOneSiteFamilyExplicitLinkParser(TestCase): +class TestFullyQualifiedOneSiteFamilyExplicitLinkParser(LinkTestCase): """Link tests.""" @@ -493,21 +475,13 @@ # ---- Tests of a Link without colons, which shouldnt be interwikis, follow. -class TestPartiallyQualifiedImplicitLinkSameSiteParser(TestCase): +class TestPartiallyQualifiedImplicitLinkSameSiteParser(LinkTestCase): """Link tests.""" family = 'wikipedia' code = 'en' cached = True - - def setUp(self): - self.old_lang = config.mylang - self.old_family = config.family - - def tearDown(self): - config.mylang = self.old_lang - config.family = self.old_family def test_partially_qualified_NS0_code(self): """Test 'wikipedia:Main Page' on enwp is namespace 4.""" @@ -550,21 +524,13 @@ self.assertEqual(link.namespace, 1) -class TestPartiallyQualifiedImplicitLinkDifferentCodeParser(TestCase): +class TestPartiallyQualifiedImplicitLinkDifferentCodeParser(LinkTestCase): """Link tests.""" family = 'wikipedia' code = 'en' cached = True - - def setUp(self): - self.old_lang = config.mylang - self.old_family = config.family - - def tearDown(self): - config.mylang = self.old_lang - config.family = self.old_family def test_partially_qualified_NS0_family(self): """Test 'en:Main Page' on dewp is namespace 0.""" @@ -587,21 +553,13 @@ self.assertEqual(link.namespace, 1) -class TestPartiallyQualifiedImplicitLinkDifferentFamilyParser(TestCase): +class TestPartiallyQualifiedImplicitLinkDifferentFamilyParser(LinkTestCase): """Link tests.""" family = 'wikipedia' code = 'en' cached = True - - def setUp(self): - self.old_lang = config.mylang - self.old_family = config.family - - def tearDown(self): - config.mylang = self.old_lang - config.family = self.old_family def test_partially_qualified_NS0_code(self): """Test 'wikipedia:Main Page' on enws is namespace 0.""" @@ -624,7 +582,7 @@ self.assertEqual(link.namespace, 1) -class TestFullyQualifiedImplicitLinkSameFamilyParser(TestCase): +class TestFullyQualifiedImplicitLinkSameFamilyParser(LinkTestCase): """Link tests.""" @@ -653,7 +611,7 @@ self.assertEqual(link.namespace, 4) -class TestFullyQualifiedImplicitLinkDifferentFamilyParser(TestCase): +class TestFullyQualifiedImplicitLinkDifferentFamilyParser(LinkTestCase): """Link tests.""" @@ -710,7 +668,7 @@ self.assertEqual(link.namespace, 1) -class TestFullyQualifiedImplicitLinkNoLangConfigFamilyParser(TestCase): +class TestFullyQualifiedImplicitLinkNoLangConfigFamilyParser(LinkTestCase): """Link tests.""" @@ -767,7 +725,7 @@ self.assertEqual(link.namespace, 1) -class TestFullyQualifiedNoLangFamilyImplicitLinkParser(TestCase): +class TestFullyQualifiedNoLangFamilyImplicitLinkParser(LinkTestCase): """Link tests.""" @@ -816,7 +774,7 @@ self.assertEqual(link.namespace, 1) -class TestFullyQualifiedOneSiteFamilyImplicitLinkParser(TestCase): +class TestFullyQualifiedOneSiteFamilyImplicitLinkParser(LinkTestCase): """Link tests.""" @@ -907,7 +865,7 @@ self.assertEqual(link.namespace, 0) -class TestInvalidInterwikiLinks(TestCase): +class TestInvalidInterwikiLinks(WikimediaDefaultSiteTestCase): """Test links to non-wikis.""" @@ -916,7 +874,7 @@ def test_non_wiki_prefix(self): """Test that Link fails if the interwiki prefix is not a wiki.""" - link = Link('bugzilla:1337') + link = Link('bugzilla:1337', source=self.site) self.assertRaisesRegex( Error, 'bugzilla:1337 is not a local page on wikipedia:en, and the ' @@ -925,7 +883,7 @@ def test_other_wiki_prefix(self): """Test that Link fails if the interwiki prefix is a unknown family.""" - link = Link('bulba:this-will-never-work') + link = Link('bulba:this-will-never-work', source=self.site) self.assertRaisesRegex( Error, 'bulba:this-will-never-work is not a local page on wikipedia:en, ' diff --git a/tests/reflinks_tests.py b/tests/reflinks_tests.py index 34499ba..042c29f 100644 --- a/tests/reflinks_tests.py +++ b/tests/reflinks_tests.py @@ -9,12 +9,10 @@ import os -import pywikibot - from scripts.reflinks import XmlDumpPageGenerator, ReferencesRobot, main from tests import _data_dir -from tests.aspects import unittest, TestCase +from tests.aspects import unittest, TestCase, ScriptMainTestCase _xml_data_dir = os.path.join(_data_dir, 'xml') @@ -131,7 +129,7 @@ site=self.get_site()) -class TestReferencesBotConstructor(TestCase): +class TestReferencesBotConstructor(ScriptMainTestCase): """ Test reflinks with run() removed. @@ -150,16 +148,10 @@ self._original_run = ReferencesRobot.run ReferencesRobot.__init__ = dummy_constructor ReferencesRobot.run = lambda self: None - self.original_family = pywikibot.config.family - self.original_code = pywikibot.config.mylang - pywikibot.config.family = self.family - pywikibot.config.mylang = self.code def tearDown(self): ReferencesRobot.__init__ = self._original_constructor ReferencesRobot.run = self._original_run - pywikibot.config.family = self.original_family - pywikibot.config.mylang = self.original_code super(TestReferencesBotConstructor, self).tearDown() def test_xml_simple(self): -- To view, visit https://gerrit.wikimedia.org/r/183791 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I247b44d55b2cf744b72fe0731b3beb67bb86ce1f Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: M4tx <m4tx(a)m4tx.pl> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Passed: wikimedia/pywikibot-core#1909 (master - 31c8bc6)
by Travis CI 10 Jan '15

10 Jan '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1909 Status: Passed Duration: 41 minutes and 54 seconds Commit: 31c8bc6 (master) Author: xqt Message: [bugfix] use message_package_name for i18n.twhas_key() method This patch re-enables using this method through Python Shell Change-Id: I8e766f30dac4a13b6b215ddd7dc50a95386e730d View the changeset: https://github.com/wikimedia/pywikibot-core/compare/55c3f805a4bf...31c8bc64… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/46543908 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] [bugfix] use message_package_name for i18n.twhas_key() method - change (pywikibot/core)
by jenkins-bot (Code Review) 10 Jan '15

10 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: [bugfix] use message_package_name for i18n.twhas_key() method ...................................................................... [bugfix] use message_package_name for i18n.twhas_key() method This patch re-enables using this method through Python Shell Change-Id: I8e766f30dac4a13b6b215ddd7dc50a95386e730d --- M pywikibot/i18n.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 6b0dede..50cf790 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -359,7 +359,8 @@ @param parameters: For passing parameters. """ package = twtitle.split("-")[0] - transdict = getattr(__import__(messages_package_name, fromlist=[package]), package).msg + transdict = getattr(__import__(messages_package_name, fromlist=[package]), + package).msg code_needed = False # If a site is given instead of a code, use its language @@ -490,7 +491,8 @@ @param twtitle: The TranslateWiki string title, in <package>-<key> format """ package = twtitle.split("-")[0] - transdict = getattr(__import__("i18n", fromlist=[package]), package).msg + transdict = getattr(__import__(messages_package_name, fromlist=[package]), + package).msg # If a site is given instead of a code, use its language if hasattr(code, 'code'): code = code.code -- To view, visit https://gerrit.wikimedia.org/r/184120 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8e766f30dac4a13b6b215ddd7dc50a95386e730d Gerrit-PatchSet: 1 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: jenkins-bot <>

1 0

Passed: wikimedia/pywikibot-core#1908 (master - 55c3f80)
by Travis CI 10 Jan '15

10 Jan '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1908 Status: Passed Duration: 41 minutes and 48 seconds Commit: 55c3f80 (master) Author: jenkins-bot Message: Merge "category.py: fix property is_loaded()" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/d337abdfc648...55c3f805… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/46513087 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] category.py: fix property is_loaded() - change (pywikibot/core)
by jenkins-bot (Code Review) 10 Jan '15

10 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: category.py: fix property is_loaded() ...................................................................... category.py: fix property is_loaded() Fix problem with property CategoryDatabase.is_loaded(). Bug: T86351 Change-Id: Ic722cdf714b2d4a2a31a1388e178cd9e86eed1d3 --- M scripts/category.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category.py b/scripts/category.py index 672b591..2b68625 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -164,7 +164,7 @@ return hasattr(self, 'catContentDB') and hasattr(self, 'superclassDB') def _load(self): - if not self.is_loaded(): + if not self.is_loaded: try: f = bz2.BZ2File(self.filename, 'r') pywikibot.output(u'Reading dump from %s' -- To view, visit https://gerrit.wikimedia.org/r/183981 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic722cdf714b2d4a2a31a1388e178cd9e86eed1d3 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: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: jayvdb/pywikibot-core#181 (test-config-site-override - a8e0a5f)
by Travis CI 09 Jan '15

09 Jan '15

Build Update for jayvdb/pywikibot-core ------------------------------------- Build: #181 Status: Errored Duration: 45 minutes and 19 seconds Commit: a8e0a5f (test-config-site-override) Author: John Vandenberg Message: Add classes for tests that alter mylang and family Change-Id: I247b44d55b2cf744b72fe0731b3beb67bb86ce1f View the changeset: https://github.com/jayvdb/pywikibot-core/compare/8e8215f4ee69^...a8e0a5fd87… View the full build log and details: https://travis-ci.org/jayvdb/pywikibot-core/builds/46456568 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

Passed: wikimedia/pywikibot-core#1907 (master - d337abd)
by Travis CI 09 Jan '15

09 Jan '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1907 Status: Passed Duration: 49 minutes and 16 seconds Commit: d337abd (master) Author: jenkins-bot Message: Merge "Fetch patrol token for MW < 1.20" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/27df8cc3ecf7...d337abdf… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/46433539 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2015