Pywikibot-commits December 2014

pywikibot-commits@lists.wikimedia.org

2 participants
317 discussions

[Gerrit] Fix cache username test - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix cache username test ...................................................................... Fix cache username test Change-Id: I069756e9a3a6dbe900b8176cacf97b5f9d37f0d7 --- M tests/cache_tests.py 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Nullzero: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/cache_tests.py b/tests/cache_tests.py index 241f2d7..020dd1e 100644 --- a/tests/cache_tests.py +++ b/tests/cache_tests.py @@ -25,9 +25,8 @@ self.assertIsInstance(entry.site, BaseSite) self.assertIsInstance(entry.site._loginstatus, int) self.assertIsInstance(entry.site._username, list) - print(entry.site._loginstatus, entry.site._username) - self.assertTrue(bool(entry.site._loginstatus < 1) != - bool(entry.site._username[0])) + if entry.site._loginstatus >= 1: + self.assertIsNotNone(entry.site._username[0]) self.assertIsInstance(entry._params, dict) self.assertIsNotNone(entry._params) # TODO: more tests on entry._params, and possibly fixes needed -- To view, visit https://gerrit.wikimedia.org/r/177959 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I069756e9a3a6dbe900b8176cacf97b5f9d37f0d7 Gerrit-PatchSet: 1 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: Nullzero <nullzero.free(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

9 years, 4 months

Failed: jayvdb/pywikibot-core#118 (cache-test-fixup - adaa52a)

by Travis CI

Build Update for jayvdb/pywikibot-core ------------------------------------- Build: #118 Status: Failed Duration: 37 minutes and 3 seconds Commit: adaa52a (cache-test-fixup) Author: John Vandenberg Message: Fix cache username test Change-Id: I069756e9a3a6dbe900b8176cacf97b5f9d37f0d7 View the changeset: https://github.com/jayvdb/pywikibot-core/compare/eedef173c176^...adaa52a93f… View the full build log and details: https://travis-ci.org/jayvdb/pywikibot-core/builds/43170349 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 4 months

Broken: wikimedia/pywikibot-core#1754 (master - ec7bd72)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1754 Status: Broken Duration: 41 minutes and 35 seconds Commit: ec7bd72 (master) Author: jenkins-bot Message: Merge "Add cache test" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/a9aa7385f30c...ec7bd72e… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/43168247 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 4 months

