Pywikibot-commits December 2015

pywikibot-commits@lists.wikimedia.org

2 participants
57 discussions

[Gerrit] Prevent AttributeError for when filename is None - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Prevent AttributeError for when filename is None ...................................................................... Prevent AttributeError for when filename is None >From line 172, filename can be None. Such a case would raise an AttributeError when handling the RuntimeError. Bug: T121835 Change-Id: I02510d6e69269881dc1ae4b3ed0b9c65156cddbc --- M pwb.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mpaa: Looks good to me, approved Hazard-SJ: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 601c2d4..fe2eeec 100755 --- a/pwb.py +++ b/pwb.py @@ -206,7 +206,7 @@ except RuntimeError as err: # user-config.py to be created print("NOTE: 'user-config.py' was not found!") - if not filename.startswith('generate_'): + if filename is not None and not filename.startswith('generate_'): print("Please follow the prompts to create it:") run_python_file('generate_user_files.py', ['generate_user_files.py'], -- To view, visit https://gerrit.wikimedia.org/r/260719 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02510d6e69269881dc1ae4b3ed0b9c65156cddbc Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: 2.0 Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Hazard-SJ <hazardsjwiki(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

8 years, 4 months

[Gerrit] Prevent AttributeError for when filename is None - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Prevent AttributeError for when filename is None ...................................................................... Prevent AttributeError for when filename is None >From line 172, filename can be None. Such a case would raise an AttributeError when handling the RuntimeError. Bug: T121835 Change-Id: I02510d6e69269881dc1ae4b3ed0b9c65156cddbc --- M pwb.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 84ca3aa..81ecb85 100755 --- a/pwb.py +++ b/pwb.py @@ -187,7 +187,7 @@ except RuntimeError as err: # user-config.py to be created print("NOTE: 'user-config.py' was not found!") - if not filename.startswith('generate_'): + if filename is not None and not filename.startswith('generate_'): print("Please follow the prompts to create it:") run_python_file('generate_user_files.py', ['generate_user_files.py'], -- To view, visit https://gerrit.wikimedia.org/r/260717 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02510d6e69269881dc1ae4b3ed0b9c65156cddbc Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Hazard-SJ <hazardsjwiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 4 months

