Pywikibot-commits June 2014

pywikibot-commits@lists.wikimedia.org

1 participants
143 discussions

[Gerrit] Just few code improvements: - change (pywikibot/core)
by jenkins-bot (Code Review) 08 Jun '14

08 Jun '14

jenkins-bot has submitted this change and it was merged. Change subject: Just few code improvements: ...................................................................... Just few code improvements: - enable summary option which didn't work previously - add -summary to doc string - use core-like page.save - remove obsolete script name from showHelp Change-Id: Iab5cde2d9b6f07e3df3d58ca7e952f57574a35f8 --- M scripts/reflinks.py 1 file changed, 17 insertions(+), 7 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 089ef3a..e9fd399 100644 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -30,6 +30,9 @@ -ignorepdf Do not handle PDF files (handy if you use Windows and can't get pdfinfo) + +-summary Use a custom edit summary. Otherwise it uses the default + one from i18n/reflinks.py """ # (C) 2008 - Nicolas Dumazet ( en:User:NicDumZ ) # (C) Pywikibot team, 2008-2014 @@ -385,7 +388,8 @@ class ReferencesRobot: - def __init__(self, generator, acceptall=False, limit=None, ignorepdf=False): + def __init__(self, generator, acceptall=False, limit=None, ignorepdf=False, + summary=None): """ - generator : Page generator - acceptall : boolean, is -always on ? @@ -407,7 +411,10 @@ break if code: manual += '/%s' % code - self.msg = i18n.twtranslate(self.site, 'reflinks-msg', locals()) + if summary is None: + self.msg = i18n.twtranslate(self.site, 'reflinks-msg', locals()) + else: + self.msg = summary self.stopPage = pywikibot.Page(self.site, pywikibot.translate(self.site, stopPage)) @@ -455,10 +462,12 @@ if choice == 'a': self.acceptall = True if choice == 'y': - page.put_async(new, self.msg) + page.text = new + page.save(self.msg, async=True) if self.acceptall: try: - page.put(new, self.msg) + page.text = new + page.save(self.msg) except pywikibot.EditConflict: pywikibot.output(u'Skipping %s because of edit conflict' % (page.title(),)) @@ -786,6 +795,7 @@ limit = None namespaces = [] generator = None + summary = None # Process global args and prepare generator args parser local_args = pywikibot.handleArgs() @@ -798,7 +808,7 @@ except ValueError: namespaces.append(arg[11:]) elif arg.startswith('-summary:'): - pywikibot.setAction(arg[9:]) + summary = arg[9:] elif arg == '-always': always = True elif arg == '-ignorepdf': @@ -830,11 +840,11 @@ generator = genFactory.getCombinedGenerator() if not generator: # syntax error, show help text from the top of this file - pywikibot.showHelp('reflinks') + pywikibot.showHelp() return generator = pagegenerators.PreloadingGenerator(generator, step=50) generator = pagegenerators.RedirectFilterPageGenerator(generator) - bot = ReferencesRobot(generator, always, limit, ignorepdf) + bot = ReferencesRobot(generator, always, limit, ignorepdf, summary) bot.run() if __name__ == "__main__": -- To view, visit https://gerrit.wikimedia.org/r/137302 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iab5cde2d9b6f07e3df3d58ca7e952f57574a35f8 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] py3 cleanups - change (pywikibot/core)
by jenkins-bot (Code Review) 07 Jun '14

07 Jun '14

jenkins-bot has submitted this change and it was merged. Change subject: py3 cleanups ...................................................................... py3 cleanups Change-Id: I3d7dad6bfb4b0394a7c0d5942310b01b741077c2 --- M generate_user_files.py 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Ricordisamoa: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_user_files.py b/generate_user_files.py index 88bea75..328ba53 100644 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ Script to create user files (user-config.py, user-fixes.py) """ # -# (C) Pywikibot team, 2010-2013 +# (C) Pywikibot team, 2010-2014 # # Distributed under the terms of the MIT license. # @@ -79,7 +79,7 @@ message += u": " for n, i in enumerate(clist): - print (u"%d: %s" % (n + 1, i)) + print(u"%d: %s" % (n + 1, i)) while True: choice = raw_input(message) @@ -135,12 +135,12 @@ your operating system. See your operating system documentation for how to set environment variables.""" % locals(), width=76) for line in msg: - print line + print(line) ok = raw_input("Is this OK? ([y]es, [N]o) ") if ok in ["Y", "y"]: base_dir = new_base return True - print "Aborting changes." + print("Aborting changes.") return False -- To view, visit https://gerrit.wikimedia.org/r/138142 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d7dad6bfb4b0394a7c0d5942310b01b741077c2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> 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: jenkins-bot <>

