Pywikibot-commits May 2015

pywikibot-commits@lists.wikimedia.org

2 participants
223 discussions

Passed: wikimedia/pywikibot-core#2309 (master - d2489cb)
by Travis CI 31 May '15

31 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2309 Status: Passed Duration: 23 minutes and 14 seconds Commit: d2489cb (master) Author: jenkins-bot Message: Merge "ReplaceRobot: pass the 'site' argument to textlib.getCategoryLinks()" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/667052764df6...d2489cba… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/64801864 -- 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#2308 (master - 6670527)
by Travis CI 31 May '15

31 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2308 Status: Passed Duration: 24 minutes and 56 seconds Commit: 6670527 (master) Author: jenkins-bot Message: Merge "[FIX] logentries test in general" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/3e1ab31dbae0...66705276… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/64800008 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] ReplaceRobot: pass the 'site' argument to textlib.getCategor... - change (pywikibot/core)
by jenkins-bot (Code Review) 31 May '15

31 May '15

jenkins-bot has submitted this change and it was merged. Change subject: ReplaceRobot: pass the 'site' argument to textlib.getCategoryLinks() ...................................................................... ReplaceRobot: pass the 'site' argument to textlib.getCategoryLinks() Change-Id: I4aa073a5bb759d35b960173bfaa1af98dd9c4f3f --- M scripts/replace.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index b3f6470..cf131da 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -605,7 +605,7 @@ if hasattr(self, 'addedCat'): # Fetch only categories in wikitext, otherwise the others will # be explicitly added. - cats = textlib.getCategoryLinks(new_text) + cats = textlib.getCategoryLinks(new_text, site=page.site) if self.addedCat not in cats: cats.append(self.addedCat) new_text = textlib.replaceCategoryLinks(new_text, -- To view, visit https://gerrit.wikimedia.org/r/214920 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4aa073a5bb759d35b960173bfaa1af98dd9c4f3f Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> 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: jenkins-bot <>

1 0

[Gerrit] [FIX] logentries test in general - change (pywikibot/core)
by jenkins-bot (Code Review) 31 May '15

