Pywikibot-commits August 2015

pywikibot-commits@lists.wikimedia.org

2 participants
240 discussions

[Gerrit] Implement OAuthEditTest - change (pywikibot/core)
by jenkins-bot (Code Review) 19 Aug '15

19 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: Implement OAuthEditTest ...................................................................... Implement OAuthEditTest OAuthEditTest will login, edit a userpage and confirm the edit was done using OAuth. Bug: T109061 Change-Id: I1344b4496af9a9ebfb698ebb7e864c61e4833750 --- M tests/aspects.py M tests/edit_tests.py M tests/oauth_tests.py 3 files changed, 51 insertions(+), 4 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index f4016d7..994a3de 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -685,7 +685,7 @@ # Inherit superclass attributes for base in bases: for key in ('pwb', 'net', 'site', 'user', 'sysop', 'write', - 'sites', 'family', 'code', 'dry', 'hostname', + 'sites', 'family', 'code', 'dry', 'hostname', 'oauth', 'hostnames', 'cached', 'cacheinfo', 'wikibase'): if hasattr(base, key) and key not in dct: # print('%s has %s; copying to %s' @@ -783,7 +783,7 @@ bases = tuple([CheckHostnameMixin] + list(bases)) if 'write' in dct and dct['write']: - if 'user' not in dct: + if 'user' not in dct and 'oauth' not in dct: dct['user'] = True bases = tuple([SiteWriteMixin] + list(bases)) diff --git a/tests/edit_tests.py b/tests/edit_tests.py index db5cfee..0e9ce7e 100644 --- a/tests/edit_tests.py +++ b/tests/edit_tests.py @@ -15,8 +15,10 @@ import pywikibot from pywikibot import page_put_queue +from pywikibot import config from tests.aspects import unittest, TestCase +from tests.oauth_tests import OAuthSiteTestCase called_back = False @@ -71,6 +73,43 @@ self.assertTrue(p.text.endswith(ts)) self.assertTrue(p.text != ts) + +class OAuthEditTest(OAuthSiteTestCase): + + """Run edit test with OAuth enabled.""" + + family = 'wikipedia' + code = 'test' + + write = True + oauth = True + + def setUp(self): + """Set up test by checking site and initialization.""" + super(OAuthEditTest, self).setUp() + self._authenticate = config.authenticate + oauth_tokens = self.consumer_token + self.access_token + config.authenticate[self.site.hostname()] = oauth_tokens + + def tearDown(self): + """Tear down test by resetting config.authenticate.""" + config.authenticate = self._authenticate + + def test_edit(self): + """Test editing to a page.""" + self.site.login() + self.assertTrue(self.site.logged_in()) + ts = str(time.time()) + p = pywikibot.Page(self.site, + 'User:%s/edit test' % self.site.username()) + p.site.editpage(p, appendtext=ts) + revision_id = p.latest_revision_id + p = pywikibot.Page(self.site, + 'User:%s/edit test' % self.site.username()) + self.assertEqual(revision_id, p.latest_revision_id) + self.assertTrue(p.text.endswith(ts)) + + if __name__ == '__main__': try: unittest.main() diff --git a/tests/oauth_tests.py b/tests/oauth_tests.py index 111c0d8..8a7955e 100644 --- a/tests/oauth_tests.py +++ b/tests/oauth_tests.py @@ -19,11 +19,12 @@ from pywikibot.login import OauthLoginManager from tests.aspects import ( unittest, + TestCase, DefaultSiteTestCase, ) -class OAuthSiteTestCase(DefaultSiteTestCase): +class OAuthSiteTestCase(TestCase): """Run tests related to OAuth authentication.""" @@ -55,7 +56,14 @@ self.access_token = tokens[2:] -class TestOauthLoginManger(OAuthSiteTestCase): +class DefaultOAuthSiteTestCase(DefaultSiteTestCase, OAuthSiteTestCase): + + """Default OAuth site test.""" + + pass + + +class TestOauthLoginManger(DefaultOAuthSiteTestCase): """Test OAuth login manager.""" -- To view, visit https://gerrit.wikimedia.org/r/231576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1344b4496af9a9ebfb698ebb7e864c61e4833750 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: VcamX <vcamx3(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: jenkins-bot <>

