Pywikibot-commits September 2015

pywikibot-commits@lists.wikimedia.org

2 participants
243 discussions

[Gerrit] [FIX] doc: Fix syntax issues - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] doc: Fix syntax issues ...................................................................... [FIX] doc: Fix syntax issues Instead of using two single quotes like in wikitext it's using the reST's syntax to write bold text using asterisks. Also separate lists by one newline from text. Change-Id: If2c86ba1ecce69b795646eb56d7104998f0dfeaa --- M pywikibot/bot.py M pywikibot/family.py M pywikibot/page.py 3 files changed, 7 insertions(+), 3 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 99a0d0f..104a45a 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -280,9 +280,10 @@ user interfaces (GUIs) without modifying the core bot code. The following output levels are defined: + - DEBUG: only for file logging; debugging messages. - STDOUT: output that must be sent to sys.stdout (for bots that may - have their output redirected to a file or other destination). + have their output redirected to a file or other destination). - VERBOSE: optional progress information for display to user. - INFO: normal (non-optional) progress information for display to user. - INPUT: prompts requiring user response. @@ -290,7 +291,7 @@ - ERROR: user error messages. - CRITICAL: fatal error messages. - Accordingly, do ''not'' use print statements in bot code; instead, + Accordingly, do **not** use print statements in bot code; instead, use pywikibot.output function. @param strm: Output stream. If None, re-uses the last stream if one @@ -1498,9 +1499,11 @@ and puts the page if needed. Option used: + * 'always' Keyword args used: + * 'async' - passed to page.save * 'summary' - passed to page.save * 'show_diff' - show changes between oldtext and newtext (enabled) diff --git a/pywikibot/family.py b/pywikibot/family.py index 642698b..148a539 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -952,7 +952,7 @@ Returns a string, not a compiled regular expression object. - This reads from the family file, and ''not'' from + This reads from the family file, and **not** from [[MediaWiki:Linktrail]], because the MW software currently uses a built-in linktrail from its message files and ignores the wiki value. diff --git a/pywikibot/page.py b/pywikibot/page.py index 180ad39..081c252 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4386,6 +4386,7 @@ Check whether the Claim's target is equal to specified value. The function checks for: + - ItemPage ID equality - WbTime year equality - Coordinate equality, regarding precision -- To view, visit https://gerrit.wikimedia.org/r/238708 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If2c86ba1ecce69b795646eb56d7104998f0dfeaa 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 <>

8 years, 7 months

Passed: wikimedia/pywikibot-core#2852 (master - 9a19dcf)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2852 Status: Passed Duration: 33 minutes and 56 seconds Commit: 9a19dcf (master) Author: Fabian Neundorf Message: [FIX] ModuleDeprecationWrapper: Update __dict__ On `__setattr__` calls, it did not update `__dict__` which caused it to return the old entry from the `__dict__` instead of the entry from the module. Change-Id: If366d01748f8743394635bfed47308389b3aec27 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/d4d49bf6fec8...9a19dcf8… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/80550266 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 7 months

Canceled: wikimedia/pywikibot-core#2851 (master - d4d49bf)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2851 Status: Canceled Duration: 9 minutes and 38 seconds Commit: d4d49bf (master) Author: jenkins-bot Message: Merge "[FIX] tests: Check the HTTPS connection" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/b7c62f626ed3...d4d49bf6… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/80543213 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 7 months

[Gerrit] [FIX] ModuleDeprecationWrapper: Update __dict__ - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] ModuleDeprecationWrapper: Update __dict__ ...................................................................... [FIX] ModuleDeprecationWrapper: Update __dict__ On `__setattr__` calls, it did not update `__dict__` which caused it to return the old entry from the `__dict__` instead of the entry from the module. Change-Id: If366d01748f8743394635bfed47308389b3aec27 --- M pywikibot/tools/__init__.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 1abf204..fa07047 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -1507,6 +1507,7 @@ def __setattr__(self, attr, value): """Set the value of the wrapped module.""" + self.__dict__[attr] = value setattr(self._module, attr, value) def __getattr__(self, attr): -- To view, visit https://gerrit.wikimedia.org/r/238651 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If366d01748f8743394635bfed47308389b3aec27 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 <>

8 years, 7 months