1 0

[Gerrit] Bug 66063: Disable git version network request - change (pywikibot/core)
by jenkins-bot (Code Review) 07 Jun '14

07 Jun '14

jenkins-bot has submitted this change and it was merged. Change subject: Bug 66063: Disable git version network request ...................................................................... Bug 66063: Disable git version network request The online git repository query is unnecessary startup activity, and it uses a different http routine which introduces additional startup issues. The online repo version can be determined from the time when the command was run, which is I02e97f59f07e1321c69181e2dc10a6c919603f9b Change-Id: I3e2bd55dfdd523ce6ecc54ff4168c157a1b25318 --- M pywikibot/bot.py M pywikibot/config2.py M pywikibot/version.py 3 files changed, 23 insertions(+), 10 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 2c2e2b5..e85f836 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -258,12 +258,16 @@ # new framework release/revision? (handleArgs needs to be called first) try: - log(u'VERSION: %s' % unicode((version.getversion().strip(), - version.getversion_onlinerepo(), - site.live_version()))) + log(u'VERSION: %s' % + version.getversion(online=config.log_pywiki_repo_version).strip()) except version.ParseError: exception() + if config.log_pywiki_repo_version: + log(u'PYWIKI REPO VERSION: %s' % unicode(version.getversion_onlinerepo())) + + log(u'SITE VERSION: %s' % unicode(site.live_version())) + # system if hasattr(os, 'uname'): log(u'SYSTEM: %s' % unicode(os.uname())) diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 18b9ca6..ab29bb0 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -315,6 +315,8 @@ logfilecount = 5 # set to 1 (or higher) to generate "informative" messages to terminal verbose_output = 0 +# set to True to fetch the pywiki version online +log_pywiki_repo_version = False # if True, include a lot of debugging info in logfile # (overrides log setting above) debug_log = [] diff --git a/pywikibot/version.py b/pywikibot/version.py index 6d0d30d..ab455f3 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -28,14 +28,21 @@ return _program_dir -def getversion(): +def getversion(online=True): + """Return a pywikibot version string + @param online: (optional) Include information obtained online + """ data = dict(getversiondict()) # copy dict to prevent changes in 'chache' - try: - hsh2 = getversion_onlinerepo() - hsh1 = data['hsh'] - data['cmp_ver'] = 'OUTDATED' if hsh1 != hsh2 else 'ok' - except Exception: - data['cmp_ver'] = 'n/a' + data['cmp_ver'] = 'n/a' + + if online: + try: + hsh2 = getversion_onlinerepo() + hsh1 = data['hsh'] + data['cmp_ver'] = 'OUTDATED' if hsh1 != hsh2 else 'ok' + except Exception: + pass + data['hsh'] = data['hsh'][:7] # make short hash from full hash return '%(tag)s (%(hsh)s, %(rev)s, %(date)s, %(cmp_ver)s)' % data -- To view, visit https://gerrit.wikimedia.org/r/137009 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e2bd55dfdd523ce6ecc54ff4168c157a1b25318 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] replace deprecated method Page.aslink() with Page.title() - change (pywikibot/core)
by jenkins-bot (Code Review) 07 Jun '14

07 Jun '14