1 0

Passed: wikimedia/pywikibot-core#2687 (master - 4ecd08c)
by Travis CI 19 Aug '15

19 Aug '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2687 Status: Passed Duration: 37 minutes and 20 seconds Commit: 4ecd08c (master) Author: jenkins-bot Message: Merge "[IMPR] remove unnecessary gen.set_query_increment(50) setting" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/2c0954f71c92...4ecd08c2… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/76229291 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] [IMPR] remove unnecessary gen.set_query_increment(50) setting - change (pywikibot/core)
by jenkins-bot (Code Review) 19 Aug '15

19 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: [IMPR] remove unnecessary gen.set_query_increment(50) setting ...................................................................... [IMPR] remove unnecessary gen.set_query_increment(50) setting APIGenerator.query_increment is set to 50 in constructor. It is superfluous to set this value again. Change-Id: Idfdd57683a6f922637daa80764390130f5110a39 --- M pywikibot/site.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved XZise: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 4e87cb6..ecda3e6 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -6532,7 +6532,6 @@ gen = api.APIGenerator('wbsearchentities', data_name='search', search=search, language=language, **kwargs) - gen.set_query_increment(50) if limit is not None: gen.set_maximum_items(limit) return gen -- To view, visit https://gerrit.wikimedia.org/r/231901 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idfdd57683a6f922637daa80764390130f5110a39 Gerrit-PatchSet: 2 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Passed: wikimedia/pywikibot-core#2686 (master - 2c0954f)
by Travis CI 18 Aug '15

18 Aug '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2686 Status: Passed Duration: 34 minutes and 29 seconds Commit: 2c0954f (master) Author: jenkins-bot Message: Merge "[L10N] Update Arabic (ar) for welcome.py" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/3d2f99a61b83...2c0954f7… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/76211997 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] [L10N] Update Arabic (ar) for welcome.py - change (pywikibot/core)
by jenkins-bot (Code Review) 18 Aug '15

18 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: [L10N] Update Arabic (ar) for welcome.py ...................................................................... [L10N] Update Arabic (ar) for welcome.py Bug: T109225 Change-Id: Ia013feb068ce5b80838f1f1ed45d6262dd1b859e --- M scripts/welcome.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/welcome.py b/scripts/welcome.py index bc3ae1f..9b8b515 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -173,8 +173,8 @@ # (C) Filnik, 2007-2011 # (C) Daniel Herding, 2007 # (C) Alex Shih-Han Lin, 2009-2010 -# (C) xqt, 2009-2011 -# (C) Pywikibot team, 2008-2010 +# (C) xqt, 2009-2015 +# (C) Pywikibot team, 2008-2015 # # Distributed under the terms of the MIT license. # @@ -265,6 +265,7 @@ 'zh-yue': u'{{歡迎}}--%s', }, 'wikinews': { + 'ar': '{{subst:ترحيب}} %s', 'fa': u'{{خوشامد۲|%s}}', 'it': u'{{subst:benvenuto}}', 'zh': u'{{subst:welcome}} %s', -- To view, visit https://gerrit.wikimedia.org/r/231892 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia013feb068ce5b80838f1f1ed45d6262dd1b859e 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: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

Fixed: wikimedia/pywikibot-core#2685 (master - 3d2f99a)
by Travis CI 18 Aug '15

18 Aug '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2685 Status: Fixed Duration: 40 minutes and 57 seconds Commit: 3d2f99a (master) Author: jenkins-bot Message: Merge "[FIX] replace: Support callable as replacement" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/56de91c48603...3d2f99a6… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/76198550 -- 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#2684 (master - 56de91c)
by Travis CI 18 Aug '15