[Gerrit] [FIX] tests: Check the HTTPS connection - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] tests: Check the HTTPS connection ...................................................................... [FIX] tests: Check the HTTPS connection The certificates for `wdq.wmflabs.org` and `wikistats.wmflabs.org` have expired and although the hostname is checked before the test, it only checks the HTTP connection which is still fine and thus it won't skip it. This changes the tested hostnames to the actual hostnames tested. Change-Id: I96b9af0d8428145e084249cb6f0d6c4756b94a93 --- M tests/wikidataquery_tests.py M tests/wikistats_tests.py 2 files changed, 2 insertions(+), 10 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/wikidataquery_tests.py b/tests/wikidataquery_tests.py index 81ed4f9..b5ee548 100644 --- a/tests/wikidataquery_tests.py +++ b/tests/wikidataquery_tests.py @@ -231,11 +231,7 @@ """Test slow WikiDataQuery API functions.""" - sites = { - 'wdq': { - 'hostname': 'wdq.wmflabs.org', - }, - } + hostname = 'https://wdq.wmflabs.org/api' def testQueryApiGetter(self): """Test that we can actually retreive data and that caching works.""" diff --git a/tests/wikistats_tests.py b/tests/wikistats_tests.py index 6f2dff3..f9e727f 100644 --- a/tests/wikistats_tests.py +++ b/tests/wikistats_tests.py @@ -24,11 +24,7 @@ """Test WikiStats dump.""" - sites = { - 'wikistats': { - 'hostname': 'wikistats.wmflabs.org', - }, - } + hostname = 'https://wikistats.wmflabs.org/api.php' def test_sort(self): """Test sorted results.""" -- To view, visit https://gerrit.wikimedia.org/r/238457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I96b9af0d8428145e084249cb6f0d6c4756b94a93 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] Remove TestLoggingMixin - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Remove TestLoggingMixin ...................................................................... Remove TestLoggingMixin Custom logging for failed test methods is not necessary, as nose provides per-method logs. Bug: T58964 Change-Id: I1d3050d7a8a03058ab89a8c40eb8ab3565559728 --- M tests/aspects.py 1 file changed, 2 insertions(+), 62 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index 991a140..52971ab 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -43,7 +43,7 @@ import pywikibot.config2 as config -from pywikibot import log, Site +from pywikibot import Site from pywikibot.exceptions import ServerError, NoUsername from pywikibot.site import BaseSite from pywikibot.family import WikimediaFamily @@ -244,66 +244,6 @@ self.assertCountEqual(gen_titles, titles) assertPagelistTitles = assertPageTitlesEqual - - -class TestLoggingMixin(TestCaseBase): - - """Logging for test cases.""" - - @classmethod - def setUpClass(cls): - """Set up test class.""" - cls._log_prefix = inspect.getfile(cls) + ':' + cls.__name__ - - def setUp(self): - """Set up each unit test.""" - super(TestLoggingMixin, self).setUp() - - if hasattr(self, '_outcomeForDoCleanups'): - # Python 3 unittest & nose - outcome = self._outcomeForDoCleanups - elif hasattr(self, '_outcome'): - # Python 3.4 nose - outcome = self._outcome - elif hasattr(self, '_resultForDoCleanups'): - # Python 2 unittest & nose - outcome = self._resultForDoCleanups - else: - return - - self._previous_errors = len(outcome.errors) - # nose 3.4 doesn't has failures - if hasattr(outcome, 'failures'): - self._previous_failures = len(outcome.failures) - - log('START ' + self._log_prefix + '.' + self._testMethodName) - - def tearDown(self): - """Tear down test.""" - super(TestLoggingMixin, self).tearDown() - - if hasattr(self, '_outcomeForDoCleanups'): - # Python 3 unittest & nose - outcome = self._outcomeForDoCleanups - elif hasattr(self, '_outcome'): - # Python 3.4 nose - outcome = self._outcome - elif hasattr(self, '_resultForDoCleanups'): - # Python 2 unittest & nose - outcome = self._resultForDoCleanups - else: - return - - if len(outcome.errors) > self._previous_errors: - status = ' NOT OK: ERROR' - # nose 3.4 doesn't has failures - elif (hasattr(outcome, 'failures') and - len(outcome.failures) > self._previous_failures): - status = ' NOT OK: FAILURE' - else: - status = ' OK' - - log('END ' + self._log_prefix + '.' + self._testMethodName + status) class TestTimerMixin(TestCaseBase): @@ -850,7 +790,7 @@ @add_metaclass -class TestCase(TestTimerMixin, TestLoggingMixin, TestCaseBase): +class TestCase(TestTimerMixin, TestCaseBase): """Run tests on pre-defined sites.""" -- To view, visit https://gerrit.wikimedia.org/r/238614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d3050d7a8a03058ab89a8c40eb8ab3565559728 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