jenkins-bot has submitted this change and it was merged. Change subject: replace deprecated method Page.aslink() with Page.title() ...................................................................... replace deprecated method Page.aslink() with Page.title() Change-Id: I3804b3571ce666176e1cf42f34f973d05bbcb90d --- M pywikibot/textlib.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 43dc65b..df37f95 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -843,9 +843,9 @@ if categories[0][0] == '[': catLinks = categories else: - catLinks = ['[[Category:' + category + ']]' for category in categories] + catLinks = ['[[Category:%s]]' % category for category in categories] else: - catLinks = [category.aslink(noInterwiki=True) + catLinks = [category.title(asLink=True, allowInterwiki=False) for category in categories] if insite.category_on_one_line(): -- To view, visit https://gerrit.wikimedia.org/r/137661 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3804b3571ce666176e1cf42f34f973d05bbcb90d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> 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: jenkins-bot <>

1 0

[Gerrit] Class Property as super of PropertyPage and Claim - change (pywikibot/core)
by jenkins-bot (Code Review) 07 Jun '14

07 Jun '14

jenkins-bot has submitted this change and it was merged. Change subject: Class Property as super of PropertyPage and Claim ...................................................................... Class Property as super of PropertyPage and Claim - move 'types' structure into Property to be expanded and reused - add Property.type getter - use 'globe-coordinate' consistently - deprecate Property.getType, which returns 'globecoordinate' Change-Id: Id63969c045ac63a5b0276f696ce5797c4ee8b6df --- M pywikibot/page.py M pywikibot/site.py M tests/wikibase_tests.py 3 files changed, 98 insertions(+), 38 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index bb120c6..b03edaa 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2765,12 +2765,53 @@ self.repo.mergeItems(fromItem=self, toItem=item, **kwargs) -class PropertyPage(WikibasePage): +class Property(): + types = {'wikibase-item': ItemPage, + 'string': basestring, + 'commonsMedia': ImagePage, + 'globe-coordinate': pywikibot.Coordinate, + 'url': basestring, + 'time': pywikibot.WbTime, + 'quantity': pywikibot.WbQuantity, + } + + def __init__(self, site, id=None): + self.repo = site + self.id = id.upper() + + @property + def type(self): + """ + Return the type of this property + """ + if not hasattr(self, '_type'): + self._type = self.repo.getPropertyType(self) + return self._type + + @deprecated("Property.type") + def getType(self): + """ + Return the type of this property + It returns 'globecoordinate' for type 'globe-coordinate' + in order to be backwards compatible. See + https://gerrit.wikimedia.org/r/#/c/135405/ for background. + """ + if self.type == 'globe-coordinate': + return 'globecoordinate' + else: + return self._type + + def getID(self): + return self.id + + +class PropertyPage(WikibasePage, Property): """ Any page in the property namespace Should be created as: PropertyPage(DataSite, 'Property:P21') """ + def __init__(self, source, title=u""): """ @param source: data repository property is on @@ -2778,6 +2819,7 @@ @param title: page name of property, like "Property:P##" """ WikibasePage.__init__(self, source, title, ns=120) + Property.__init__(self, source, title) self.id = self.title(withNamespace=False).upper() if not self.id.startswith(u'P'): raise ValueError(u"'%s' is not a property page!" % self.title()) @@ -2786,15 +2828,6 @@ if force or not hasattr(self, '_content'): WikibasePage.get(self, force=force, *args) self.type = self._content['datatype'] - - def getType(self): - """ - Returns the type that this item uses - Examples: item, commons media file, StringValue, NumericalValue - """ - if not hasattr(self, 'type'): - self.type = self.repo.getPropertyType(self) - return self.type def newClaim(self, *args, **kwargs): """ @@ -2816,7 +2849,7 @@ raise ValueError(u"'%s' is not a query page!" % self.title()) -class Claim(PropertyPage): +class Claim(Property): """ Claims are standard claims as well as references. """ @@ -2833,7 +2866,7 @@ @param isReference: whether specified claim is a reference @param isQualifier: whether specified claim is a qualifier """ - PropertyPage.__init__(self, site, 'Property:' + pid) + Property.__init__(self, site, pid) self.snak = snak self.hash = hash self.isReference = isReference @@ -2864,15 +2897,15 @@ claim.snaktype = data['mainsnak']['snaktype'] if claim.getSnakType() == 'value': value = data['mainsnak']['datavalue']['value'] - if claim.getType() == 'wikibase-item': + if claim.type == 'wikibase-item': claim.target = ItemPage(site, 'Q' + str(value['numeric-id'])) - elif claim.getType() == 'commonsMedia': + elif claim.type == 'commonsMedia': claim.target = ImagePage(site.image_repository(), value) - elif claim.getType() == 'globecoordinate': + elif claim.type == 'globe-coordinate': claim.target = pywikibot.Coordinate.fromWikibase(value, site) - elif claim.getType() == 'time': + elif claim.type == 'time': claim.target = pywikibot.WbTime.fromWikibase(value) - elif claim.getType() == 'quantity': + elif claim.type == 'quantity': claim.target = pywikibot.WbQuantity.fromWikibase(value) else: # This covers string, url types @@ -2919,18 +2952,10 @@ Sets the target to the passed value. There should be checks to ensure type compliance """ - types = {'wikibase-item': ItemPage, - 'string': basestring, - 'commonsMedia': ImagePage, - 'globecoordinate': pywikibot.Coordinate, - 'url': basestring, - 'time': pywikibot.WbTime, - 'quantity': pywikibot.WbQuantity, - } - if self.getType() in types: - if not isinstance(value, types[self.getType()]): - raise ValueError("%s is not type %s." - % (value, str(types[self.getType()]))) + value_class = self.types[self.type] + if not isinstance(value, value_class): + raise ValueError("%s is not type %s." + % (value, value_class)) self.target = value def changeTarget(self, value=None, snaktype='value', **kwargs): @@ -3047,18 +3072,18 @@ """ Format the target into the proper JSON datavalue that Wikibase wants """ - if self.getType() == 'wikibase-item': + if self.type == 'wikibase-item': value = {'entity-type': 'item', 'numeric-id': self.getTarget().getID(numeric=True)} - elif self.getType() in ('string', 'url'): + elif self.type in ('string', 'url'): value = self.getTarget() - elif self.getType() == 'commonsMedia': + elif self.type == 'commonsMedia': value = self.getTarget().title(withNamespace=False) - elif self.getType() in ('globecoordinate', 'time', 'quantity'): + elif self.type in ('globe-coordinate', 'time', 'quantity'): value = self.getTarget().toWikibase() else: raise NotImplementedError('%s datatype is not supported yet.' - % self.getType()) + % self.type) return value diff --git a/pywikibot/site.py b/pywikibot/site.py index 2d2d243..ef57dc1 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3728,9 +3728,6 @@ except KeyError: dtype = data['entities'][prop.getID().lower()]['datatype'] - if dtype == 'globe-coordinate': - dtype = 'globecoordinate' - # TODO Fix this return dtype @must_be(group='user') diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index e84760b..a8b52e1 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -49,7 +49,7 @@ self.assertEqual(item2.getID(), 'Q5296') self.assertEqual(item.labels['en'], 'Main Page') prop = pywikibot.PropertyPage(repo, 'Property:P21') - self.assertEqual(prop.getType(), 'wikibase-item') + self.assertEqual(prop.type, 'wikibase-item') self.assertEqual(prop.namespace(), 120) claim = pywikibot.Claim(repo, 'p21') self.assertRaises(ValueError, claim.setTarget, value="test") @@ -234,6 +234,44 @@ self._test_fromPage_noitem(link) +class TestPropertyPage(PywikibotTestCase): + + def test_property_empty_property(self): + self.assertRaises(pywikibot.Error, pywikibot.PropertyPage, wikidata) + + def test_globe_coordinate(self): + property_page = pywikibot.PropertyPage(wikidata, 'P625') + self.assertEquals(property_page.type, 'globe-coordinate') + self.assertEquals(property_page.getType(), 'globecoordinate') + + claim = pywikibot.Claim(wikidata, 'P625') + self.assertEquals(claim.type, 'globe-coordinate') + self.assertEquals(claim.getType(), 'globecoordinate') + + +class TestClaimSetValue(PywikibotTestCase): + + def test_set_website(self): + claim = pywikibot.Claim(wikidata, 'P856') + self.assertEquals(claim.type, 'url') + claim.setTarget('http://en.wikipedia.org/') + self.assertEquals(claim.target, 'http://en.wikipedia.org/') + + def test_set_date(self): + claim = pywikibot.Claim(wikidata, 'P569') + self.assertEquals(claim.type, 'time') + claim.setTarget(pywikibot.WbTime(year=2001, month=01, day=01)) + self.assertEquals(claim.target.year, 2001) + self.assertEquals(claim.target.month, 1) + self.assertEquals(claim.target.day, 1) + + def test_set_incorrect_target_value(self): + claim = pywikibot.Claim(wikidata, 'P569') + self.assertRaises(ValueError, claim.setTarget, 'foo') + claim = pywikibot.Claim(wikidata, 'P856') + self.assertRaises(ValueError, claim.setTarget, pywikibot.WbTime(2001)) + + class TestLinks(PywikibotTestCase): """Test cases to test links stored in Wikidata""" def setUp(self): -- To view, visit https://gerrit.wikimedia.org/r/138148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id63969c045ac63a5b0276f696ce5797c4ee8b6df 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] port interwikiFormat test and categoryFormat tests from compat - change (pywikibot/core)
by jenkins-bot (Code Review) 07 Jun '14

07 Jun '14

jenkins-bot has submitted this change and it was merged. Change subject: port interwikiFormat test and categoryFormat tests from compat ...................................................................... port interwikiFormat test and categoryFormat tests from compat Change-Id: I63836e908e0b2bc6f0d7478a756cf6e9744a70a4 --- M tests/textlib_tests.py 1 file changed, 48 insertions(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 1040552..3297c7d 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -15,6 +15,7 @@ import pywikibot import pywikibot.textlib as textlib +from pywikibot import config from tests.utils import unittest @@ -22,10 +23,16 @@ dirname = os.path.join(os.path.dirname(__file__), "pages") for f in ["enwiki_help_editing"]: - files[f] = codecs.open(os.path.join(dirname, f + ".page"), 'r', 'utf-8').read() + files[f] = codecs.open(os.path.join(dirname, f + ".page"), + 'r', 'utf-8').read() class TestSectionFunctions(unittest.TestCase): + def setUp(self): + self.site = pywikibot.Site('en', 'wikipedia') + self.catresult1 = ('[[Category:Cat1]]%(LS)s[[Category:Cat2]]%(LS)s' + % {'LS': config.LS}) + def contains(self, fn, sn): return textlib.does_text_contain_section( files[fn], sn) @@ -82,6 +89,46 @@ self.assertNotContains("enwiki_help_editing", u"Helpful tips", "section header must contain a link") +class TestFormatFunctions(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls.site = pywikibot.Site('en', 'wikipedia') + cls.catresult = ('[[Category:Cat1]]%(LS)s[[Category:Cat2]]%(LS)s' + % {'LS': config.LS}) + + def test_interwiki_format(self): + interwikis = { + 'de': pywikibot.Page(pywikibot.Link('de:German')), + 'fr': pywikibot.Page(pywikibot.Link('fr:French')) + } + self.assertEqual('[[de:German]]%(LS)s[[fr:French]]%(LS)s' + % {'LS': config.LS}, + textlib.interwikiFormat(interwikis, self.site)) + + def test_category_format_raw(self): + self.assertEqual(self.catresult, + textlib.categoryFormat(['[[Category:Cat1]]', + '[[Category:Cat2]]'], + self.site)) + + def test_category_format_bare(self): + self.assertEqual(self.catresult, + textlib.categoryFormat(['Cat1', 'Cat2'], self.site)) + + def test_category_format_Category(self): + data = [pywikibot.Category(self.site, 'Cat1'), + pywikibot.Category(self.site, 'Cat2')] + self.assertEqual(self.catresult, + textlib.categoryFormat(data, self.site)) + + def test_category_format_Page(self): + data = [pywikibot.Page(self.site, 'Category:Cat1'), + pywikibot.Page(self.site, 'Category:Cat2')] + self.assertEqual(self.catresult, + textlib.categoryFormat(data, self.site)) + + if __name__ == '__main__': try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/137664 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63836e908e0b2bc6f0d7478a756cf6e9744a70a4 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] run setUp only once using setupClass class method - change (pywikibot/core)
by jenkins-bot (Code Review) 07 Jun '14

07 Jun '14

jenkins-bot has submitted this change and it was merged. Change subject: run setUp only once using setupClass class method ...................................................................... run setUp only once using setupClass class method Change-Id: I9b92231383ead5b0869e268042791d7917885623 --- M tests/xmlreader_tests.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py index 1c26591..10ecb59 100644 --- a/tests/xmlreader_tests.py +++ b/tests/xmlreader_tests.py @@ -17,8 +17,9 @@ class XmlReaderTestCase(unittest.TestCase): - def setUp(self): - self.path = os.path.dirname(os.path.abspath(__file__)) + @classmethod + def setUpClass(cls): + cls.path = os.path.dirname(os.path.abspath(__file__)) def test_XmlDumpAllRevs(self): pages = [r for r in -- To view, visit https://gerrit.wikimedia.org/r/137896 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b92231383ead5b0869e268042791d7917885623 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] update category redirect templates, backported from core - change (pywikibot/compat)
by jenkins-bot (Code Review) 07 Jun '14

07 Jun '14

jenkins-bot has submitted this change and it was merged. Change subject: update category redirect templates, backported from core ...................................................................... update category redirect templates, backported from core Change-Id: Iaafbe293e44b76854e2c6468944e6f665a823be1 --- M families/commons_family.py 1 file changed, 17 insertions(+), 13 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/families/commons_family.py b/families/commons_family.py index dc597f3..664ad5e 100644 --- a/families/commons_family.py +++ b/families/commons_family.py @@ -67,19 +67,23 @@ self.interwiki_forward = 'wikipedia' self.category_redirect_templates = { - 'commons': (u'Category redirect', - u'Categoryredirect', - u'Synonym taxon category redirect', - u'Invalid taxon category redirect', - u'Monotypic taxon category redirect', - u'See cat', - u'Seecat', - u'See category', - u'Catredirect', - u'Cat redirect', - u'Cat-red', - u'Catredir', - u'Redirect category'), + 'commons': ( + u'Category redirect', + u'Categoryredirect', + u'Catredirect', + u'Cat redirect', + u'Catredir', + u'Cat-red', + u'See cat', + u'Seecat', + u'See category', + u'Redirect category', + u'Redirect cat', + u'Redir cat', + u'Synonym taxon category redirect', + u'Invalid taxon category redirect', + u'Monotypic taxon category redirect', + ), } self.disambcatname = { -- To view, visit https://gerrit.wikimedia.org/r/138147 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaafbe293e44b76854e2c6468944e6f665a823be1 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] update category redirect templates - change (pywikibot/core)
by jenkins-bot (Code Review) 07 Jun '14

07 Jun '14

jenkins-bot has submitted this change and it was merged. Change subject: update category redirect templates ...................................................................... update category redirect templates Change-Id: I46ff62c93e233b2a3df2ffce7208c71d6a3c2793 --- M pywikibot/families/commons_family.py 1 file changed, 17 insertions(+), 13 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/commons_family.py b/pywikibot/families/commons_family.py index 532e26d..39375c9 100644 --- a/pywikibot/families/commons_family.py +++ b/pywikibot/families/commons_family.py @@ -17,19 +17,23 @@ self.interwiki_forward = 'wikipedia' self.category_redirect_templates = { - 'commons': (u'Category redirect', - u'Categoryredirect', - u'Synonym taxon category redirect', - u'Invalid taxon category redirect', - u'Monotypic taxon category redirect', - u'See cat', - u'Seecat', - u'See category', - u'Catredirect', - u'Cat redirect', - u'Cat-red', - u'Catredir', - u'Redirect category'), + 'commons': ( + u'Category redirect', + u'Categoryredirect', + u'Catredirect', + u'Cat redirect', + u'Catredir', + u'Cat-red', + u'See cat', + u'Seecat', + u'See category', + u'Redirect category', + u'Redirect cat', + u'Redir cat', + u'Synonym taxon category redirect', + u'Invalid taxon category redirect', + u'Monotypic taxon category redirect', + ), } self.disambcatname = { -- To view, visit https://gerrit.wikimedia.org/r/138146 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46ff62c93e233b2a3df2ffce7208c71d6a3c2793 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] new attribute repo for wikibase repository - change (pywikibot/core)
by jenkins-bot (Code Review) 07 Jun '14

07 Jun '14

jenkins-bot has submitted this change and it was merged. Change subject: new attribute repo for wikibase repository ...................................................................... new attribute repo for wikibase repository Change-Id: Ibe99d95590a693cc69cc5a720096c552ab3378c3 --- M scripts/featured.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/featured.py b/scripts/featured.py index 07dd683..692062d 100644 --- a/scripts/featured.py +++ b/scripts/featured.py @@ -227,6 +227,7 @@ self.cache = dict() self.filename = None self.site = pywikibot.Site() + self.repo = self.site.data_repository() if self.getOption('fromlang') is True: # must be a list self.options['fromlang'] = False @@ -248,7 +249,7 @@ item_no = featured_name['wikidata'][1] elif task == 'former': item_no = former_name['wikidata'][1] - dp = pywikibot.ItemPage(self.site.data_repository(), item_no) + dp = pywikibot.ItemPage(self.repo, item_no) dp.get() for key in sorted(dp.sitelinks.keys()): try: -- To view, visit https://gerrit.wikimedia.org/r/138155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe99d95590a693cc69cc5a720096c552ab3378c3 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits June 2014