18 Aug '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2684 Status: Fixed Duration: 39 minutes and 2 seconds Commit: 56de91c (master) Author: jenkins-bot Message: Merge "[FEAT] Test that replace applies title exceptions" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/903269ca0cc2...56de91c4… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/76194302 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] [FIX] replace: Support callable as replacement - change (pywikibot/core)
by jenkins-bot (Code Review) 18 Aug '15

18 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] replace: Support callable as replacement ...................................................................... [FIX] replace: Support callable as replacement Before 7a98d58f the replace script supports callables as a replacement when using a fix. But that patch it expected an iterable. This disables the check for invisible characters when the replacement is a callable. Change-Id: I1d64ba6d456a08a3da5662b66002ab5c417b61ce --- M scripts/replace.py M tests/data/fixes.py M tests/replacebot_tests.py 3 files changed, 18 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index 529c4da..6c5e97c 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -979,7 +979,8 @@ pywikibot.warning('The old string "{0}" contains formatting ' 'characters like U+200E'.format( chars.replace_invisible(replacement[0]))) - if chars.contains_invisible(replacement[1]): + if (not callable(replacement[1]) and + chars.contains_invisible(replacement[1])): pywikibot.warning('The new string "{0}" contains formatting ' 'characters like U+200E'.format( chars.replace_invisible(replacement[1]))) diff --git a/tests/data/fixes.py b/tests/data/fixes.py index 5c2fd0e..fcdf8c1 100644 --- a/tests/data/fixes.py +++ b/tests/data/fixes.py @@ -70,3 +70,10 @@ ('1', '2'), ] } + +fixes['no-msg-callable'] = { + 'regex': False, + 'replacements': [ + ('1', lambda match: str(match.start())), + ] +} diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py index cf3858f..03aee98 100644 --- a/tests/replacebot_tests.py +++ b/tests/replacebot_tests.py @@ -110,7 +110,8 @@ """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)) + if not callable(replacement.new): + self.assertEqual(replacement.new, str(offset * 2 + 2)) def _test_fix_replacement(self, replacement, length=1, offset=0, msg=False): """Test a replacement from a fix.""" @@ -230,6 +231,13 @@ self._apply(bot, 'Hello 2', title='Allowed') self._apply(bot, 'Hello 1', missing=True, title='Allowed Declined') + def test_fix_callable(self): + """Test fix replacements using a callable.""" + bot = self._get_bot(True, '-fix:no-msg-callable') + self.assertEqual(len(bot.replacements), 1) + self._test_fix_replacement(bot.replacements[0]) + self.assertTrue(callable(bot.replacements[0].new)) + if __name__ == '__main__': try: -- To view, visit https://gerrit.wikimedia.org/r/232010 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d64ba6d456a08a3da5662b66002ab5c417b61ce 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: jenkins-bot <>

1 0

[Gerrit] [FEAT] Test that replace applies title exceptions - change (pywikibot/core)
by jenkins-bot (Code Review) 18 Aug '15

18 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: [FEAT] Test that replace applies title exceptions ...................................................................... [FEAT] Test that replace applies title exceptions This adds a test to verify that the title exceptions specified by a fix are applied correctly with revision 20b289d3. Change-Id: Idde108ae9667707fffa0ceb20383cc6179b40470 --- M tests/data/fixes.py M tests/replacebot_tests.py 2 files changed, 49 insertions(+), 8 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/data/fixes.py b/tests/data/fixes.py index e750b98..5c2fd0e 100644 --- a/tests/data/fixes.py +++ b/tests/data/fixes.py @@ -59,3 +59,14 @@ ('5', '6'), ] } + +fixes['no-msg-title-exceptions'] = { + 'regex': False, + 'exceptions': { + 'title': ['Declined'], + 'require-title': ['Allowed'], + }, + 'replacements': [ + ('1', '2'), + ] +} diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py index 8898834..cf3858f 100644 --- a/tests/replacebot_tests.py +++ b/tests/replacebot_tests.py @@ -11,6 +11,8 @@ # import os +import pywikibot + from pywikibot import fixes from scripts import replace @@ -37,23 +39,22 @@ def setUp(self): """Replace the original bot class with a fake one.""" - class FakeReplaceBot(object): + class FakeReplaceBot(replace.ReplaceRobot): """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 + def __init__(inner_self, *args, **kwargs): + # Unpatch already here, as otherwise super calls will use + # this class' super which is the class itself + replace.ReplaceRobot = self._original_bot + super(FakeReplaceBot, inner_self).__init__(*args, **kwargs) self.bots.append(inner_self) def run(inner_self): """Nothing to do here.""" - pass + inner_self.changed_pages = -47 # show that run was called def patched_login(sysop=False): """Do nothing.""" @@ -122,6 +123,7 @@ else: self.assertIs(replacement.edit_summary, replacement.fix_set.edit_summary) + self.assertIs(replacement.fix_set, replacement.container) self.assertIsInstance(replacement.fix_set, replace.ReplacementList) self.assertIsInstance(replacement.fix_set, list) self.assertIn(replacement, replacement.fix_set) @@ -140,7 +142,24 @@ else: self.assertNotIn(self.SUMMARY_CONFIRMATION, self.inputs) self.assertEqual(bot.site, self.site) + self.assertEqual(bot.changed_pages, -47) return bot + + def _apply(self, bot, expected, missing=None, title='Test page'): + """Test applying a test change.""" + applied = set() + if missing is True: + required_applied = set() + else: + required_applied = set(bot.replacements) + if missing: + required_applied -= set(missing) + # shouldn't be edited anyway + page = pywikibot.Page(self.site, title) + self.assertEqual(expected, + bot.apply_replacements('Hello 1', applied, page)) + self.assertEqual(applied, required_applied) + self.assertEqual(expected, bot.doReplacements('Hello 1', page)) def test_only_cmd(self): """Test command line replacements only.""" @@ -200,6 +219,17 @@ self._test_replacement(bot.replacements[0]) self._test_fix_replacement(bot.replacements[1]) + def test_except_title(self): + """Test excepting and requiring a title specific to fix.""" + bot = self._get_bot(True, '-fix:no-msg-title-exceptions') + self.assertEqual(len(bot.replacements), 1) + self._test_fix_replacement(bot.replacements[0]) + self.assertIn('title', bot.replacements[0].exceptions) + self.assertIn('require-title', bot.replacements[0].exceptions) + self._apply(bot, 'Hello 1', missing=True, title='Neither') + self._apply(bot, 'Hello 2', title='Allowed') + self._apply(bot, 'Hello 1', missing=True, title='Allowed Declined') + if __name__ == '__main__': try: -- To view, visit https://gerrit.wikimedia.org/r/232016 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idde108ae9667707fffa0ceb20383cc6179b40470 Gerrit-PatchSet: 3 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [FIX] config2: Use list for _DifferentTypeError - change (pywikibot/core)
by jenkins-bot (Code Review) 18 Aug '15

18 Aug '15

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] config2: Use list for _DifferentTypeError ...................................................................... [FIX] config2: Use list for _DifferentTypeError In 32a6d0aa the _DifferentTypeError was introduced which additionally shows the valid types for a variable. The valid types need to be supplied via a list as it otherwise tries to iterate over a type. Change-Id: I8f1f7a6fa93e097fbcf41bbe0f285c1ba950d425 --- M pywikibot/config2.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index b103010..b8898fd 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -964,7 +964,7 @@ elif isinstance(value, int) and isinstance(default_value, float): return float(value) else: - raise _DifferentTypeError(name, type(value), type(default_value)) + raise _DifferentTypeError(name, type(value), [type(default_value)]) def _assert_types(name, value, types): -- To view, visit https://gerrit.wikimedia.org/r/232289 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f1f7a6fa93e097fbcf41bbe0f285c1ba950d425 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: jenkins-bot <>

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2015