[Gerrit] page.py: define args as keyword args in page._save() - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: page.py: define args as keyword args in page._save() ...................................................................... page.py: define args as keyword args in page._save() Explicitly define args as keyword args. Also reorder _save args to be consistent with the order of save args. Change-Id: I6c38435a170838370172721bd3c7acbd93b3597b --- M pywikibot/page.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index b4ffaf4..34f30b6 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1124,18 +1124,18 @@ raise pywikibot.OtherPageSaveError( self, "Editing restricted by {{bots}} template") if async: - pywikibot.async_request(self._save, summary=summary, minor=minor, - watch=watch, botflag=botflag, + pywikibot.async_request(self._save, summary=summary, watch=watch, + minor=minor, botflag=botflag, async=async, callback=callback, cc=apply_cosmetic_changes, quiet=quiet, **kwargs) else: - self._save(summary=summary, minor=minor, watch=watch, + self._save(summary=summary, watch=watch, minor=minor, botflag=botflag, async=async, callback=callback, - cc=apply_cosmetic_changes, **kwargs) + cc=apply_cosmetic_changes, quiet=quiet, **kwargs) - def _save(self, summary, minor, watch, botflag, async, callback, - cc, quiet=False, **kwargs): + def _save(self, summary=None, watch=None, minor=True, botflag=None, + async=False, callback=None, cc=None, quiet=False, **kwargs): """Helper function for save().""" err = None link = self.title(asLink=True) -- To view, visit https://gerrit.wikimedia.org/r/248713 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c38435a170838370172721bd3c7acbd93b3597b Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

8 years, 4 months

[Gerrit] Fix limit argument parser - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix limit argument parser ...................................................................... Fix limit argument parser '-limit' was parsed as including a value instead of prompting for a value, causing a ValueError. Change-Id: Iea57e1bb8cc5823cc01420636d04752a5fb2f3f7 --- M scripts/checkimages.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 762f6d6..91468f6 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -1595,7 +1595,7 @@ # Here below there are the parameters. for arg in pywikibot.handle_args(args): if arg.startswith('-limit'): - if len(arg) == 7: + if len(arg) == 6: limit = int(pywikibot.input( u'How many files do you want to check?')) else: -- To view, visit https://gerrit.wikimedia.org/r/257848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea57e1bb8cc5823cc01420636d04752a5fb2f3f7 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Murfel <murnatty(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 4 months

[Gerrit] Subpage filter generator - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Subpage filter generator ...................................................................... Subpage filter generator * Filter that excludes subpages that have a high depth i.e. how many parents * Siteinfo converts boolean properties (that we use) into actual boolean values * Page.depth returns the subpage depth * Page._namespace_obj returns the Namespace object, rather than the int Namespace id * Update interwiki script to use 'content' property of Namespace (which is now a boolean) for page_empty_check() * Unit tests for above Bug: T121323 Change-Id: Ia53580cf8ad7387c14d6ca3bf4fcf5b35f53edd4 --- M pywikibot/page.py M pywikibot/pagegenerators.py M pywikibot/site.py M scripts/interwiki.py M tests/page_tests.py M tests/pagegenerators_tests.py M tests/site_tests.py 7 files changed, 161 insertions(+), 3 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index aa90752..c35c6cf 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -176,6 +176,12 @@ return self._link.namespace @property + def _namespace_obj(self): + """Return the namespace object of the page.""" + # TODO: T104864: Temporary until Page.namespace() is consistent + return self.site.namespaces[self.namespace()] + + @property def content_model(self): """Return the content model for this page. @@ -187,6 +193,20 @@ self.site.loadpageinfo(self) return self._contentmodel + @property + def depth(self): + """Return the depth/subpage level of the page.""" + if not hasattr(self, '_depth'): + # Check if the namespace allows subpages + if self._namespace_obj.subpages: + # Count how many '/'s we have in the title + _depth = len(list(re.finditer('/', self.title()))) + else: + # Does not allow subpages, which means depth is always 0 + _depth = 0 + + return _depth + @deprecated_args(decode=None, savetitle="asUrl") def title(self, underscore=False, withNamespace=True, withSection=True, asUrl=False, asLink=False, diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 9198dca..e205ff6 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -190,6 +190,10 @@ of pages, only retrieve n pages at a time from the wiki server. +-subpage:n Filters pages to only those that have depth n + i.e. a depth of 0 filters out all pages that are subpages, and + a depth of 1 filters out all pages that are subpages of subpages. + -titleregex A regular expression that needs to match the article title otherwise the page won't be returned. Multiple -titleregex:regexpr can be provided and the page will @@ -339,6 +343,7 @@ self.titlefilter_list = [] self.claimfilter_list = [] self.intersect = False + self.subpage_max_depth = None self._site = site @property @@ -406,9 +411,10 @@ if self.limit: self.gens[i] = itertools.islice(self.gens[i], self.limit) if len(self.gens) == 0: - if self.titlefilter_list or self.articlefilter_list: + if self.titlefilter_list or self.articlefilter_list or \ + self.claimfilter_list or self.subpage_max_depth is not None: pywikibot.warning( - 'grep/titleregex filters specified but no generators.') + 'filter(s) specified but no generators.') return None elif len(self.gens) == 1: gensList = self.gens[0] @@ -424,6 +430,11 @@ else: gensList = CombinedPageGenerator(self.gens) dupfiltergen = self._filter_unique(gensList) + + # Add on subpage filter generator + if self.subpage_max_depth is not None: + dupfiltergen = SubpageFilterGenerator( + dupfiltergen, self.subpage_max_depth) if self.claimfilter_list: dupfiltergen = PreloadingItemGenerator(dupfiltergen) @@ -799,6 +810,13 @@ gen = MySQLPageGenerator(query, site=self.site) elif arg.startswith('-intersect'): self.intersect = True + return True + elif arg.startswith('-subpage'): + max_depth = arg[len('-subpage:'):] + if not max_depth: + max_depth = pywikibot.input( + 'Maximum subpage depth:') + self.subpage_max_depth = int(max_depth) return True elif arg.startswith('-logevents:'): gen = self._parse_log_events(*arg[len('-logevents:'):].split(',')) @@ -1376,6 +1394,32 @@ ItemClaimFilterPageGenerator = ItemClaimFilter.filter +def SubpageFilterGenerator(generator, max_depth=0, show_filtered=False): + """ + Generator which filters out subpages based on depth. + + It looks at the namespace of each page and checks if that namespace has + subpages enabled. If so, pages with forward slashes ('/') are excluded. + + @param generator: A generator object + @type generator: any generator or iterator + @param max_depth: Max depth of subpages to yield, at least zero + @type max_depth: int + @param show_filtered: Output a message for each page not yielded + @type show_filtered: bool + """ + assert max_depth >= 0, 'Max subpage depth must be at least 0' + + for page in generator: + if page.depth <= max_depth: + yield page + else: + if show_filtered: + pywikibot.output( + 'Page %s is a subpage that is too deep. Skipping.' + % page) + + class RegexFilter(object): """Regex filter.""" diff --git a/pywikibot/site.py b/pywikibot/site.py index 0c486d7..0d7623d 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -1372,6 +1372,29 @@ WARNING_REGEX = re.compile(u"^Unrecognized values? for parameter " u"'siprop': ([^,]+(?:, [^,]+)*)$") + # Until we get formatversion=2, we have to convert empty-string properties + # into booleans so they are easier to use. + BOOLEAN_PROPS = { + 'general': [ + 'imagewhitelistenabled', + 'langconversion', + 'titleconversion', + 'rtl', + 'readonly', + 'writeapi', + 'variantarticlepath', + 'misermode', + ], + 'namespaces': [ # for each namespace + 'subpages', + 'content', + 'nonincludable', + ], + 'magicwords': [ # for each magicword + 'case-sensitive', + ], + } + def __init__(self, site): """Initialise it with an empty cache.""" self._site = site @@ -1412,12 +1435,32 @@ """Do some default handling of data. Directly modifies data.""" # Be careful with version tests inside this here as it might need to # query this method to actually get the version number + if prop == 'general': if 'articlepath' not in data: # Introduced in 1.16.0 # Old version of MediaWiki, extract from base path = urlparse(data['base'])[2].rsplit('/', 1)[0] + '/$1' data['articlepath'] = path + # Convert boolean props from empty strings to actual boolean values + if prop in Siteinfo.BOOLEAN_PROPS.keys(): + # siprop=namespaces and magicwords has properties per item in result + if prop == 'namespaces' or prop == 'magicwords': + for index, value in enumerate(data): + # namespaces uses a dict, while magicwords uses a list + key = index if type(data) is list else value + for p in Siteinfo.BOOLEAN_PROPS[prop]: + if p in data[key]: + data[key][p] = True + else: + data[key][p] = False + else: + for p in Siteinfo.BOOLEAN_PROPS[prop]: + if p in data: + data[p] = True + else: + data[p] = False + def _get_siteinfo(self, prop, expiry): """ Retrieve a siteinfo property. diff --git a/scripts/interwiki.py b/scripts/interwiki.py index dcd2095..5bf3dee 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -2466,7 +2466,7 @@ @rtype: bool """ # Check if the page is in content namespace - if page.namespace() == 0: + if page._namespace_obj.content: # Check if the page contains at least 50 characters return len(page.text) < 50 else: diff --git a/tests/page_tests.py b/tests/page_tests.py index 73bb2d3..1cc6248 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -516,6 +516,21 @@ page_copy.isDisambig() self.assertTrue(page_copy.isRedirectPage()) + def test_depth(self): + """Test page depth calculation.""" + site = self.get_site() + page_d0 = pywikibot.Page(site, '/home/test/') + if site.namespaces[0].subpages: + self.assertEqual(page_d0.depth, 3) + else: + self.assertEqual(page_d0.depth, 0) + + page_user_d0 = pywikibot.Page(site, 'User:Sn1per') + self.assertEqual(page_user_d0.depth, 0) + + page_d3 = pywikibot.Page(site, 'User:Sn1per/ProtectTest1/test/test') + self.assertEqual(page_d3.depth, 3) + class TestPageDeprecation(DefaultSiteTestCase, DeprecationTestCase): diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 5c5e207..3936fca 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -22,6 +22,7 @@ from pywikibot.pagegenerators import ( PagesFromTitlesGenerator, PreloadingGenerator, + CategorizedPageGenerator ) from tests import join_data_path @@ -233,6 +234,33 @@ self.assertEqual(len(list(gen)), 0) +class SubpageFilterGeneratorTestCase(TestCase): + + """Test SubpageFilterGenerator.""" + + family = 'test' + code = 'test' + + def test_subpage_filter(self): + site = self.get_site() + test_cat = pywikibot.Category(site, 'Subpage testing') + + gen = CategorizedPageGenerator(test_cat) + gen = pagegenerators.SubpageFilterGenerator(gen, 0) + expect_0 = ('/home/test',) + self.assertPagelistTitles(gen, titles=expect_0, site=site) + + gen = CategorizedPageGenerator(test_cat) + gen = pagegenerators.SubpageFilterGenerator(gen, 3) + expect_3 = ( + '/home/test', + 'User:Sn1per/ProtectTest1/test', + 'User:Sn1per/ProtectTest1/test/test', + 'User:Sn1per/sandbox', + ) + self.assertPagelistTitles(gen, titles=expect_3, site=site) + + class TestRepeatingGenerator(RecentChangesTestCase): """Test RepeatingGenerator.""" diff --git a/tests/site_tests.py b/tests/site_tests.py index ab547f7..d2cfcd1 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -2015,6 +2015,14 @@ self.assertRegex(mysite.siteinfo['timezone'], "([A-Z]{3,4}|[A-Z][a-z]+/[A-Z][a-z]+)") self.assertIn(mysite.siteinfo['case'], ["first-letter", "case-sensitive"]) + def test_siteinfo_boolean(self): + """Test conversion of boolean properties from empty strings to True/False.""" + mysite = self.get_site() + self.assertIsInstance(mysite.siteinfo['titleconversion'], bool) + + self.assertIsInstance(mysite.namespaces[0].subpages, bool) + self.assertIsInstance(mysite.namespaces[0].content, bool) + def test_siteinfo_v1_16(self): """Test v.16+ siteinfo values.""" if MediaWikiVersion(self.site.version()) < MediaWikiVersion('1.16'): -- To view, visit https://gerrit.wikimedia.org/r/258422 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia53580cf8ad7387c14d6ca3bf4fcf5b35f53edd4 Gerrit-PatchSet: 20 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Sn1per <geofbot(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

8 years, 4 months

[Gerrit] Add mechanism for removing qualifiers - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add mechanism for removing qualifiers ...................................................................... Add mechanism for removing qualifiers Adds mechanisms for removing qualifiers, similar to existing ones for removing sources, by connecting to the wbremovequalifiers API call. Also adds tests for this mechanism to wikibase_edit_tests Bug: T119963 Change-Id: Id69451e5cb3e5b037b2eace61472356fffd40cde --- M pywikibot/page.py M pywikibot/site.py M tests/wikibase_edit_tests.py 3 files changed, 129 insertions(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index aa90752..a40cca5 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4410,6 +4410,27 @@ else: self.qualifiers[qualifier.getID()] = [qualifier] + def removeQualifier(self, qualifier, **kwargs): + """ + Remove the qualifier. Calls removeQualifiers(). + + @param qualifier: the qualifier to remove + @type qualifier: Claim + """ + self.removeQualifiers([qualifier], **kwargs) + + def removeQualifiers(self, qualifiers, **kwargs): + """ + Remove the qualifiers. + + @param qualifiers: the qualifiers to remove + @type qualifiers: list Claim + """ + data = self.repo.remove_qualifiers(self, qualifiers, **kwargs) + self.on_item.latest_revision_id = data['pageinfo']['lastrevid'] + for qualifier in qualifiers: + self.qualifiers[qualifier.getID()].remove(qualifier) + def target_equals(self, value): """ Check whether the Claim's target is equal to specified value. diff --git a/pywikibot/site.py b/pywikibot/site.py index 1f987e6..361bf4c 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -7060,7 +7060,7 @@ """ Remove claims. - @param claims: Claims to be added + @param claims: Claims to be removed @type claims: list of Claim @param bot: Whether to mark the edit as a bot edit @type bot: bool @@ -7123,6 +7123,38 @@ return data @must_be(group='user') + def remove_qualifiers(self, claim, qualifiers, + bot=True, summary=None, baserevid=None): + """ + Remove qualifiers. + + @param claim: A Claim object to remove the qualifier from + @type claim: Claim + @param qualifiers: Claim objects currently used as a qualifiers + @type qualifiers: list of Claim + @param bot: Whether to mark the edit as a bot edit + @type bot: bool + @param summary: Edit summary + @type summary: str + @param baserevid: Base revision id override, used to detect conflicts. + When omitted, revision of claim.on_item is used. DEPRECATED. + @type baserevid: long + """ + params = dict(action='wbremovequalifiers', + claim=claim.snak, + baserevid=self._get_baserevid(claim, baserevid), + summary=summary, + bot=bot, + ) + + params['qualifiers'] = [qualifier.hash for qualifier in qualifiers] + params['token'] = self.tokens['edit'] + + req = self._simple_request(**params) + data = req.submit() + return data + + @must_be(group='user') def linkTitles(self, page1, page2, bot=True): """ Link two pages together. diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py index 9bda4d1..fe9eccc 100644 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -172,6 +172,81 @@ self.assertEqual(new_item.getRedirectTarget(), target_item) +class TestWikibaseRemoveQualifier(WikibaseTestCase): + + """Run wikibase write tests to remove qualifiers.""" + + family = 'wikidata' + code = 'test' + + user = True + write = True + + def setUp(self): + """Add a claim with two qualifiers.""" + super(TestWikibaseRemoveQualifier, self).setUp() + testsite = self.get_repo() + item = pywikibot.ItemPage(testsite, 'Q68') + item.get() + # Create claim with qualifier + if 'P115' in item.claims: + item.removeClaims(item.claims['P115']) + + claim = pywikibot.page.Claim(testsite, 'P115', datatype='wikibase-item') + target = pywikibot.ItemPage(testsite, 'Q271') + claim.setTarget(target) + item.addClaim(claim) + + item.get(force=True) + + qual_1 = pywikibot.page.Claim(testsite, 'P88', isQualifier=True) + qual_1.setTarget(pywikibot.WbTime(year=2012)) + item.claims['P115'][0].addQualifier(qual_1) + + qual_2 = pywikibot.page.Claim(testsite, 'P580', isQualifier=True) + qual_2.setTarget(pywikibot.ItemPage(testsite, 'Q67')) + item.claims['P115'][0].addQualifier(qual_2) + + def test_remove_single(self): + """Test adding a claim with two qualifiers, then removing one.""" + self.setUp() + testsite = self.get_repo() + item = pywikibot.ItemPage(testsite, 'Q68') + item.get(force=True) + + # Remove qualifier + claim = item.claims['P115'][0] + qual_3 = claim.qualifiers[u'P580'][0] + claim.removeQualifier(qual_3) + + # Check P580 qualifier removed but P88 qualifier remains + item = pywikibot.ItemPage(testsite, 'Q68') + item.get(force=True) + claim = item.claims['P115'][0] + self.assertNotIn('P580', claim.qualifiers.keys()) + self.assertIn('P88', claim.qualifiers.keys()) + + def test_remove_multiple(self): + """Test adding a claim with two qualifiers, then removing both.""" + self.setUp() + testsite = self.get_repo() + item = pywikibot.ItemPage(testsite, 'Q68') + item.get(force=True) + + # Remove qualifiers + item.get(force=True) + claim = item.claims['P115'][0] + qual_3 = claim.qualifiers[u'P580'][0] + qual_4 = claim.qualifiers[u'P88'][0] + claim.removeQualifiers([qual_3, qual_4]) + + # Check P580 and P88 qualifiers are removed + item = pywikibot.ItemPage(testsite, 'Q68') + item.get(force=True) + claim = item.claims['P115'][0] + self.assertNotIn('P580', claim.qualifiers.keys()) + self.assertNotIn('P88', claim.qualifiers.keys()) + if __name__ == '__main__': try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/250749 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id69451e5cb3e5b037b2eace61472356fffd40cde Gerrit-PatchSet: 8 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 4 months

[Gerrit] [FIX] Update domain for SSL expiry tests - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] Update domain for SSL expiry tests ...................................................................... [FIX] Update domain for SSL expiry tests The domain has changed from testssl-expire.disig.sk to testssl-expire-r2i2.disig.sk. Change-Id: I9d8543fa1ee36684807ca82e3921a174e86c7c2b --- M tests/http_tests.py 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/http_tests.py b/tests/http_tests.py index 03a5092..4922a81 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -124,17 +124,17 @@ """HTTPS certificate test.""" - hostname = 'testssl-expire.disig.sk' + hostname = 'testssl-expire-r2i2.disig.sk' def test_https_cert_error(self): """Test if http.fetch respects disable_ssl_certificate_validation.""" self.assertRaises(pywikibot.FatalServerError, http.fetch, - uri='https://testssl-expire.disig.sk/index.en.html') + uri='https://testssl-expire-r2i2.disig.sk/index.en.html') with warnings.catch_warnings(record=True) as warning_log: response = http.fetch( - uri='https://testssl-expire.disig.sk/index.en.html', + uri='https://testssl-expire-r2i2.disig.sk/index.en.html', disable_ssl_certificate_validation=True) r = response.content self.assertIsInstance(r, unicode) @@ -144,7 +144,7 @@ http.session.close() # but first clear the connection self.assertRaises(pywikibot.FatalServerError, http.fetch, - uri='https://testssl-expire.disig.sk/index.en.html') + uri='https://testssl-expire-r2i2.disig.sk/index.en.html') # Verify that the warning occurred self.assertEqual(len(warning_log), 1) -- To view, visit https://gerrit.wikimedia.org/r/259559 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d8543fa1ee36684807ca82e3921a174e86c7c2b 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, 4 months

[Gerrit] [FIX] Support changed _vformat signature of 3.5.1 - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] Support changed _vformat signature of 3.5.1 ...................................................................... [FIX] Support changed _vformat signature of 3.5.1 With Python 3.5.1 the signature of `Formatter._vformat` changed. This is supporting this change and now returns the tuple if it had returned a tuple first. This is not deactivating the custom `_vformat` method in Python 3 because the patch introduced that change might be backported to Python 2.7 (see also https://bugs.python.org/issue25034). Bug: T121684 Change-Id: I0d1e4f062882ed03dc7bb2040984a67970df6c52 --- M pywikibot/tools/formatter.py 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/formatter.py b/pywikibot/tools/formatter.py index ee34057..a571ee4 100644 --- a/pywikibot/tools/formatter.py +++ b/pywikibot/tools/formatter.py @@ -123,6 +123,18 @@ @rtype: unicode """ result = super(_ColorFormatter, self)._vformat(*args, **kwargs) + if isinstance(result, tuple): + additional_params = result[1:] + result = result[0] + else: + additional_params = tuple() + result = self._convert_bytes(result) + if additional_params: + result = (result, ) + additional_params + return result + + def _convert_bytes(self, result): + """Convert everything into unicode.""" if PY2 and isinstance(result, str): assert result == b'' result = '' # This is changing it into a unicode -- To view, visit https://gerrit.wikimedia.org/r/259549 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d1e4f062882ed03dc7bb2040984a67970df6c52 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 <>

8 years, 4 months

[Gerrit] DataSite: replace kwargs with explicit arguments - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: DataSite: replace kwargs with explicit arguments ...................................................................... DataSite: replace kwargs with explicit arguments Many DataSite methods used kwargs, and silently ignored items that were not recognised. They also supported the 'baserevid' being provided via either the Claim or a kwarg. Deprecate providing baserevid as a parameter, and warn when Claim.on_item is not set or the baserevid parameter is different from Claim.on_item.latest_revision_id. Change-Id: I38b305189a0a6fa437a78fed0118562348b1ac3d --- M pywikibot/site.py 1 file changed, 114 insertions(+), 51 deletions(-) Approvals: John Vandenberg: Looks good to me, approved Lokal Profil: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 72d69a3..4754371 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -6313,6 +6313,27 @@ '%r does not support entity type "property"' % self) + def _get_baserevid(self, claim, baserevid): + """Check that claim.on_item is set and matches baserevid if used.""" + if not claim.on_item: + issue_deprecation_warning('claim without on_item set', 3) + if not baserevid: + warn('Neither claim.on_item nor baserevid provided', + UserWarning, 3) + return baserevid + + if not baserevid: + return claim.on_item.latest_revision_id + + issue_deprecation_warning( + 'Site method with baserevid', 'claim with on_item set', 3) + if baserevid != claim.on_item.latest_revision_id: + warn('Using baserevid {0} instead of claim baserevid {1}' + ''.format(baserevid, claim.on_item.latest_revision_id), + UserWarning, 3) + + return baserevid + def __getattr__(self, attr): """Provide data access methods. @@ -6491,16 +6512,21 @@ if 'baserevid' in kwargs and kwargs['baserevid']: params['baserevid'] = kwargs['baserevid'] params['token'] = self.tokens['edit'] + for arg in kwargs: if arg in ['clear', 'data', 'exclude', 'summary']: params[arg] = kwargs[arg] + elif arg != 'baserevid': + warn('Unknown wbeditentity parameter {0} ignored'.format(arg), + UserWarning, 2) + params['data'] = json.dumps(data) req = self._simple_request(**params) data = req.submit() return data @must_be(group='user') - def addClaim(self, item, claim, bot=True, **kwargs): + def addClaim(self, item, claim, bot=True, summary=None): """ Add a claim. @@ -6510,19 +6536,21 @@ @type claim: Claim @param bot: Whether to mark the edit as a bot edit @type bot: bool + @param summary: Edit summary + @type summary: str """ params = dict(action='wbcreateclaim', entity=item.getID(), baserevid=item.latest_revision_id, snaktype=claim.getSnakType(), property=claim.getID(), + summary=summary, + bot=bot, ) - if bot: - params['bot'] = 1 + if claim.getSnakType() == 'value': params['value'] = json.dumps(claim._formatValue()) - if 'summary' in kwargs: - params['summary'] = kwargs['summary'] + params['token'] = self.tokens['edit'] req = self._simple_request(**params) data = req.submit() @@ -6535,7 +6563,8 @@ item.latest_revision_id = data['pageinfo']['lastrevid'] @must_be(group='user') - def changeClaimTarget(self, claim, snaktype='value', bot=True, **kwargs): + def changeClaimTarget(self, claim, snaktype='value', + bot=True, summary=None): """ Set the claim target to the value of the provided claim target. @@ -6545,6 +6574,8 @@ @type snaktype: str ('value', 'novalue' or 'somevalue') @param bot: Whether to mark the edit as a bot edit @type bot: bool + @param summary: Edit summary + @type summary: str """ if claim.isReference or claim.isQualifier: raise NotImplementedError @@ -6554,11 +6585,10 @@ params = dict(action='wbsetclaimvalue', claim=claim.snak, snaktype=snaktype, + summary=summary, + bot=bot, ) - if bot: - params['bot'] = 1 - if 'summary' in kwargs: - params['summary'] = kwargs['summary'] + params['token'] = self.tokens['edit'] if snaktype == 'value': params['value'] = json.dumps(claim._formatValue()) @@ -6569,12 +6599,16 @@ return data @must_be(group='user') - def save_claim(self, claim, **kwargs): + def save_claim(self, claim, summary=None, bot=True): """ Save the whole claim to the wikibase site. @param claim: The claim to save @type claim: Claim + @param bot: Whether to mark the edit as a bot edit + @type bot: bool + @param summary: Edit summary + @type summary: str """ if claim.isReference or claim.isQualifier: raise NotImplementedError @@ -6585,18 +6619,17 @@ 'claim': json.dumps(claim.toJSON()), 'token': self.tokens['edit'], 'baserevid': claim.on_item.latest_revision_id, + 'summary': summary, + 'bot': bot, } - if 'bot' not in kwargs or kwargs['bot']: - params['bot'] = True - if 'summary' in kwargs: - params['summary'] = kwargs['summary'] req = self._simple_request(**params) data = req.submit() return data @must_be(group='user') - def editSource(self, claim, source, new=False, bot=True, **kwargs): + def editSource(self, claim, source, new=False, + bot=True, summary=None, baserevid=None): """ Create/Edit a source. @@ -6608,16 +6641,21 @@ @type new: bool @param bot: Whether to mark the edit as a bot edit @type bot: bool + @param summary: Edit summary + @type summary: str + @param baserevid: Base revision id override, used to detect conflicts. + When omitted, revision of claim.on_item is used. DEPRECATED. + @type baserevid: long """ if claim.isReference or claim.isQualifier: raise ValueError("The claim cannot have a source.") params = dict(action='wbsetreference', statement=claim.snak, + baserevid=self._get_baserevid(claim, baserevid), + summary=summary, + bot=bot, ) - if claim.on_item: # I think this wouldn't be false, but lets be safe - params['baserevid'] = claim.on_item.latest_revision_id - if bot: - params['bot'] = 1 + params['token'] = self.tokens['edit'] # build up the snak if isinstance(source, list): @@ -6643,16 +6681,14 @@ if not new and hasattr(sourceclaim, 'hash'): params['reference'] = sourceclaim.hash params['snaks'] = json.dumps(snak) - for arg in kwargs: - if arg in ['baserevid', 'summary']: - params[arg] = kwargs[arg] req = self._simple_request(**params) data = req.submit() return data @must_be(group='user') - def editQualifier(self, claim, qualifier, new=False, bot=True, **kwargs): + def editQualifier(self, claim, qualifier, new=False, bot=True, + summary=None, baserevid=None): """ Create/Edit a qualifier. @@ -6662,16 +6698,21 @@ @type qualifier: Claim @param bot: Whether to mark the edit as a bot edit @type bot: bool + @param summary: Edit summary + @type summary: str + @param baserevid: Base revision id override, used to detect conflicts. + When omitted, revision of claim.on_item is used. DEPRECATED. + @type baserevid: long """ if claim.isReference or claim.isQualifier: raise ValueError("The claim cannot have a qualifier.") params = dict(action='wbsetqualifier', claim=claim.snak, + baserevid=self._get_baserevid(claim, baserevid), + summary=summary, + bot=bot, ) - if claim.on_item: # I think this wouldn't be false, but lets be safe - params['baserevid'] = claim.on_item.latest_revision_id - if bot: - params['bot'] = 1 + if (not new and hasattr(qualifier, 'hash') and qualifier.hash is not None): @@ -6683,16 +6724,12 @@ params['snaktype'] = qualifier.getSnakType() params['property'] = qualifier.getID() - for arg in kwargs: - if arg in ['baserevid', 'summary']: - params[arg] = kwargs[arg] - req = self._simple_request(**params) data = req.submit() return data @must_be(group='user') - def removeClaims(self, claims, bot=True, **kwargs): + def removeClaims(self, claims, bot=True, summary=None, baserevid=None): """ Remove claims. @@ -6700,21 +6737,35 @@ @type claims: list of Claim @param bot: Whether to mark the edit as a bot edit @type bot: bool + @param summary: Edit summary + @type summary: str + @param baserevid: Base revision id override, used to detect conflicts. + When omitted, revision of claim.on_item is used. DEPRECATED. + @type baserevid: long """ - params = dict(action='wbremoveclaims') - if bot: - params['bot'] = 1 + # Check on_item vs baserevid for all additional claims + for claim in claims: + baserevid = self._get_baserevid(claim, baserevid) + + items = set(claim.on_item for claim in claims if claim.on_item) + assert len(items) == 1 + + params = dict(action='wbremoveclaims', + baserevid=baserevid, + summary=summary, + bot=bot, + ) + params['claim'] = '|'.join(claim.snak for claim in claims) params['token'] = self.tokens['edit'] - for kwarg in kwargs: - if kwarg in ['baserevid', 'summary']: - params[kwarg] = kwargs[kwarg] + req = self._simple_request(**params) data = req.submit() return data @must_be(group='user') - def removeSources(self, claim, sources, bot=True, **kwargs): + def removeSources(self, claim, sources, + bot=True, summary=None, baserevid=None): """ Remove sources. @@ -6724,16 +6775,22 @@ @type sources: Claim @param bot: Whether to mark the edit as a bot edit @type bot: bool + @param summary: Edit summary + @type summary: str + @param baserevid: Base revision id override, used to detect conflicts. + When omitted, revision of claim.on_item is used. DEPRECATED. + @type baserevid: long """ - params = dict(action='wbremovereferences') - if bot: - params['bot'] = 1 + params = dict(action='wbremovereferences', + baserevid=self._get_baserevid(claim, baserevid), + summary=summary, + bot=bot, + ) + params['statement'] = claim.snak params['references'] = '|'.join(source.hash for source in sources) params['token'] = self.tokens['edit'] - for kwarg in kwargs: - if kwarg in ['baserevid', 'summary']: - params[kwarg] = kwargs[kwarg] + req = self._simple_request(**params) data = req.submit() return data @@ -6766,7 +6823,9 @@ return data @must_be(group='user') - def mergeItems(self, fromItem, toItem, **kwargs): + @deprecated_args(ignoreconflicts='ignore_conflicts') + def mergeItems(self, fromItem, toItem, ignore_conflicts=False, + summary=None): """ Merge two items together. @@ -6774,17 +6833,21 @@ @type fromItem: pywikibot.ItemPage @param toItem: Item to merge into @type toItem: pywikibot.ItemPage + @param ignore_conflicts: Whether to ignore conflicts + @type ignore_conflicts: bool + @param summary: Edit summary + @type summary: str @return: dict API output """ params = { 'action': 'wbmergeitems', 'fromid': fromItem.getID(), 'toid': toItem.getID(), - 'token': self.tokens['edit'] + 'ignoreconflicts': ignore_conflicts, + 'token': self.tokens['edit'], + 'summary': summary, } - for kwarg in kwargs: - if kwarg in ['ignoreconflicts', 'summary']: - params[kwarg] = kwargs[kwarg] + req = self._simple_request(**params) data = req.submit() return data -- To view, visit https://gerrit.wikimedia.org/r/237353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38b305189a0a6fa437a78fed0118562348b1ac3d Gerrit-PatchSet: 6 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: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 4 months

[Gerrit] Pywikibot 2.0rc4 - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Pywikibot 2.0rc4 ...................................................................... Pywikibot 2.0rc4 Change-Id: I028472a8fe0c322981c1ef817a68218a7cf7305a --- M ChangeLog M docs/conf.py M pywikibot/__init__.py M setup.py 4 files changed, 47 insertions(+), 4 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/ChangeLog b/ChangeLog index c0deb8a..17a191d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,48 @@ +Release 2.0rc4 (15 December 2015) +================================= + +Bugfixes (core) +--------------- +e42891d Remove dependency on pYsearch +ecc39ce Require google>=0.7 +fa431a4 Desupport Python 2.6 for Pywikibot 2.0 release branch +b1f6f39 config: Don't crash on later get_base_dir calls +0925c51 cosmetic_changes: merge similar regexes +4bf39f3 Update revId upon claim change +ea11626 Update WOW hostnames +2a5a4fa Mark site.patrol() as a user write action +4f568c5 Fix interwikiFormat support for Link +7cb6962 Changes are wrongly detected in the last langlink +5c5d658 getLanguageLinks: Skip own site +7ee8ec2 fix intersection of sets of namespaces +94b0c43 Import textlib.TimeStripper +584d7c1 Change "PyWikiBot" to "Pywikibot" +1f8d57e Stop crashing item loads due to support of units +c19dcfa __all__ items must be bytes on Python 2 +e6aa6ca Omit includeredirects parameter for allpages generator +687ec9e Performance fix for sites using interwiki_putfirst option +28db3d2 Fix Persian Wikipedia configuration +3944f5e rollback: Use Revision instance properly +860af34 Add must_be to DataSite write actions +f8af8e0 Remove unneeded site argument to AutoFamily +bf49a7d Fix ComparableMixin +1d36e45 Deprecate ParamInfo.query_modules_with_limits +e83c6a3 be-x-old is renamed to be-tarask +19bbe7e Correctly identify qualifier from JSON + +Bugfixes (scripts) +------------------ +4e78c27 checkimages: Expect NoPage exception +fbb6266 interwiki: Optimize/remove unneeded calls to Page.isEmpty() +428420a interwiki: Allow Subject.originPage to be updated +a305d7b interwiki: Allow titletranslate.translate page to be None +a786226 interwiki: '-ignore' parameter throws exception +ab7abf5 interwiki: check for category before emptiness +0db2e87 interwiki: do not automatically log in +47ed5d5 nowcommons: Query at most one users + Release 2.0rc3 (30 September 2015) -============================ +================================== Bugfixes (core) --------------- diff --git a/docs/conf.py b/docs/conf.py index 2e59f19..f6b5f94 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,7 +52,7 @@ # The short X.Y version. version = '2.0' # The full version, including alpha/beta/rc tags. -release = '2.0rc1' +release = '2.0rc4' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 1191b6e..e26392a 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -7,7 +7,7 @@ # from __future__ import unicode_literals -__release__ = '2.0rc3' +__release__ = '2.0rc4' __version__ = '$Id$' import datetime diff --git a/setup.py b/setup.py index de7bb95..397dac1 100644 --- a/setup.py +++ b/setup.py @@ -160,7 +160,7 @@ from setuptools import setup, find_packages name = 'pywikibot' -version = '2.0rc3' +version = '2.0rc4' github_url = 'https://github.com/wikimedia/pywikibot-core' setup( -- To view, visit https://gerrit.wikimedia.org/r/259215 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I028472a8fe0c322981c1ef817a68218a7cf7305a Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: 2.0 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, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2015