Pywikibot-commits August 2015

pywikibot-commits@lists.wikimedia.org

2 participants
240 discussions

[Gerrit] [FIX] replace: Add replacements to their container - change (pywikibot/core)
by jenkins-bot (Code Review) 14 Aug '15

14 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] replace: Add replacements to their container ...................................................................... [FIX] replace: Add replacements to their container The replacements from the fixes have only been added to the over all replacements, but not their respective container which have been always empty. Change-Id: Ie72f3acc02afeab994c95f0fd811c666801c6dbd --- M pywikibot/fixes.py M scripts/replace.py A tests/data/fixes.py A tests/replacebot_tests.py 4 files changed, 229 insertions(+), 6 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py index 70419a5..29bc3fb 100644 --- a/pywikibot/fixes.py +++ b/pywikibot/fixes.py @@ -637,13 +637,20 @@ }, } + +def _load_file(filename): + """Load the fixes from the given filename.""" + if os.path.exists(filename): + # load binary, to let compile decode it according to the file header + with open(filename, 'rb') as f: + exec(compile(f.read(), filename, 'exec')) + return True + else: + return False + # # Load the user fixes file. -filename = config.datafilepath('user-fixes.py') -if os.path.exists(filename): - # load binary, to let compile decode it according to the file header - with open(filename, 'rb') as f: - exec(compile(f.read(), filename, 'exec')) +if _load_file(config.datafilepath('user-fixes.py')): user_fixes_loaded = True else: user_fixes_loaded = False diff --git a/scripts/replace.py b/scripts/replace.py index 61faf7b..9dacfb8 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -902,12 +902,14 @@ pywikibot.warning('The new string "{0}" contains formatting ' 'characters like U+200E'.format( chars.replace_invisible(replacement[1]))) - replacements.append(ReplacementListEntry( + replacement_set.append(ReplacementListEntry( old=replacement[0], new=replacement[1], fix_set=replacement_set, edit_summary=summary, )) + if replacement_set: + replacements.extend(replacement_set) # Set the regular expression flags flags = re.UNICODE diff --git a/tests/data/fixes.py b/tests/data/fixes.py new file mode 100644 index 0000000..ef76906 --- /dev/null +++ b/tests/data/fixes.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +"""Collection of fixes for tests.""" +from __future__ import unicode_literals + +# flake8 cannot detect that fixes is defined via pywikibot.fixes +if 'fixes' not in globals(): + fixes = {} + +fixes['has-msg'] = { + 'regex': False, + 'msg': { + 'en': 'en', + 'de': 'de', + }, + 'replacements': [ + ('1', '2'), + ] +} + +fixes['has-msg-tw'] = { + 'regex': False, + 'msg': 'replace-replacing', + 'replacements': [ + ('1', '2'), + ] +} + +fixes['no-msg'] = { + 'regex': False, + 'replacements': [ + ('1', '2'), + ] +} + +fixes['has-msg-multiple'] = { + 'regex': False, + 'msg': { + 'en': 'en', + 'de': 'de', + }, + 'replacements': [ + ('1', '2'), + ('3', '4'), + ('5', '6'), + ] +} diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py new file mode 100644 index 0000000..610b811 --- /dev/null +++ b/tests/replacebot_tests.py @@ -0,0 +1,168 @@ +# -*- coding: utf-8 -*- +"""Tests for the replace script and ReplaceRobot class.""" +# +# (C) Pywikibot team, 2015 +# +# Distributed under the terms of the MIT license. +# +from __future__ import unicode_literals + +__version__ = '$Id$' +# +import os + +from pywikibot import fixes + +from scripts import replace + +from tests import _data_dir +from tests.aspects import unittest, TestCase + +# Load only the custom fixes +fixes.fixes.clear() +fixes._load_file(os.path.join(_data_dir, 'fixes.py')) + + +class TestReplacementsMain(TestCase): + + """Test various calls of main().""" + + SUMMARY_CONFIRMATION = ( + 'Press Enter to use this automatic message, or enter a ' + 'description of the\nchanges your bot will make:') + + family = 'test' + code = 'test' + + def setUp(self): + """Replace the original bot class with a fake one.""" + class FakeReplaceBot(object): + + """A fake bot class for the minimal support.""" + + changed_pages = -42 # show that weird number to show this was used + + def __init__(inner_self, generator, replacements, exceptions={}, + always=False, allowoverlap=False, recursive=False, + addedCat=None, sleep=None, summary='', site=None, + **kwargs): + inner_self.replacements = replacements + inner_self.site = site + self.bots.append(inner_self) + + def run(inner_self): + """Nothing to do here.""" + pass + + super(TestReplacementsMain, self).setUp() + self._original_bot = replace.ReplaceRobot + self._original_input = replace.pywikibot.input + self.bots = [] + self.inputs = [] + replace.ReplaceRobot = FakeReplaceBot + replace.pywikibot.input = self._fake_input + + def tearDown(self): + """Bring back the old bot class.""" + replace.ReplaceRobot = self._original_bot + replace.pywikibot.input = self._original_input + super(TestReplacementsMain, self).tearDown() + + def _fake_input(self, message): + """Cache the message and return static text "TESTRUN".""" + self.inputs.append(message) + return 'TESTRUN' + + def _run(self, *args): + """Run the L{replace.main} with the given args and summary and page.""" + # -page to not have an empty generator + # -lang and -family as it will use Site() otherwise + return replace.main(*(args + ('-lang:test', '-family:test', + '-page:TEST'))) + + def test_invalid_replacements(self): + """Test invalid command line replacement configurations.""" + # old and new need to be together + self.assertFalse(self._run('foo', '-replacementfile:/dev/null', 'bar')) + # only old provided + self.assertFalse(self._run('foo')) + + # In the end no bots should've been created + self.assertFalse(self.bots) + + def _test_replacement(self, replacement, clazz=replace.Replacement, + offset=0): + """Test a replacement from the command line.""" + self.assertIsInstance(replacement, clazz) + self.assertEqual(replacement.old, str(offset * 2 + 1)) + self.assertEqual(replacement.new, str(offset * 2 + 2)) + + def _test_fix_replacement(self, replacement, length=1, offset=0): + """Test a replacement from a fix.""" + assert length > offset + self._test_replacement(replacement, replace.ReplacementListEntry, + offset) + self.assertIsInstance(replacement.fix_set, replace.ReplacementList) + self.assertIsInstance(replacement.fix_set, list) + self.assertIn(replacement, replacement.fix_set) + self.assertIs(replacement, replacement.fix_set[offset]) + self.assertEqual(len(replacement.fix_set), length) + + def _get_bot(self, only_confirmation, *args): + """Run with arguments, assert and return one bot.""" + self.assertIsNone(self._run(*args)) + self.assertEqual(len(self.bots), 1) + bot = self.bots[0] + if only_confirmation is not None: + self.assertIn(self.SUMMARY_CONFIRMATION, self.inputs) + if only_confirmation is True: + self.assertEqual(len(self.inputs), 1) + else: + self.assertNotIn(self.SUMMARY_CONFIRMATION, self.inputs) + self.assertEqual(bot.site, self.site) + return bot + + def test_only_cmd(self): + """Test command line replacements only.""" + bot = self._get_bot(True, '1', '2') + self.assertEqual(len(bot.replacements), 1) + self._test_replacement(bot.replacements[0]) + + def test_only_fix_global_message(self): + """Test fixes replacements only.""" + bot = self._get_bot(True, '-fix:has-msg') + self.assertEqual(len(bot.replacements), 1) + self._test_fix_replacement(bot.replacements[0]) + + def test_only_fix_global_message_tw(self): + """Test fixes replacements only.""" + bot = self._get_bot(True, '-fix:has-msg-tw') + self.assertEqual(len(bot.replacements), 1) + self._test_fix_replacement(bot.replacements[0]) + + def test_only_fix_no_message(self): + """Test fixes replacements only.""" + bot = self._get_bot(True, '-fix:no-msg') + self.assertEqual(len(bot.replacements), 1) + self._test_fix_replacement(bot.replacements[0]) + + def test_only_fix_multiple(self): + """Test fixes replacements only.""" + bot = self._get_bot(True, '-fix:has-msg-multiple') + for offset, replacement in enumerate(bot.replacements): + self._test_fix_replacement(replacement, 3, offset) + self.assertEqual(len(bot.replacements), 3) + + def test_cmd_and_fix(self): + """Test command line and fix replacements together.""" + bot = self._get_bot(True, '1', '2', '-fix:has-msg') + self.assertEqual(len(bot.replacements), 2) + self._test_replacement(bot.replacements[0]) + self._test_fix_replacement(bot.replacements[1]) + + +if __name__ == '__main__': + try: + unittest.main() + except SystemExit: + pass -- To view, visit https://gerrit.wikimedia.org/r/230559 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie72f3acc02afeab994c95f0fd811c666801c6dbd Gerrit-PatchSet: 6 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: jenkins-bot <>