31 May '15

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] logentries test in general ...................................................................... [FIX] logentries test in general It fixes a bug that it didn't actually used the TestCaseMetaClass so that 'self.site' and 'self.sites' weren't initialized. It also incorporates a generic class to get one logentry instead of having a module wide function. And it uses a more specific docstring in the deprecation tests. Change-Id: I6d68c1cd4d1e7e474ee17255fc60fe0913987164 --- M tests/logentry_tests.py 1 file changed, 25 insertions(+), 26 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/logentry_tests.py b/tests/logentry_tests.py index afa49e5..5c750e5 100644 --- a/tests/logentry_tests.py +++ b/tests/logentry_tests.py @@ -24,9 +24,16 @@ unicode = str -def get_logentry(site, logtype): - """Global method to retriev a single log entry.""" - return next(iter(site.logevents(logtype=logtype, total=1))) +class TestLogentriesBase(TestCase): + + """Base class for log entry tests.""" + + family = 'wikipedia' + code = 'de' + + def _get_logentry(self, logtype): + """Retrieve a single log entry.""" + return next(iter(self.site.logevents(logtype=logtype, total=1))) class TestLogentriesMeta(MetaTestCaseClass): @@ -35,13 +42,11 @@ def __new__(cls, name, bases, dct): """Create the new class.""" - cls.site = pywikibot.Site('de', 'wikipedia') - def test_method(logtype): def test_logevent(self): """Test a single logtype entry.""" - logentry = get_logentry(cls.site, logtype) + logentry = self._get_logentry(logtype) self.assertEqual(logtype, logentry._expectedType) self.assertIsInstance(logentry.action(), unicode) self.assertIsInstance(logentry.comment(), unicode) @@ -63,27 +68,24 @@ test_name = str('test_%sEntry' % logtype.title()) dct[test_name] = test_method(logtype) - return super(MetaTestCaseClass, cls).__new__(cls, name, bases, dct) + return super(TestLogentriesMeta, cls).__new__(cls, name, bases, dct) @add_metaclass -class TestLogentries(TestCase): +class TestLogentries(TestLogentriesBase): - """Test TestLogentries processed by unittest.""" + """Test general LogEntry properties.""" __metaclass__ = TestLogentriesMeta -class TestLogentryParams(TestCase): +class TestLogentryParams(TestLogentriesBase): - """Test Logentry params.""" - - family = 'wikipedia' - code = 'de' + """Test LogEntry properties specific to their action.""" def test_BlockEntry(self): """Test BlockEntry methods.""" - logentry = get_logentry(self.site, 'block') + logentry = self._get_logentry('block') if logentry.action() == 'block': self.assertIsInstance(logentry.flags(), list) if logentry.expiry() is not None: @@ -91,14 +93,14 @@ self.assertIsInstance(logentry.duration(), datetime.timedelta) def test_RightsEntry(self): - """Test MoveEntry methods.""" - logentry = get_logentry(self.site, 'rights') + """Test RightsEntry methods.""" + logentry = self._get_logentry('rights') self.assertIsInstance(logentry.oldgroups, list) self.assertIsInstance(logentry.newgroups, list) def test_MoveEntry(self): """Test MoveEntry methods.""" - logentry = get_logentry(self.site, 'move') + logentry = self._get_logentry('move') self.assertIsInstance(logentry.target_ns, pywikibot.site.Namespace) self.assertEqual(logentry.target_page.namespace(), logentry.target_ns.id) @@ -107,23 +109,20 @@ self.assertIsInstance(logentry.suppressedredirect(), bool) def test_PatrolEntry(self): - """Test MoveEntry methods.""" - logentry = get_logentry(self.site, 'patrol') + """Test PatrolEntry methods.""" + logentry = self._get_logentry('patrol') self.assertIsInstance(logentry.current_id, int) self.assertIsInstance(logentry.previous_id, int) self.assertIsInstance(logentry.auto, bool) -class TestDeprecatedMethods(DeprecationTestCase): +class TestDeprecatedMethods(TestLogentriesBase, DeprecationTestCase): """Test cases for deprecated logentry methods.""" - family = 'wikipedia' - code = 'de' - def test_MoveEntry(self): - """Test MoveEntry methods.""" - logentry = get_logentry(self.site, 'move') + """Test deprecated MoveEntry methods.""" + logentry = self._get_logentry('move') self.assertIsInstance(logentry.new_ns(), int) self.assertEqual(logentry.new_title(), logentry.target_page) -- To view, visit https://gerrit.wikimedia.org/r/214903 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d68c1cd4d1e7e474ee17255fc60fe0913987164 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Passed: wikimedia/pywikibot-core#2307 (master - 3e1ab31)
by Travis CI 31 May '15

31 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2307 Status: Passed Duration: 25 minutes and 15 seconds Commit: 3e1ab31 (master) Author: jenkins-bot Message: Merge "Subclass ReplaceRobot" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/6fb614660041...3e1ab31d… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/64797153 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Subclass ReplaceRobot - change (pywikibot/core)
by jenkins-bot (Code Review) 31 May '15

31 May '15

