Pywikibot-commits February 2015

pywikibot-commits@lists.wikimedia.org

2 participants
126 discussions

[Gerrit] [WIP] improve methods not bound to an instance - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [WIP] improve methods not bound to an instance ...................................................................... [WIP] improve methods not bound to an instance - turned several staticmethods into classmethods - fixed DataSite's inheritance from APISite Change-Id: I5c8024bb086c4302a5f02dbed26fd3e24696e699 --- M pywikibot/__init__.py M pywikibot/data/api.py M pywikibot/logentries.py M pywikibot/page.py M pywikibot/site.py M scripts/templatecount.py M tests/__init__.py 7 files changed, 76 insertions(+), 76 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 38ee92c..b93f53f 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -268,8 +268,8 @@ 'precision': self.precision, } - @staticmethod - def fromWikibase(data, site): + @classmethod + def fromWikibase(cls, data, site): """Constructor to create an object from Wikibase's JSON output.""" globes = {} for k in site.globes(): @@ -282,9 +282,9 @@ # Default to earth or should we use None here? globe = 'earth' - return Coordinate(data['latitude'], data['longitude'], - data['altitude'], data['precision'], - globe, site=site, entity=data['globe']) + return cls(data['latitude'], data['longitude'], + data['altitude'], data['precision'], + globe, site=site, entity=data['globe']) @property def precision(self): @@ -395,17 +395,17 @@ else: raise ValueError('Invalid precision: "%s"' % precision) - @staticmethod - def fromTimestr(datetimestr, precision=14, before=0, after=0, timezone=0, - calendarmodel=None, site=None): + @classmethod + def fromTimestr(cls, datetimestr, precision=14, before=0, after=0, + timezone=0, calendarmodel=None, site=None): match = re.match('([-+]?\d+)-(\d+)-(\d+)T(\d+):(\d+):(\d+)Z', datetimestr) if not match: raise ValueError(u"Invalid format: '%s'" % datetimestr) t = match.groups() - return WbTime(long(t[0]), int(t[1]), int(t[2]), - int(t[3]), int(t[4]), int(t[5]), - precision, before, after, timezone, calendarmodel, site) + return cls(long(t[0]), int(t[1]), int(t[2]), + int(t[3]), int(t[4]), int(t[5]), + precision, before, after, timezone, calendarmodel, site) def toTimestr(self): """ @@ -431,11 +431,11 @@ } return json - @staticmethod - def fromWikibase(ts): - return WbTime.fromTimestr(ts[u'time'], ts[u'precision'], - ts[u'before'], ts[u'after'], - ts[u'timezone'], ts[u'calendarmodel']) + @classmethod + def fromWikibase(cls, ts): + return cls.fromTimestr(ts[u'time'], ts[u'precision'], + ts[u'before'], ts[u'after'], + ts[u'timezone'], ts[u'calendarmodel']) def __str__(self): return json.dumps(self.toWikibase(), indent=4, sort_keys=True, @@ -493,8 +493,8 @@ } return json - @staticmethod - def fromWikibase(wb): + @classmethod + def fromWikibase(cls, wb): """ Create a WbQuanity from the JSON data given by the Wikibase API. @@ -504,7 +504,7 @@ upperBound = eval(wb['upperBound']) lowerBound = eval(wb['lowerBound']) error = (upperBound - amount, amount - lowerBound) - return WbQuantity(amount, wb['unit'], error) + return cls(amount, wb['unit'], error) def __str__(self): return json.dumps(self.toWikibase(), indent=4, sort_keys=True, diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index e746af1..b93582e 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1089,8 +1089,8 @@ submsg.set_payload(content) return submsg - @staticmethod - def _build_mime_request(params, mime_params): + @classmethod + def _build_mime_request(cls, params, mime_params): """Construct a MIME multipart form post. @param params: HTTP request params @@ -1103,10 +1103,10 @@ # construct a MIME message containing all API key/values container = MIMEMultipart(_subtype='form-data') for key, value in params.items(): - submsg = Request._generate_MIME_part(key, value) + submsg = cls._generate_MIME_part(key, value) container.attach(submsg) for key, value in mime_params.items(): - submsg = Request._generate_MIME_part(key, *value) + submsg = cls._generate_MIME_part(key, *value) container.attach(submsg) # strip the headers to get the HTTP message body @@ -1366,8 +1366,8 @@ self._data = None self._cachetime = None - @staticmethod - def _get_cache_dir(): + @classmethod + def _get_cache_dir(cls): """Return the base directory path for cache entries. The directory will be created if it does not already exist. @@ -1375,7 +1375,7 @@ @return: basestring """ path = os.path.join(pywikibot.config2.base_dir, 'apicache') - CachedRequest._make_dir(path) + cls._make_dir(path) return path @staticmethod diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index 791330e..1a8a9bb 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -294,8 +294,8 @@ """ return self._creator(logdata) - @staticmethod - def _getEntryClass(logtype): + @classmethod + def _getEntryClass(cls, logtype): """ Return the class corresponding to the @logtype string parameter. @@ -303,7 +303,7 @@ @rtype: class """ try: - return LogEntryFactory._logtypes[logtype] + return cls._logtypes[logtype] except KeyError: return LogEntry diff --git a/pywikibot/page.py b/pywikibot/page.py index ad0a643..3687982 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -3036,8 +3036,8 @@ del data[key] return data - @staticmethod - def _normalizeData(data): + @classmethod + def _normalizeData(cls, data): """ Helper function to expand data into the Wikibase API structure. @@ -3050,7 +3050,7 @@ for prop in ('labels', 'descriptions'): if prop not in data: continue - data[prop] = WikibasePage._normalizeLanguages(data[prop]) + data[prop] = cls._normalizeLanguages(data[prop]) for key, value in data[prop].items(): if isinstance(value, basestring): data[prop][key] = {'language': key, 'value': value} @@ -3656,8 +3656,8 @@ self.rank = 'normal' self.on_item = None # The item it's on - @staticmethod - def fromJSON(site, data): + @classmethod + def fromJSON(cls, site, data): """ Create a claim object from JSON returned in the API call. @@ -3666,8 +3666,8 @@ @return: Claim """ - claim = Claim(site, data['mainsnak']['property'], - datatype=data['mainsnak'].get('datatype', None)) + claim = cls(site, data['mainsnak']['property'], + datatype=data['mainsnak'].get('datatype', None)) if 'id' in data: claim.snak = data['id'] elif 'hash' in data: @@ -3685,15 +3685,15 @@ claim.rank = data['rank'] if 'references' in data: for source in data['references']: - claim.sources.append(Claim.referenceFromJSON(site, source)) + claim.sources.append(cls.referenceFromJSON(site, source)) if 'qualifiers' in data: for prop in data['qualifiers-order']: - claim.qualifiers[prop] = [Claim.qualifierFromJSON(site, qualifier) + claim.qualifiers[prop] = [cls.qualifierFromJSON(site, qualifier) for qualifier in data['qualifiers'][prop]] return claim - @staticmethod - def referenceFromJSON(site, data): + @classmethod + def referenceFromJSON(cls, site, data): """ Create a dict of claims from reference JSON returned in the API call. @@ -3714,15 +3714,15 @@ for prop in prop_list: for claimsnak in data['snaks'][prop]: - claim = Claim.fromJSON(site, {'mainsnak': claimsnak, - 'hash': data['hash']}) + claim = cls.fromJSON(site, {'mainsnak': claimsnak, + 'hash': data['hash']}) if claim.getID() not in source: source[claim.getID()] = [] source[claim.getID()].append(claim) return source - @staticmethod - def qualifierFromJSON(site, data): + @classmethod + def qualifierFromJSON(cls, site, data): """ Create a Claim for a qualifier from JSON. @@ -3732,8 +3732,8 @@ @return: Claim """ - return Claim.fromJSON(site, {'mainsnak': data, - 'hash': data['hash']}) + return cls.fromJSON(site, {'mainsnak': data, + 'hash': data['hash']}) def toJSON(self): data = { @@ -4502,8 +4502,8 @@ self.site.code, self.title)) - @staticmethod - def fromPage(page, source=None): + @classmethod + def fromPage(cls, page, source=None): """ Create a Link to a Page. @@ -4514,7 +4514,7 @@ @return: Link """ - link = Link.__new__(Link) + link = cls.__new__(cls) link._site = page.site link._section = page.section() link._namespace = page.namespace() @@ -4526,8 +4526,8 @@ return link - @staticmethod - def langlinkUnsafe(lang, title, source): + @classmethod + def langlinkUnsafe(cls, lang, title, source): """ Create a "lang:title" Link linked from source. @@ -4542,7 +4542,7 @@ @return: Link """ - link = Link.__new__(Link) + link = cls.__new__(cls) if source.family.interwiki_forward: link._site = pywikibot.Site(lang, source.family.interwiki_forward) else: diff --git a/pywikibot/site.py b/pywikibot/site.py index b3923d7..c9e75b9 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -362,10 +362,10 @@ % (self.__class__.__name__, self.id, self.custom_name, self.canonical_name, self.aliases, kwargs) - @staticmethod - def builtin_namespaces(use_image_name=False): + @classmethod + def builtin_namespaces(cls, use_image_name=False): """Return a dict of the builtin namespaces.""" - return dict([(i, Namespace(i, use_image_name=use_image_name)) + return dict([(i, cls(i, use_image_name=use_image_name)) for i in range(-2, 16)]) @staticmethod @@ -392,8 +392,8 @@ return parts[0].strip() return False - @staticmethod - def lookup_name(name, namespaces=None): + @classmethod + def lookup_name(cls, name, namespaces=None): """Find the Namespace for a name. @param name: Name of the namespace. @@ -404,9 +404,9 @@ @return: Namespace or None """ if not namespaces: - namespaces = Namespace.builtin_namespaces() + namespaces = cls.builtin_namespaces() - name = Namespace.normalize_name(name) + name = cls.normalize_name(name) if name is False: return None name = name.lower() @@ -1532,8 +1532,8 @@ super(APISite, self).__setstate__(attrs) self.tokens = TokenWallet(self) - @staticmethod - def fromDBName(dbname): + @classmethod + def fromDBName(cls, dbname): # TODO this only works for some WMF sites req = api.CachedRequest(datetime.timedelta(days=10), site=pywikibot.Site('meta', 'meta'), @@ -1548,11 +1548,11 @@ if site['dbname'] == dbname: if site['code'] == 'wiki': site['code'] = 'wikipedia' - return APISite(lang, site['code']) + return cls(lang, site['code']) else: for site in val: if site['dbname'] == dbname: - return APISite(site['code'], site['code']) + return cls(site['code'], site['code']) raise ValueError("Cannot parse a site out of %s." % dbname) def _generator(self, gen_class, type_arg=None, namespaces=None, @@ -5200,9 +5200,9 @@ """Wikibase data capable site.""" - def __init__(self, code, fam=None, user=None, sysop=None): + def __init__(self, *args, **kwargs): """Constructor.""" - APISite.__init__(self, code, fam, user, sysop) + super(DataSite, self).__init__(*args, **kwargs) self._item_namespace = None self._property_namespace = None diff --git a/scripts/templatecount.py b/scripts/templatecount.py index 8e36b94..9ca5120 100644 --- a/scripts/templatecount.py +++ b/scripts/templatecount.py @@ -48,9 +48,9 @@ """Template count bot.""" - @staticmethod - def countTemplates(templates, namespaces): - templateDict = TemplateCountRobot.template_dict(templates, namespaces) + @classmethod + def countTemplates(cls, templates, namespaces): + templateDict = cls.template_dict(templates, namespaces) pywikibot.output(u'\nNumber of transclusions per template', toStdout=True) pywikibot.output(u'-' * 36, toStdout=True) @@ -65,9 +65,9 @@ % datetime.datetime.utcnow().isoformat(), toStdout=True) - @staticmethod - def listTemplates(templates, namespaces): - templateDict = TemplateCountRobot.template_dict(templates, namespaces) + @classmethod + def listTemplates(cls, templates, namespaces): + templateDict = cls.template_dict(templates, namespaces) pywikibot.output(u'\nList of pages transcluding templates:', toStdout=True) for key in templates: @@ -83,9 +83,9 @@ % datetime.datetime.utcnow().isoformat(), toStdout=True) - @staticmethod - def template_dict(templates, namespaces): - gen = TemplateCountRobot.template_dict_generator(templates, namespaces) + @classmethod + def template_dict(cls, templates, namespaces): + gen = cls.template_dict_generator(templates, namespaces) templateDict = {} for template, transcludingArray in gen: templateDict[template] = transcludingArray diff --git a/tests/__init__.py b/tests/__init__.py index 3cf20fd..1ffcabc 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -187,8 +187,8 @@ return collector(loader) -CachedRequest._get_cache_dir = staticmethod( - lambda *args: CachedRequest._make_dir(_cache_dir)) +CachedRequest._get_cache_dir = classmethod( + lambda cls, *args: cls._make_dir(_cache_dir)) # Travis-CI builds are set to retry twice, which aims to reduce the number -- To view, visit https://gerrit.wikimedia.org/r/168948 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c8024bb086c4302a5f02dbed26fd3e24696e699 Gerrit-PatchSet: 7 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.org> 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 3 months