1 0

[Gerrit] [IMPROV] Test unconnected page generators - change (pywikibot/core)
by jenkins-bot (Code Review) 14 Aug '15

14 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] Test unconnected page generators ...................................................................... [IMPROV] Test unconnected page generators Add tests to the newly introduced generators from dff802ba. Change-Id: I7204ab8da0feab9e9211c36ad9d5e2dcabd96eb0 --- M tests/pagegenerators_tests.py M tests/site_tests.py 2 files changed, 36 insertions(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index dccd20c..ce51bfc 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -905,6 +905,31 @@ "user", "bot"]: self.assertIn(key, rcinfo.keys()) + +class TestUnconnectedPageGenerator(DefaultSiteTestCase): + + """Test UnconnectedPageGenerator.""" + + def test_unconnected_with_repo(self): + """Test that the ItemPage returned raises NoPage.""" + if not self.site.data_repository(): + raise unittest.SkipTest('Site is not using a Wikibase repository') + cnt = 0 + for page in pagegenerators.UnconnectedPageGenerator(self.site, total=5): + self.assertRaises(pywikibot.NoPage, pywikibot.ItemPage.fromPage, + page) + cnt += 1 + self.assertLessEqual(cnt, 5) + + def test_unconnected_without_repo(self): + """Test that it raises a ValueError on sites without repository.""" + if self.site.data_repository(): + raise unittest.SkipTest('Site is using a Wikibase repository') + with self.assertRaises(ValueError): + for page in pagegenerators.UnconnectedPageGenerator(self.site, + total=5): + assert False # this shouldn't be reached + if __name__ == "__main__": try: unittest.main() diff --git a/tests/site_tests.py b/tests/site_tests.py index 0b9c726..5e3db05 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -811,6 +811,17 @@ self.assertNotIn(page.protection()['edit'][0], invalid_levels) self.assertLessEqual(len(pages), 10) + def test_unconnected(self): + """Test that the ItemPage returned raises NoPage.""" + if not self.site.data_repository(): + raise unittest.SkipTest('Site is not using a Wikibase repository') + cnt = 0 + for page in self.site.unconnected_pages(total=5): + self.assertRaises(pywikibot.NoPage, pywikibot.ItemPage.fromPage, + page) + cnt += 1 + self.assertLessEqual(cnt, 5) + class TestImageUsage(DefaultSiteTestCase): -- To view, visit https://gerrit.wikimedia.org/r/230394 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7204ab8da0feab9e9211c36ad9d5e2dcabd96eb0 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: jenkins-bot <>