Errored: wikimedia/pywikibot-core#2849 (master - aaa130e)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2849 Status: Errored Duration: 40 minutes and 4 seconds Commit: aaa130e (master) Author: jenkins-bot Message: Merge "[FIX] ModuleDeprecationWrapper: Expose __dict__" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/c45791f10c36...aaa130e3… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/80529207 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 7 months

Fixed: wikimedia/pywikibot-core#2848 (master - c45791f)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2848 Status: Fixed Duration: 30 minutes and 45 seconds Commit: c45791f (master) Author: Fabian Neundorf Message: [FEAT] tests: Add decorator to check installs Some tests require that other parts are installed and currently this was always checked manually. This adds a decorator which defines which modules a method or class requires and skips the test if one of the modules can't be imported. Change-Id: Id581b427aa4b5414d94a94317d55be195f15e755 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/d341b2d8bb4d...c45791f1… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/80527758 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 7 months

[Gerrit] [FIX] ModuleDeprecationWrapper: Expose __dict__ - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] ModuleDeprecationWrapper: Expose __dict__ ...................................................................... [FIX] ModuleDeprecationWrapper: Expose __dict__ As the documentation is using the `__dict__` attribute to determine what to document the `ModuleDeprecationWrapper` is copying the module's dictionary. Bug: T74424 Change-Id: I14260be9daca09c32e6755777dd03250fed7dd81 --- M pywikibot/tools/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 2f77338..1abf204 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -1452,7 +1452,7 @@ module = sys.modules[module] super(ModuleDeprecationWrapper, self).__setattr__('_deprecated', {}) super(ModuleDeprecationWrapper, self).__setattr__('_module', module) - super(ModuleDeprecationWrapper, self).__setattr__('__doc__', module.__doc__) + self.__dict__.update(module.__dict__) if __debug__: sys.modules[module.__name__] = self -- To view, visit https://gerrit.wikimedia.org/r/238449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14260be9daca09c32e6755777dd03250fed7dd81 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 <>

8 years, 7 months