[Gerrit] Introduce set_redirect_target method in Page class - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Introduce set_redirect_target method in Page class ...................................................................... Introduce set_redirect_target method in Page class It set target of redirect page any given page or page and section. It also can create the redirect or change an ordinary page to a redirect. The main reason to do this is that It can be altered to support set redirect in subclasses like ItemPage or CategoryPage and be used generally. Added one example in the capitalize_redirects script. Change-Id: Idbe5a1c3e6bb43afe019823fd5eb120c00d9dbec --- M pywikibot/page.py M scripts/capitalize_redirects.py 2 files changed, 59 insertions(+), 7 deletions(-) Approvals: XZise: Looks good to me, but someone else must approve Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index ad0a643..abfda80 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1911,6 +1911,63 @@ result.append((pywikibot.Page(link, self.site), positional)) return result + def set_redirect_target(self, target_page, create=False, force=False, + keep_section=False, **kwargs): + """ + Change the page's text to point to the redirect page. + + @param target_page: target of the redirect, this argument is required. + @type target_page: pywikibot.Page or string + @param summary: The edit summary which must be set if the page should + be saved too. If omitted the page won't be saved. + @type summary: string + @param create: if true, it creates the redirect even if the page + doesn't exist. + @type create: bool + @param force: if true, it set the redirect target even the page + doesn't exist or it's not redirect. + @type force: bool + @param keep_section: if the old redirect links to a section + and the new one doesn't it uses the old redirect's section. + @type keep_section: bool + @param kwargs: Arguments which are used for saving the page directly + afterwards. If none are provided the page isn't saved. + """ + if isinstance(target_page, basestring): + target_page = pywikibot.Page(self.site, target_page) + elif self.site != target_page.site: + raise pywikibot.InterwikiRedirectPage(self, target_page) + if not self.exists() and not (create or force): + raise pywikibot.NoPage(self) + if self.exists() and not self.isRedirectPage() and not force: + raise pywikibot.IsNotRedirectPage(self) + redirect_regex = self.site.redirectRegex() + if self.exists(): + old_text = self.get(get_redirect=True) + else: + old_text = u'' + result = redirect_regex.search(old_text) + if result: + oldlink = result.group(1) + if keep_section and '#' in oldlink and target_page.section() is None: + sectionlink = oldlink[oldlink.index('#'):] + target_page = pywikibot.Page( + self.site, + target_page.title() + sectionlink + ) + prefix = self.text[:result.start()] + suffix = self.text[result.end():] + else: + prefix = '' + suffix = '' + + target_link = target_page.title(asLink=True, textlink=True, + allowInterwiki=False) + target_link = '#{0} {1}'.format(self.site.redirect(), target_link) + self.text = prefix + target_link + suffix + if kwargs: + self.save(**kwargs) + class FilePage(Page): diff --git a/scripts/capitalize_redirects.py b/scripts/capitalize_redirects.py index 05a388e..42fe6c1 100644 --- a/scripts/capitalize_redirects.py +++ b/scripts/capitalize_redirects.py @@ -85,13 +85,8 @@ site, 'capitalize_redirects-create-redirect', {'to': page_t}) - page_cap.text = u"#%s %s" % (site.redirect(), - self.current_page.title( - asLink=True, textlink=True)) - try: - page_cap.save(comment) - except: - pywikibot.output(u"An error occurred, skipping...") + page_cap.set_redirect_target(self.current_page, create=True, + summary=comment) def main(*args): -- To view, visit https://gerrit.wikimedia.org/r/185159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idbe5a1c3e6bb43afe019823fd5eb120c00d9dbec Gerrit-PatchSet: 12 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(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: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 3 months