1 0

[Gerrit] [IMPROV] ParamInfo: Separate fetch with initialize - change (pywikibot/core)
by jenkins-bot (Code Review) 14 Aug '15

14 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] ParamInfo: Separate fetch with initialize ...................................................................... [IMPROV] ParamInfo: Separate fetch with initialize The `fetch()` method had an `_init` parameter to fetch modules without initializing first. This separates the method into `_fetch()` and `fetch()`. This also changes the way `_init()` works, as it now just skips it, when it's already initialized. It also removes the private `__inited` attribute. Change-Id: Id35db6b4c78145ae47513d8509748dcab6b89b37 --- M pywikibot/data/api.py M tests/dry_api_tests.py 2 files changed, 35 insertions(+), 30 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index d864abf..7d08ea0 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -207,7 +207,6 @@ self.preloaded_modules = self.init_modules if preloaded_modules: self.preloaded_modules |= set(preloaded_modules) - self.__inited = False self.modules_only_mode = modules_only_mode if self.modules_only_mode: @@ -232,6 +231,9 @@ self._modules[name] = modules def _init(self): + assert ('query' in self._modules) is ('main' in self._paraminfo) + if 'query' in self._modules: + return _mw_ver = MediaWikiVersion(self.site.version()) if _mw_ver < MediaWikiVersion('1.15'): @@ -250,7 +252,7 @@ if _mw_ver > MediaWikiVersion('1.26') or _mw_ver < MediaWikiVersion('1.19'): self.preloaded_modules |= set(['query']) - self.fetch(self.preloaded_modules, _init=True) + self._fetch(self.preloaded_modules) # paraminfo 'mainmodule' was added 1.15 assert('main' in self._paraminfo) @@ -277,7 +279,7 @@ if 'query' not in self._modules: assert 'query' not in self._paraminfo - self.fetch(set(['query']), _init=True) + self._fetch(set(['query'])) assert 'query' in self._modules _reused_module_names = self._action_modules & self._modules['query'] @@ -288,8 +290,6 @@ if _reused_module_names > set(['tokens']): warn('Unexpected overlap between action and query submodules: %s' % (_reused_module_names - set(['tokens'])), UserWarning) - - self.__inited = True def _emulate_pageset(self): """Emulate the pageset module, which existed in MW 1.15-1.24.""" @@ -535,7 +535,7 @@ self._emulate_pageset() - def fetch(self, modules, _init=False): + def fetch(self, modules): """ Fetch paraminfo for multiple modules. @@ -543,6 +543,29 @@ Use __getitem__ to cause an exception if a module does not exist. @param modules: API modules to load + @type modules: iterable or str + @rtype: NoneType + """ + if 'main' not in self._paraminfo: + # The first request should be 'paraminfo', so that + # query modules can be prefixed with 'query+' + self._init() + + if 'query' in self._modules: + # It does fetch() while initializing, and this method can't be + # called before it's initialized. + modules = self._normalize_modules(modules) + elif self._action_modules: + # At least we do know the valid action modules and require a subset + assert not modules - self._action_modules - self.root_modules + + self._fetch(modules) + + def _fetch(self, modules): + """ + Fetch paraminfo for multiple modules without initializing beforehand. + + @param modules: API modules to load and which haven't been loaded yet. @type modules: set @rtype: NoneType """ @@ -555,20 +578,11 @@ del failed_modules[:] yield batch - # The first request should be 'paraminfo', so that - # query modules can be prefixed with 'query+' - # If _init is True, dont call _init(). - if 'paraminfo' not in self._paraminfo and not _init: - self._init() - - if self.__inited: - modules = self._normalize_modules(modules) - modules = modules - set(self._paraminfo.keys()) if not modules: return - assert 'query' in self._modules or _init + assert 'query' in self._modules or 'paraminfo' not in self._paraminfo if MediaWikiVersion(self.site.version()) < MediaWikiVersion("1.12"): # When the help is parsed, all paraminfo should already be loaded @@ -593,13 +607,12 @@ if self.modules_only_mode and 'pageset' in module_batch: pywikibot.debug('paraminfo fetch: removed pageset', _logger) module_batch.remove('pageset') - if 'query' not in self._paraminfo: - pywikibot.debug('paraminfo batch: added query', _logger) - module_batch.append('query') # If this occurred during initialisation, # also record it in the preloaded_modules. # (at least so tests know an extra load was intentional) - if not self.__inited: + if 'query' not in self._paraminfo: + pywikibot.debug('paraminfo batch: added query', _logger) + module_batch.append('query') self.preloaded_modules |= set(['query']) params = { @@ -742,8 +755,7 @@ @return: The modules converted into a module paths @rtype: set """ - if not self.__inited: - self._init() + self._init() return self._normalize_modules(modules) @classmethod @@ -901,8 +913,6 @@ # As soon as modules() is removed, module_paths and _module_set can be # combined, so don't add any code between these two methods. def _module_set(self, path): - if not self.__inited: - self._init() # Load the submodules of all action modules available self.fetch(self.action_modules) modules = set(self.action_modules) @@ -915,8 +925,7 @@ @property def action_modules(self): """Set of all action modules.""" - if not self.__inited: - self._init() + self._init() return self._action_modules @property @@ -935,8 +944,6 @@ @return: The names or paths of the submodules. @rtype: set """ - if not self.__inited: - self._init() if name not in self._modules: self.fetch([name]) submodules = self._modules[name] diff --git a/tests/dry_api_tests.py b/tests/dry_api_tests.py index b674f72..5266256 100644 --- a/tests/dry_api_tests.py +++ b/tests/dry_api_tests.py @@ -335,8 +335,6 @@ site._paraminfo._paraminfo[mod] = {} site._paraminfo._action_modules = frozenset(['edit']) site._paraminfo._modules = {'query': frozenset(['info'])} - # TODO: remove access of this private member of ParamInfo - site._paraminfo._ParamInfo__inited = True def test_new_format(self): pi = self.get_site()._paraminfo -- To view, visit https://gerrit.wikimedia.org/r/230081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id35db6b4c78145ae47513d8509748dcab6b89b37 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Fixed: wikimedia/pywikibot-core#2651 (master - e07cc84)
by Travis CI 14 Aug '15