jenkins-bot has submitted this change and it was merged. Change subject: Subclass ReplaceRobot ...................................................................... Subclass ReplaceRobot Update image and template bots to be simple subclasses of the replace bot. Bot superclass can now accept a site parameter. Update replace bot __init__ to accept standard 'always' argument instead of now deprecated 'acceptall'. Change-Id: I687fcfb2f06872a91d5fe999acdac8557e0c0ede --- M pywikibot/bot.py M scripts/image.py M scripts/replace.py M scripts/template.py 4 files changed, 50 insertions(+), 42 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Ricordisamoa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index b319e3c..57e4721 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1004,9 +1004,13 @@ if 'generator' in kwargs: self.generator = kwargs.pop('generator') + # TODO: add warning if site is specified and generator + # contains pages from a different site. + self._site = kwargs.pop('site', None) + self._sites = set([self._site] if self._site else []) + self.setOptions(**kwargs) - self._site = None - self._sites = set() + self._treat_counter = 0 self._save_counter = 0 @@ -1193,6 +1197,7 @@ """Site that the bot is using.""" if not self._site: warning('Bot.site was not set before being retrieved.') + # TODO: peak at a page from the generator to determine the site self.site = pywikibot.Site() warning('Using the default site: %s' % self.site) return self._site diff --git a/scripts/image.py b/scripts/image.py index 16026c3..d7b61a2 100755 --- a/scripts/image.py +++ b/scripts/image.py @@ -35,7 +35,7 @@ """ # -# (C) Pywikibot team, 2013-2014 +# (C) Pywikibot team, 2013-2015 # # Distributed under the terms of the MIT license. # @@ -43,13 +43,16 @@ __version__ = '$Id$' # -import pywikibot -import replace -from pywikibot import i18n, pagegenerators, Bot import re +import pywikibot -class ImageRobot(Bot): +from pywikibot import i18n, pagegenerators, Bot + +from scripts.replace import ReplaceRobot as ReplaceBot + + +class ImageRobot(ReplaceBot): """This bot will replace or remove all occurrences of an old image.""" @@ -113,9 +116,9 @@ 'summary': None, 'loose': False, }) - super(ImageRobot, self).__init__(**kwargs) - self.generator = generator + Bot.__init__(self, generator=generator, **kwargs) + self.old_image = old_image self.new_image = new_image @@ -126,8 +129,6 @@ else self.old_image, fallback=True) - def run(self): - """Start the bot's action.""" # regular expression to find the original template. # {{vfd}} does the same thing as {{Vfd}}, so both will be found. # The old syntax, {{msg:vfd}}, will also be found. @@ -164,10 +165,9 @@ else: replacements.append((image_regex, '')) - replaceBot = replace.ReplaceRobot(self.generator, replacements, - acceptall=self.getOption('always'), - summary=self.getOption('summary')) - replaceBot.run() + super(ImageRobot, self).__init__(self.generator, replacements, + always=self.getOption('always'), + summary=self.getOption('summary')) def main(*args): diff --git a/scripts/replace.py b/scripts/replace.py index 73c73aa..b3f6470 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -139,13 +139,14 @@ import sys import pywikibot + from pywikibot import i18n, textlib, pagegenerators, Bot from pywikibot import editor as editarticle # Imports predefined replacements tasks from fixes.py from pywikibot import fixes -from pywikibot.tools import chars +from pywikibot.tools import chars, deprecated_args if sys.version_info[0] > 2: basestring = (str, ) @@ -405,9 +406,10 @@ """A bot that can do text replacements.""" + @deprecated_args(acceptall='always') def __init__(self, generator, replacements, exceptions={}, - acceptall=False, allowoverlap=False, recursive=False, - addedCat=None, sleep=None, summary='', site=None): + always=False, allowoverlap=False, recursive=False, + addedCat=None, sleep=None, summary='', **kwargs): """ Constructor. @@ -419,7 +421,7 @@ string). * exceptions - A dictionary which defines when not to change an occurrence. See below. - * acceptall - If True, the user won't be prompted before changes + * always - If True, the user won't be prompted before changes are made. * allowoverlap - If True, when matches overlap, all of them are replaced. @@ -446,7 +448,10 @@ exceptionRegexes dictionary in textlib.replaceExcept(). """ - super(ReplaceRobot, self).__init__(generator=generator) + super(ReplaceRobot, self).__init__(generator=generator, + always=always, + **kwargs) + for i, replacement in enumerate(replacements): if isinstance(replacement, collections.Sequence): if len(replacement) != 2: @@ -458,11 +463,9 @@ replacement[1]) self.replacements = replacements self.exceptions = exceptions - self.acceptall = acceptall + self.acceptall = always # deprecated self.allowoverlap = allowoverlap self.recursive = recursive - if site: - self.site = site if addedCat: if isinstance(addedCat, pywikibot.Category): @@ -613,7 +616,7 @@ pywikibot.output(u"\n\n>>> \03{lightpurple}%s\03{default} <<<" % page.title()) pywikibot.showDiff(original_text, new_text) - if self.acceptall: + if self.getOption('always'): break choice = pywikibot.input_choice( u'Do you want to accept these changes?', @@ -638,12 +641,12 @@ new_text = original_text continue if choice == 'a': - self.acceptall = True + self.options['always'] = True if choice == 'y': page.put_async(new_text, self.generate_summary(applied), callback=self.count_changes) # choice must be 'N' break - if self.acceptall and new_text != original_text: + if self.getOption('always') and new_text != original_text: try: page.put(new_text, self.generate_summary(applied), callback=self.count_changes) except pywikibot.EditConflict: diff --git a/scripts/template.py b/scripts/template.py index 999b22f..8b09314 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -111,9 +111,12 @@ # import re + import pywikibot + from pywikibot import i18n, pagegenerators, xmlreader, Bot -from scripts import replace + +from scripts.replace import ReplaceRobot as ReplaceBot def UserEditFilterGenerator(generator, username, timestamp=None, skip=False, @@ -193,7 +196,7 @@ yield page -class TemplateRobot(Bot): +class TemplateRobot(ReplaceBot): """This bot will replace, remove or subst all occurrences of a template.""" @@ -214,20 +217,19 @@ 'summary': None, 'addedCat': None, }) - super(TemplateRobot, self).__init__(**kwargs) - self.generator = generator + Bot.__init__(self, generator=generator, **kwargs) + self.templates = templates - site = pywikibot.Site() - if self.getOption('addedCat'): - self.options['addedCat'] = pywikibot.Category(site, self.getOption('addedCat')) - - comma = site.mediawiki_message('comma-separator') # get edit summary message if it's empty if not self.getOption('summary'): + comma = self.site.mediawiki_message('comma-separator') params = {'list': comma.join(self.templates.keys()), 'num': len(self.templates)} + + site = self.site + if self.getOption('remove'): self.options['summary'] = i18n.twntranslate( site, 'template-removing', params) @@ -238,8 +240,6 @@ self.options['summary'] = i18n.twntranslate( site, 'template-changing', params) - def run(self): - """Start the robot's action.""" # regular expression to find the original template. # {{vfd}} does the same thing as {{Vfd}}, so both will be found. # The old syntax, {{msg:vfd}}, will also be found. @@ -283,11 +283,11 @@ replacements.append((templateRegex, r'{{%s\g<parameters>}}' % new)) - replaceBot = replace.ReplaceRobot(self.generator, replacements, - exceptions, acceptall=self.getOption('always'), - addedCat=self.getOption('addedCat'), - summary=self.getOption('summary')) - replaceBot.run() + super(TemplateRobot, self).__init__( + generator, replacements, exceptions, + always=self.getOption('always'), + addedCat=self.getOption('addedCat'), + summary=self.getOption('summary')) def main(*args): -- To view, visit https://gerrit.wikimedia.org/r/205079 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I687fcfb2f06872a91d5fe999acdac8557e0c0ede Gerrit-PatchSet: 13 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Passed: wikimedia/pywikibot-core#2306 (master - 6fb6146)
by Travis CI 31 May '15