[Gerrit] [FEAT] tests: Add decorator to check installs - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FEAT] tests: Add decorator to check installs ...................................................................... [FEAT] tests: Add decorator to check installs Some tests require that other parts are installed and currently this was always checked manually. This adds a decorator which defines which modules a method or class requires and skips the test if one of the modules can't be imported. Change-Id: Id581b427aa4b5414d94a94317d55be195f15e755 --- M tests/aspects.py M tests/interwiki_graph_tests.py M tests/oauth_tests.py M tests/proofreadpage_tests.py M tests/textlib_tests.py M tests/weblinkchecker_tests.py 6 files changed, 32 insertions(+), 44 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index 991a140..3fdb963 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -331,6 +331,25 @@ super(TestTimerMixin, self).tearDown() +def require_modules(*required_modules): + """Require that the given list of modules can be imported.""" + def test_requirement(obj): + """Test the requirement and return an optionally decorated object.""" + missing = [] + for required_module in required_modules: + try: + __import__(required_module, globals(), locals(), [], 0) + except ImportError: + missing += [required_module] + if missing: + return unittest.skip('{0} not installed'.format( + ', '.join(missing)))(obj) + else: + return obj + + return test_requirement + + class DisableSiteMixin(TestCaseBase): """Test cases not connected to a Site object. diff --git a/tests/interwiki_graph_tests.py b/tests/interwiki_graph_tests.py index fa4d539..57a4039 100644 --- a/tests/interwiki_graph_tests.py +++ b/tests/interwiki_graph_tests.py @@ -12,10 +12,11 @@ from pywikibot import interwiki_graph -from tests.aspects import unittest, SiteAttributeTestCase +from tests.aspects import unittest, require_modules, SiteAttributeTestCase from tests.utils import DryPage +@require_modules('pydot') class TestWiktionaryGraph(SiteAttributeTestCase): """Tests for interwiki links to local sites.""" @@ -39,8 +40,6 @@ @classmethod def setUpClass(cls): """Setup test class.""" - if isinstance(interwiki_graph.pydot, ImportError): - raise unittest.SkipTest('pydot not installed') super(TestWiktionaryGraph, cls).setUpClass() cls.pages = { diff --git a/tests/oauth_tests.py b/tests/oauth_tests.py index a0210de..ecb9fb2 100644 --- a/tests/oauth_tests.py +++ b/tests/oauth_tests.py @@ -11,31 +11,21 @@ import os -try: - import mwoauth -except ImportError as e: - mwoauth = e - from pywikibot.login import OauthLoginManager from tests.aspects import ( unittest, + require_modules, TestCase, DefaultSiteTestCase, ) +@require_modules('mwoauth') class OAuthSiteTestCase(TestCase): """Run tests related to OAuth authentication.""" oauth = True - - @classmethod - def setUpClass(cls): - """Check if mwoauth is installed.""" - super(OAuthSiteTestCase, cls).setUpClass() - if isinstance(mwoauth, ImportError): - raise unittest.SkipTest('mwoauth not installed') def _get_oauth_tokens(self): """Get valid OAuth tokens from environment variables.""" diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index 6bf2181..cf3cc2b 100644 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -11,16 +11,11 @@ import json -try: - from bs4 import BeautifulSoup -except ImportError as e: - BeautifulSoup = e - import pywikibot from pywikibot.data import api from pywikibot.proofreadpage import IndexPage, ProofreadPage -from tests.aspects import unittest, TestCase +from tests.aspects import unittest, require_modules, TestCase from tests.basepage_tests import ( BasePageMethodsTestBase, @@ -207,16 +202,12 @@ self.assertEqual(json.loads(page_text), json.loads(loaded_text)) +@require_modules('bs4') class IndexPageTestCase(TestCase): """Run tests related to IndexPage ProofreadPage extension.""" - @classmethod - def setUpClass(cls): - """Check if beautifulsoup4 is installed.""" - super(IndexPageTestCase, cls).setUpClass() - if isinstance(BeautifulSoup, ImportError): - raise unittest.SkipTest('beautifulsoup4 not installed') + pass class TestIndexPageInvalidSite(IndexPageTestCase): diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index adb7c21..f5e3bad 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -14,11 +14,6 @@ import os import re -try: - import mwparserfromhell -except ImportError as e: - mwparserfromhell = e - import pywikibot import pywikibot.textlib as textlib @@ -26,7 +21,9 @@ from pywikibot.site import _IWEntry from pywikibot.tools import OrderedDict -from tests.aspects import unittest, TestCase, DefaultDrySiteTestCase +from tests.aspects import ( + unittest, require_modules, TestCase, DefaultDrySiteTestCase, +) files = {} dirname = os.path.join(os.path.dirname(__file__), "pages") @@ -353,11 +350,9 @@ ('2', u'd')])), ('b', OrderedDict([('1', 'c')]))]) + @require_modules('mwparserfromhell') def test_extract_templates_params_mwpfh(self): """Test using mwparserfromhell.""" - if isinstance(mwparserfromhell, ImportError): - raise unittest.SkipTest('mwparserfromhell not available') - func = textlib.extract_templates_and_params_mwpfh self._common_results(func) self._order_differs(func) diff --git a/tests/weblinkchecker_tests.py b/tests/weblinkchecker_tests.py index 280a2e9..7526745 100644 --- a/tests/weblinkchecker_tests.py +++ b/tests/weblinkchecker_tests.py @@ -19,20 +19,14 @@ from scripts import weblinkchecker -from tests.aspects import unittest, TestCase, TestCaseBase +from tests.aspects import unittest, require_modules, TestCase, TestCaseBase from tests import weblib_tests +@require_modules('memento_client') class MementoTestBase(TestCaseBase): """Test memento client.""" - - @classmethod - def setUpClass(cls): - """Set up test class.""" - if isinstance(weblinkchecker.memento_client, ImportError): - raise unittest.SkipTest('memento_client not imported') - super(MementoTestBase, cls).setUpClass() def _get_archive_url(self, url, date_string=None): if date_string is None: -- To view, visit https://gerrit.wikimedia.org/r/238353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id581b427aa4b5414d94a94317d55be195f15e755 Gerrit-PatchSet: 5 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 <>

8 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2015