14 Aug '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2651 Status: Fixed Duration: 41 minutes and 32 seconds Commit: e07cc84 (master) Author: John Vandenberg Message: English Wikipedia is not supported The templates in the 'en' configuration were originally intended to support Portuguese Wikipedia, not English Wikipedia. https://mediawiki.org/wiki/Special:Code/pywikipedia/5104 The templates have been deleted from Portuguese Wikipedia. Change-Id: I5192407a188e88d7ccd43188a9d6d4a423db7901 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/6f89c3eb7853...e07cc841… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/75594789 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

Fixed: wikimedia/pywikibot-core#2650 (master - 6f89c3e)
by Travis CI 14 Aug '15

14 Aug '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2650 Status: Fixed Duration: 37 minutes and 40 seconds Commit: 6f89c3e (master) Author: jenkins-bot Message: Merge "Fix TestSiteInfo.test_properties_with_defaults" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/fb8ed4b3cae5...6f89c3eb… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/75589911 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] English Wikipedia is not supported - change (pywikibot/core)
by jenkins-bot (Code Review) 14 Aug '15

14 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: English Wikipedia is not supported ...................................................................... English Wikipedia is not supported The templates in the 'en' configuration were originally intended to support Portuguese Wikipedia, not English Wikipedia. https://mediawiki.org/wiki/Special:Code/pywikipedia/5104 The templates have been deleted from Portuguese Wikipedia. Change-Id: I5192407a188e88d7ccd43188a9d6d4a423db7901 --- M scripts/unusedfiles.py 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/unusedfiles.py b/scripts/unusedfiles.py index 36bd97a..472b81a 100755 --- a/scripts/unusedfiles.py +++ b/scripts/unusedfiles.py @@ -34,12 +34,10 @@ } template_to_the_image = { - 'en': u'{{subst:No-use2}}', 'it': u'{{immagine orfana}}', 'fa': u'{{تصاویر بدون استفاده}}', } template_to_the_user = { - 'en': u'\n\n{{img-sem-uso|%(title)s}}', 'fa': u'\n\n{{جا:اخطار به کاربر برای تصاویر بدون استفاده|%(title)s}}--~~~~', 'it': u'\n\n{{Utente:Filbot/Immagine orfana}}', } -- To view, visit https://gerrit.wikimedia.org/r/231540 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5192407a188e88d7ccd43188a9d6d4a423db7901 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: 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