31 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2306 Status: Passed Duration: 22 minutes and 42 seconds Commit: 6fb6146 (master) Author: jenkins-bot Message: Merge "Fix some docstrings" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/e6d06a37b446...6fb61466… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/64792710 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Fix some docstrings - change (pywikibot/core)
by jenkins-bot (Code Review) 31 May '15

31 May '15

jenkins-bot has submitted this change and it was merged. Change subject: Fix some docstrings ...................................................................... Fix some docstrings Change-Id: I2f39c0bb6286e25d07a935d1cf35c6b14b08085a --- M pywikibot/bot.py M scripts/protect.py 2 files changed, 3 insertions(+), 4 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index b319e3c..b6a5f7b 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -548,7 +548,6 @@ @param force: Automatically use the default @type force: bool @rtype: unicode - @rtype: unicode """ # make sure logging system has been initialized if not _handlers_initialized: diff --git a/scripts/protect.py b/scripts/protect.py index ad8a147..d82367c 100755 --- a/scripts/protect.py +++ b/scripts/protect.py @@ -108,10 +108,10 @@ def check_protection_level(operation, level, levels, default=None): - """Check if the protection level is valid or asks if necessary. + """Check if the protection level is valid or ask if necessary. - @return a valid protection level - @rtype string + @return: a valid protection level + @rtype: string """ if level not in levels: first_char = [] -- To view, visit https://gerrit.wikimedia.org/r/214914 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2f39c0bb6286e25d07a935d1cf35c6b14b08085a Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> 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