[Gerrit] Add cache test - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add cache test ...................................................................... Add cache test This test attempts to validate all cache entries, at the end of the build as a sanity check. DataSite cache entries were failing to load due to having a different __init__ signature from APISite. CacheEntry.params renamed to _params to reflect changes in the Request object. Change-Id: I64b685776ad10611c91631e1937613e846972824 --- M .gitignore M pywikibot/site.py M scripts/maintenance/cache.py M tests/__init__.py A tests/cache_tests.py 5 files changed, 51 insertions(+), 6 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Nullzero: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 54297a7..16842b7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,8 @@ /*.egg /data* logs* -*cache* +*apicache* +*pycache* .idea pywikibot.egg-info/ pywikibot/families/ diff --git a/pywikibot/site.py b/pywikibot/site.py index 8cf9f60..3265eb6 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -4855,7 +4855,7 @@ """Wikibase data capable site.""" - def __init__(self, code, fam, user, sysop): + def __init__(self, code, fam=None, user=None, sysop=None): """Constructor.""" APISite.__init__(self, code, fam, user, sysop) self._item_namespace = None diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py index 15dbc88..0d7ed2e 100644 --- a/scripts/maintenance/cache.py +++ b/scripts/maintenance/cache.py @@ -158,15 +158,17 @@ (site, username, login_status, params) = self._parsed_key else: (site, username, login_status, params) = self.parse_key() - if site: - self.site = eval(site) + if not site: + raise ParseError('No Site') + self.site = eval(site) if login_status: self.site._loginstatus = eval('LoginStatus.%s' % login_status[12:-1]) if username: self.site._username = [username, username] - if params: - self.params = dict(eval(params)) + if not params: + raise ParseError('No request params') + self._params = dict(eval(params)) def _delete(self): """ Delete the cache entry. """ diff --git a/tests/__init__.py b/tests/__init__.py index b903565..0688f98 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -86,6 +86,7 @@ 'script', 'archivebot', 'data_ingestion', + 'cache', ] disabled_test_modules = [ diff --git a/tests/cache_tests.py b/tests/cache_tests.py new file mode 100644 index 0000000..241f2d7 --- /dev/null +++ b/tests/cache_tests.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +"""API Request cache tests.""" +# +# (C) Pywikibot team, 2012-2014 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' +# + +from pywikibot.site import BaseSite +import scripts.maintenance.cache as cache + +from tests import _cache_dir +from tests.aspects import unittest, TestCase + + +class RequestCacheTests(TestCase): + + """Validate cache entries.""" + + net = False + + def _check_cache_entry(self, entry): + self.assertIsInstance(entry.site, BaseSite) + self.assertIsInstance(entry.site._loginstatus, int) + self.assertIsInstance(entry.site._username, list) + print(entry.site._loginstatus, entry.site._username) + self.assertTrue(bool(entry.site._loginstatus < 1) != + bool(entry.site._username[0])) + self.assertIsInstance(entry._params, dict) + self.assertIsNotNone(entry._params) + # TODO: more tests on entry._params, and possibly fixes needed + # to make it closely replicate the original object. + + def test_cache(self): + cache.process_entries(_cache_dir, self._check_cache_entry) + + +if __name__ == '__main__': + unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/171514 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64b685776ad10611c91631e1937613e846972824 Gerrit-PatchSet: 1 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: Maverick <manpreetkaur9411(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Nullzero <nullzero.free(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

9 years, 4 months

Canceled: jayvdb/pywikibot-core#115 (travis-site_only - 7d5dc15)

by Travis CI

Build Update for jayvdb/pywikibot-core ------------------------------------- Build: #115 Status: Canceled Duration: 18 minutes and 39 seconds Commit: 7d5dc15 (travis-site_only) Author: John Vandenberg Message: Run site tests only on fr.wikt and test.wd Change-Id: I60f4b87ff414ba9ab32abc39bf2a90801056c8a5 View the changeset: https://github.com/jayvdb/pywikibot-core/compare/a09fa8e28f82^...7d5dc15648… View the full build log and details: https://travis-ci.org/jayvdb/pywikibot-core/builds/43165748 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 4 months

Passed: wikimedia/pywikibot-core#1753 (master - a9aa738)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1753 Status: Passed Duration: 46 minutes and 58 seconds Commit: a9aa738 (master) Author: jenkins-bot Message: Merge "Replace cosmetic change 'validXhtml' with 'HTML' fix" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/a3a5e930e77f...a9aa7385… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/43144212 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 4 months

Passed: wikimedia/pywikibot-core#1752 (master - a3a5e93)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1752 Status: Passed Duration: 48 minutes and 12 seconds Commit: a3a5e93 (master) Author: jenkins-bot Message: Merge "Copy sysop attribute from bases" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/e6888ebee83e...a3a5e930… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/43143681 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 4 months

[Gerrit] Replace cosmetic change 'validXhtml' with 'HTML' fix - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Replace cosmetic change 'validXhtml' with 'HTML' fix ...................................................................... Replace cosmetic change 'validXhtml' with 'HTML' fix MediaWiki 1.16+ $wgWellFormedXml defaults to converting to when rendering, making this cosmetic change unnecessary, and undesirable to be performing it in every save operation. Re-adding it as part of the 'HTML' fix which can be applied as desired, e.g. versions prior to 1.16, cleaning the underlying wikitext. It was disabled from the HTML fix in compat dcf27d0c: https://www.mediawiki.org/wiki/Special:Code/pywikipedia/991 Bug: 55236 Change-Id: I27789904778c6d86dc6897d88215939f22fe68ca --- M pywikibot/fixes.py M scripts/cosmetic_changes.py 2 files changed, 2 insertions(+), 8 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Nullzero: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py index a59f110..5a7f09e 100644 --- a/pywikibot/fixes.py +++ b/pywikibot/fixes.py @@ -68,9 +68,9 @@ # Keep in mind that MediaWiki automatically converts to # when rendering pages, so you might comment the next two lines out # to save some time/edits. - # (r'(?i) ', r' '), + (r'(?i) ', r' '), # linebreak with attributes - # (r'(?i) /]+?)>', r' '), + (r'(?i) /]+?)>', r' '), (r'(?i)(.*?)', r"'''\1'''"), (r'(?i)(.*?)', r"'''\1'''"), (r'(?i)(.*?)', r"''\1''"), diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py index e9437a1..f1f1c2c 100755 --- a/scripts/cosmetic_changes.py +++ b/scripts/cosmetic_changes.py @@ -184,7 +184,6 @@ # FIXME: self.translateMagicWords, self.replaceDeprecatedTemplates, # FIXME: self.resolveHtmlEntities, - self.validXhtml, self.removeUselessSpaces, self.removeNonBreakingSpaceBeforePercent, @@ -576,11 +575,6 @@ if self.template: ignore += [58] text = pywikibot.html2unicode(text, ignore=ignore) - return text - - def validXhtml(self, text): - text = textlib.replaceExcept(text, r'(?i)<br[ /]*>', r' ', - ['comment', 'math', 'nowiki', 'pre']) return text def removeUselessSpaces(self, text): -- To view, visit https://gerrit.wikimedia.org/r/176640 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27789904778c6d86dc6897d88215939f22fe68ca 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: Nullzero <nullzero.free(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

9 years, 4 months

[Gerrit] Copy sysop attribute from bases - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Copy sysop attribute from bases ...................................................................... Copy sysop attribute from bases Change-Id: Iceb61afbbaf17c351b202b1e0dfa9fa13a08ac00 --- M tests/aspects.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Nullzero: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index b19df47..d3dbb0b 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -465,9 +465,9 @@ # Inherit superclass attributes for base in bases: - for key in ('pwb', 'net', 'site', 'wikibase', 'user', 'write', + for key in ('pwb', 'net', 'site', 'user', 'sysop', 'write', 'sites', 'family', 'code', 'dry', - 'cached', 'cacheinfo'): + 'cached', 'cacheinfo', 'wikibase'): if hasattr(base, key) and key not in dct: # print('%s has %s; copying to %s' # % (base.__name__, key, name)) -- To view, visit https://gerrit.wikimedia.org/r/171212 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iceb61afbbaf17c351b202b1e0dfa9fa13a08ac00 Gerrit-PatchSet: 3 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: Nullzero <nullzero.free(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

9 years, 4 months

Passed: jayvdb/pywikibot-core#113 (test-preload-workarounds - ab6a806)

by Travis CI

Build Update for jayvdb/pywikibot-core ------------------------------------- Build: #113 Status: Passed Duration: 38 minutes and 28 seconds Commit: ab6a806 (test-preload-workarounds) Author: John Vandenberg Message: Preloading: workaround problems with api module QueryGenerator emits pagedata for the same Page many times. update_page should set _templates and _langlinks to empty lists when the page does not contain them. langlinks are currently broken until Family.langs is dynamic. Change-Id: Ie89f9ee68d2206c1aaa707c44c314710ad00494a View the changeset: https://github.com/jayvdb/pywikibot-core/compare/e6888ebee83e^...ab6a806ee6… View the full build log and details: https://travis-ci.org/jayvdb/pywikibot-core/builds/43105493 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2014