[Gerrit] Fix TestSiteInfo.test_properties_with_defaults - change (pywikibot/core)
by jenkins-bot (Code Review) 14 Aug '15

14 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: Fix TestSiteInfo.test_properties_with_defaults ...................................................................... Fix TestSiteInfo.test_properties_with_defaults siteinfo.get must be used to access defaults. Also fix a code comment. Change-Id: Icd3fb0bc3c562e08a6e1688d849c5f870dd41903 --- M tests/site_tests.py 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index ae56705..76f1db3 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1793,15 +1793,17 @@ """Test the siteinfo properties with defaults.""" # This does not test that the defaults work correct, # unless the default site is a version needing these defaults - # 'fileextensions' introduced in v1.14: + # 'fileextensions' introduced in v1.15: self.assertIsInstance(self.site.siteinfo.get('fileextensions'), list) self.assertIn('fileextensions', self.site.siteinfo) - self.assertIn({'ext': 'png'}, self.site.siteinfo['fileextensions']) + fileextensions = self.site.siteinfo.get('fileextensions') + self.assertIn({'ext': 'png'}, fileextensions) # 'restrictions' introduced in v1.23: mysite = self.site self.assertIsInstance(mysite.siteinfo.get('restrictions'), dict) self.assertIn('restrictions', mysite.siteinfo) - self.assertIn('cascadinglevels', self.site.siteinfo['restrictions']) + restrictions = self.site.siteinfo.get('restrictions') + self.assertIn('cascadinglevels', restrictions) def test_no_cache(self): """Test siteinfo caching can be disabled.""" -- To view, visit https://gerrit.wikimedia.org/r/231466 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icd3fb0bc3c562e08a6e1688d849c5f870dd41903 Gerrit-PatchSet: 2 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] T108838 '-ignore' parameter throws exception in interwiki.py - change (pywikibot/core)
by jenkins-bot (Code Review) 14 Aug '15