Passed: wikimedia/pywikibot-core#2305 (master - e6d06a3)
by Travis CI 31 May '15

31 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2305 Status: Passed Duration: 21 minutes and 32 seconds Commit: e6d06a3 (master) Author: Fabian Neundorf Message: [FIX] tests: Support Python 3 in metaclass tests Some tests (date, l10n and logentry) were just using __metaclass__ which is not supported by Python 3. The metaclasses in aspects and script_tests were using six on Python 3 to avoid that. This adds a generic decorator to tests.utils which looks for __metaclass__ in the class itself and then uses six's add_metaclass (like in aspects and script_tests) to add this metaclass. Change-Id: I8cb46bffb39ef4640ec523e596fba5fbf48fbd8d View the changeset: https://github.com/wikimedia/pywikibot-core/compare/be8aac54d68f...e6d06a37… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/64787221 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] [FIX] tests: Support Python 3 in metaclass tests - change (pywikibot/core)
by jenkins-bot (Code Review) 31 May '15

31 May '15

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] tests: Support Python 3 in metaclass tests ...................................................................... [FIX] tests: Support Python 3 in metaclass tests Some tests (date, l10n and logentry) were just using __metaclass__ which is not supported by Python 3. The metaclasses in aspects and script_tests were using six on Python 3 to avoid that. This adds a generic decorator to tests.utils which looks for __metaclass__ in the class itself and then uses six's add_metaclass (like in aspects and script_tests) to add this metaclass. Change-Id: I8cb46bffb39ef4640ec523e596fba5fbf48fbd8d --- M tests/aspects.py M tests/date_tests.py M tests/l10n_tests.py M tests/logentry_tests.py M tests/script_tests.py M tests/utils.py M tox.ini 7 files changed, 27 insertions(+), 15 deletions(-) Approvals: John Vandenberg: Looks good to me, approved Ricordisamoa: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index ae29255..f96d9f0 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -36,9 +36,6 @@ import time import warnings -if sys.version_info[0] > 2: - import six - import pywikibot from pywikibot import config, log, ServerError, Site @@ -50,7 +47,7 @@ import tests from tests import unittest, patch_request, unpatch_request -from tests.utils import execute_pwb, DrySite, DryRequest +from tests.utils import execute_pwb, DrySite, DryRequest, add_metaclass class TestCaseBase(unittest.TestCase): @@ -794,6 +791,7 @@ return super(MetaTestCaseClass, cls).__new__(cls, name, bases, dct) +@add_metaclass class TestCase(TestTimerMixin, TestLoggingMixin, TestCaseBase): """Run tests on pre-defined sites.""" @@ -925,10 +923,6 @@ raise unittest.SkipTest("Did not find a page that does not exist.") return page - - -if sys.version_info[0] > 2: - TestCase = six.add_metaclass(MetaTestCaseClass)(TestCase) class SiteAttributeTestCase(TestCase): diff --git a/tests/date_tests.py b/tests/date_tests.py index 178da8f..526b358 100644 --- a/tests/date_tests.py +++ b/tests/date_tests.py @@ -10,7 +10,9 @@ from datetime import datetime from pywikibot import date + from tests.aspects import unittest, MetaTestCaseClass, TestCase +from tests.utils import add_metaclass class TestDateMeta(MetaTestCaseClass): @@ -54,6 +56,7 @@ return type.__new__(cls, name, bases, dct) +@add_metaclass class TestDate(TestCase): """Test cases for date library processed by unittest.""" diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py index 2dbe1c8..46981a7 100644 --- a/tests/l10n_tests.py +++ b/tests/l10n_tests.py @@ -10,10 +10,12 @@ __version__ = '$Id$' import re -from tests.aspects import unittest, MetaTestCaseClass, TestCase + import pywikibot from pywikibot import i18n +from tests.aspects import unittest, MetaTestCaseClass, TestCase +from tests.utils import add_metaclass PACKAGES = ( 'redirect-broken-redirect-template', # speedy deletion template @@ -62,11 +64,13 @@ return type.__new__(cls, name, bases, dct) +@add_metaclass class TestValidTemplate(TestCase): """Test cases L10N message templates processed by unittest.""" __metaclass__ = TestValidTemplateMeta + net = True # magic flag tells jenkins to not run the test. diff --git a/tests/logentry_tests.py b/tests/logentry_tests.py index 772b652..afa49e5 100644 --- a/tests/logentry_tests.py +++ b/tests/logentry_tests.py @@ -18,6 +18,7 @@ from tests.aspects import ( unittest, MetaTestCaseClass, TestCase, DeprecationTestCase ) +from tests.utils import add_metaclass if sys.version_info[0] > 2: unicode = str @@ -65,6 +66,7 @@ return super(MetaTestCaseClass, cls).__new__(cls, name, bases, dct) +@add_metaclass class TestLogentries(TestCase): """Test TestLogentries processed by unittest.""" diff --git a/tests/script_tests.py b/tests/script_tests.py index d6b97d7..bf11a8b 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -15,7 +15,7 @@ from tests import _root_dir from tests.aspects import unittest, DefaultSiteTestCase, MetaTestCaseClass, PwbTestCase -from tests.utils import allowed_failure, execute_pwb +from tests.utils import allowed_failure, execute_pwb, add_metaclass if sys.version_info[0] > 2: basestring = (str, ) @@ -386,6 +386,7 @@ return super(TestScriptMeta, cls).__new__(cls, name, bases, dct) +@add_metaclass class TestScript(DefaultSiteTestCase, PwbTestCase): """Test cases for scripts. @@ -400,10 +401,6 @@ user = True - -if sys.version_info[0] > 2: - import six - TestScript = six.add_metaclass(TestScriptMeta)(TestScript) if __name__ == '__main__': try: diff --git a/tests/utils.py b/tests/utils.py index 093c6b5..f55093a 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -17,6 +17,9 @@ from warnings import warn +if sys.version_info[0] > 2: + import six + import pywikibot from pywikibot import config @@ -90,6 +93,15 @@ return lambda orig: orig +def add_metaclass(cls): + """Call six's add_metaclass with the site's __metaclass__ in Python 3.""" + if sys.version_info[0] > 2: + return six.add_metaclass(cls.__metaclass__)(cls) + else: + assert(cls.__metaclass__) + return cls + + class DryParamInfo(dict): """Dummy class to use instead of L{pywikibot.data.api.ParamInfo}.""" diff --git a/tox.ini b/tox.ini index e34218b..67e1655 100644 --- a/tox.ini +++ b/tox.ini @@ -143,7 +143,7 @@ [testenv:nose34] basepython = python3 -commands = +commands = python -W error::UserWarning -m generate_user_files -family:test -lang:test -v nosetests --version nosetests --with-doctest --with-doctest-ignore-unicode -v -a "!net" tests pywikibot {[params]nose_skip} -- To view, visit https://gerrit.wikimedia.org/r/214907 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8cb46bffb39ef4640ec523e596fba5fbf48fbd8d Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.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: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits May 2015