[Gerrit] Additional failure handling with more precise warning - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Additional failure handling with more precise warning ...................................................................... Additional failure handling with more precise warning - we can check for 'code' and 'info' in the result['edit'] and print these two error hints instead of "unknown failure reason" and its bigger 'warning' content. This is useful e.g. for abusefilter warnings. Change-Id: Iccb16b967531e5e8afbee97ef378c1a89bded3d3 --- M pywikibot/site.py 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, approved Mpaa: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 4a139fa..409426b 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3860,6 +3860,12 @@ return False elif 'spamblacklist' in result['edit']: raise SpamfilterError(page, result['edit']['spamblacklist']) + elif 'code' in result['edit'] and 'info' in result['edit']: + self.unlock_page(page) + pywikibot.error( + u"editpage: %s\n%s, " + % (result['edit']['code'], result['edit']['info'])) + return False else: self.unlock_page(page) pywikibot.error(u"editpage: unknown failure reason %s" -- To view, visit https://gerrit.wikimedia.org/r/173785 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iccb16b967531e5e8afbee97ef378c1a89bded3d3 Gerrit-PatchSet: 3 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: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 3 months

[Gerrit] Fix test_preload_langlinks_count - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix test_preload_langlinks_count ...................................................................... Fix test_preload_langlinks_count listify the generator and compare its length with preloaded items Change-Id: Ic763d2d60a502d58c056df0bf209a97805798832 --- M tests/site_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index d0f85d5..6ae8a6d 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1993,7 +1993,7 @@ self.assertFalse(hasattr(page, '_pageprops')) count += 1 - self.assertEqual(len(links), count) + self.assertEqual(len(list(links)), count) def _test_preload_langlinks_long(self): """Test preloading continuation works.""" -- To view, visit https://gerrit.wikimedia.org/r/187682 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic763d2d60a502d58c056df0bf209a97805798832 Gerrit-PatchSet: 4 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 3 months

[Gerrit] Test deprecated_args decorator for instance methods - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Test deprecated_args decorator for instance methods ...................................................................... Test deprecated_args decorator for instance methods Change-Id: I9efff43a41a3974c7389d305df7411ab9dd6c024 --- M tests/deprecation_tests.py 1 file changed, 57 insertions(+), 0 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/deprecation_tests.py b/tests/deprecation_tests.py index b9a662e..3f15506 100644 --- a/tests/deprecation_tests.py +++ b/tests/deprecation_tests.py @@ -165,6 +165,12 @@ self.foo2 = foo2 return (foo, foo2) + @deprecated_args(bah='foo', bah2='foo2') + def deprecated_instance_method_args_multi(self, foo, foo2): + self.foo = foo + self.foo2 = foo2 + return (foo, foo2) + @deprecated() @deprecate_arg('bah', 'foo') def deprecated_instance_method_and_arg(self, foo): @@ -662,6 +668,57 @@ self.assertEqual(rv, (1, 2)) self.assertNoDeprecation() + def test_deprecated_instance_method_args_multi(self): + """Test @deprecated_args with instance methods and two args.""" + f = DeprecatedMethodClass() + + rv = f.deprecated_instance_method_args_multi('a', 'b') + self.assertEqual(rv, ('a', 'b')) + self.assertNoDeprecation() + + rv = f.deprecated_instance_method_args_multi(bah='b', bah2='c') + self.assertEqual(rv, ('b', 'c')) + self.assertDeprecation( + 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_args_multi is deprecated; ' + 'use foo instead.') + self.assertDeprecation( + 'bah2 argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_args_multi is deprecated; ' + 'use foo2 instead.') + + DeprecatorTestCase._reset_messages() + + rv = f.deprecated_instance_method_args_multi(foo='b', bah2='c') + self.assertEqual(rv, ('b', 'c')) + self.assertNoDeprecation( + 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_args_multi is deprecated; ' + 'use foo instead.') + self.assertDeprecation( + 'bah2 argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_args_multi is deprecated; ' + 'use foo2 instead.') + + DeprecatorTestCase._reset_messages() + + rv = f.deprecated_instance_method_args_multi(foo2='c', bah='b') + self.assertEqual(rv, ('b', 'c')) + self.assertDeprecation( + 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_args_multi is deprecated; ' + 'use foo instead.') + self.assertNoDeprecation( + 'bah2 argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_args_multi is deprecated; ' + 'use foo2 instead.') + + DeprecatorTestCase._reset_messages() + + rv = f.deprecated_instance_method_args_multi(foo=1, foo2=2) + self.assertEqual(rv, (1, 2)) + self.assertNoDeprecation() + def test_deprecated_instance_method_and_arg(self): """Test @deprecate_arg and @deprecated with instance methods.""" f = DeprecatedMethodClass() -- To view, visit https://gerrit.wikimedia.org/r/187955 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9efff43a41a3974c7389d305df7411ab9dd6c024 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 3 months

[Gerrit] Remove site.randompages() continuation uniqueness test - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Remove site.randompages() continuation uniqueness test ...................................................................... Remove site.randompages() continuation uniqueness test Uniqueness is not guaranteed by the API, and thus should not be guaranteed on the site api level. Bug: T84944 Change-Id: I5a9a8c6d056f0d23fa300a8ed462d8673218241d --- M tests/site_tests.py 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index d0f85d5..b4ecfd4 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1323,12 +1323,15 @@ """Test random methods of a site.""" def test_unlimited_small_step(self): - """Test site.randompages() without limit.""" + """Test site.randompages() continuation. + + Note that uniqueness is not guaranteed if multiple requests are + performed, so we also don't test this here. + """ mysite = self.get_site() pages = [] for rndpage in mysite.randompages(step=5, total=None): self.assertIsInstance(rndpage, pywikibot.Page) - self.assertNotIn(rndpage, pages) pages.append(rndpage) if len(pages) == 11: break -- To view, visit https://gerrit.wikimedia.org/r/187495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a9a8c6d056f0d23fa300a8ed462d8673218241d Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> 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 <>

9 years, 3 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2015