14 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: T108838 '-ignore' parameter throws exception in interwiki.py ...................................................................... T108838 '-ignore' parameter throws exception in interwiki.py Change-Id: I2454d2a30efde7bd30a61fd9b2e85e6763f88daf --- M scripts/interwiki.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 57bc1e3..eabe727 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -584,7 +584,7 @@ elif arg.startswith('-neverlink:'): self.neverlink += arg[11:].split(",") elif arg.startswith('-ignore:'): - self.ignore += [pywikibot.Page(None, p) for p in arg[8:].split(",")] + self.ignore += [pywikibot.Page(pywikibot.Site(), p) for p in arg[8:].split(",")] elif arg.startswith('-ignorefile:'): ignorefile = arg[12:] ignorePageGen = pagegenerators.TextfilePageGenerator(ignorefile) -- To view, visit https://gerrit.wikimedia.org/r/231506 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2454d2a30efde7bd30a61fd9b2e85e6763f88daf Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Malafaya <malafaya(a)clix.pt> Gerrit-Reviewer: Gerrit Patch Uploader <gerritpatchuploader(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: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [FIX] interwiki: Use correct integer range - change (pywikibot/core)
by jenkins-bot (Code Review) 14 Aug '15

14 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] interwiki: Use correct integer range ...................................................................... [FIX] interwiki: Use correct integer range In d15e0c44 the interwiki script uses IntegerOption with the maximum being one element larger than allowed. This is now using a ListOption as a more appropriate choice. Change-Id: Icc92280566c7d972275a5dc344f6e5567e480f9c --- M scripts/interwiki.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/interwiki.py b/scripts/interwiki.py index f6b4c5b..57bc1e3 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -359,7 +359,7 @@ import pywikibot from pywikibot import config, i18n, pagegenerators, textlib, interwiki_graph, titletranslate -from pywikibot.bot import IntegerOption, StandardOption +from pywikibot.bot import ListOption, StandardOption from pywikibot.tools import first_upper if sys.version_info[0] > 2: @@ -1575,13 +1575,13 @@ # TODO: allow answer to repeat previous or go back after a mistake answer = pywikibot.input_choice( 'Which variant should be used?', - (IntegerOption(maximum=len(pages) + 1), + (ListOption(pages), StandardOption('none', 'n'), StandardOption('give up', 'g'))) if answer == 'g': return None elif answer != 'n': - result[site] = pages[answer[1] - 1] + result[site] = answer[1] # Loop over the ones that have one solution, so are in principle # not a problem. -- To view, visit https://gerrit.wikimedia.org/r/231502 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icc92280566c7d972275a5dc344f6e5567e480f9c Gerrit-PatchSet: 1 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: jenkins-bot <>

1 0

[Gerrit] Fix site detection count - change (pywikibot/core)
by jenkins-bot (Code Review) 14 Aug '15

14 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: Fix site detection count ...................................................................... Fix site detection count Change-Id: I9a2f1f2515da218bbf3031d4465e6672bfc06ab5 --- M tests/site_detect_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index a78773b..d1a4bf5 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -136,7 +136,7 @@ self.assertSite('http://www.EcoReality.org/wiki/$1') self.assertSite('http://www.wikichristian.org/index.php?title=$1') self.assertSite('http://wikitree.org/index.php?title=$1') - self.assertEqual(len(self.passes), 13) + self.assertEqual(len(self.passes), 12) self.assertEqual(len(self.failures), 0) self.assertEqual(len(self.errors), 0) -- To view, visit https://gerrit.wikimedia.org/r/231496 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9a2f1f2515da218bbf3031d4465e6672bfc06ab5 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: VcamX <vcamx3(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2015