April 2018 - Pywikibot-commits - lists.wikimedia.org

[Gerrit] pywikibot/core[master]: [pep8] Follow naming convention
by jenkins-bot (Code Review) 11 Apr '18

11 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425217 ) Change subject: [pep8] Follow naming convention ...................................................................... [pep8] Follow naming convention - also keep lines below 80 chars - replace deprecated 'limit' parameter with 'total' in TestDataSiteSearchEntities.test_continue - fix some assertTrue(all(...)) tests Change-Id: Ibd296ef2dd551d6cd4ea383bdffaaf8f7834b6cf --- M tests/site_tests.py 1 file changed, 232 insertions(+), 143 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index 667011e..0413fe4 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -77,7 +77,8 @@ super(TokenTestBase, self).tearDown() -class TestSiteObjectDeprecatedFunctions(DefaultSiteTestCase, DeprecationTestCase): +class TestSiteObjectDeprecatedFunctions(DefaultSiteTestCase, + DeprecationTestCase): """Test cases for Site deprecated methods on a live wiki.""" @@ -131,12 +132,13 @@ def test_siteinfo_dump(self): """Test calling the Siteinfo with dump=True.""" - self.assertIn('statistics', self.site.siteinfo('statistics', dump=True)) + self.assertIn('statistics', + self.site.siteinfo('statistics', dump=True)) self.assertOneDeprecationParts('Calling siteinfo', 'itself as a dictionary') def test_language_method(self): - """Test if the language method returns the same as the lang property.""" + """Test if the language method returns the same as lang property.""" self.assertEqual(self.site.language(), self.site.lang) self.assertOneDeprecation() @@ -147,7 +149,7 @@ self.assertOneDeprecation() def test_allpages_filterredir_False(self): - """Test that if filterredir's bool is False it's deprecated to False.""" + """Test if filterredir's bool is False it's deprecated to False.""" for page in self.site.allpages(filterredir='', total=1): self.assertFalse(page.isRedirectPage()) self.assertOneDeprecation() @@ -170,7 +172,8 @@ list(self.site.namespace(14, all=True))) -class TestSiteDryDeprecatedFunctions(DefaultDrySiteTestCase, DeprecationTestCase): +class TestSiteDryDeprecatedFunctions(DefaultDrySiteTestCase, + DeprecationTestCase): """Test cases for Site deprecated methods without a user.""" @@ -254,7 +257,7 @@ cached = True - def testPickleAbility(self): + def test_pickle_ability(self): """Test pickle ability.""" mysite = self.get_site() mysite_str = pickle.dumps(mysite, protocol=config.pickle_protocol) @@ -266,7 +269,7 @@ expect = 'Site("{0}", "{1}")'.format(self.code, self.family) self.assertStringMethod(str.endswith, repr(self.site), expect) - def testBaseMethods(self): + def test_base_methods(self): """Test cases for BaseSite methods.""" mysite = self.get_site() self.assertEqual(mysite.family.name, self.family) @@ -313,9 +316,10 @@ self.assertTrue(mysite.sametitle("Special:Always", "Special:always")) if MediaWikiVersion(mysite.version()) >= MediaWikiVersion('1.16'): self.assertTrue(mysite.sametitle('User:Always', 'User:always')) - self.assertTrue(mysite.sametitle('MediaWiki:Always', 'MediaWiki:always')) + self.assertTrue(mysite.sametitle('MediaWiki:Always', + 'MediaWiki:always')) - def testConstructors(self): + def test_constructors(self): """Test cases for site constructors.""" if isinstance(self.site.family, pywikibot.family.WikimediaFamily): site = self.site @@ -323,20 +327,24 @@ site = None self.assertEqual(pywikibot.site.APISite.fromDBName('enwiki', site), pywikibot.Site('en', 'wikipedia')) - self.assertEqual(pywikibot.site.APISite.fromDBName('eswikisource', site), - pywikibot.Site('es', 'wikisource')) + self.assertEqual( + pywikibot.site.APISite.fromDBName('eswikisource', site), + pywikibot.Site('es', 'wikisource')) self.assertEqual(pywikibot.site.APISite.fromDBName('dewikinews', site), pywikibot.Site('de', 'wikinews')) - self.assertEqual(pywikibot.site.APISite.fromDBName('ukwikivoyage', site), - pywikibot.Site('uk', 'wikivoyage')) + self.assertEqual( + pywikibot.site.APISite.fromDBName('ukwikivoyage', site), + pywikibot.Site('uk', 'wikivoyage')) self.assertEqual(pywikibot.site.APISite.fromDBName('metawiki', site), pywikibot.Site('meta', 'meta')) - self.assertEqual(pywikibot.site.APISite.fromDBName('commonswiki', site), - pywikibot.Site('commons', 'commons')) - self.assertEqual(pywikibot.site.APISite.fromDBName('wikidatawiki', site), - pywikibot.Site('wikidata', 'wikidata')) + self.assertEqual( + pywikibot.site.APISite.fromDBName('commonswiki', site), + pywikibot.Site('commons', 'commons')) + self.assertEqual( + pywikibot.site.APISite.fromDBName('wikidatawiki', site), + pywikibot.Site('wikidata', 'wikidata')) - def testLanguageMethods(self): + def test_language_methods(self): """Test cases for languages() and related methods.""" mysite = self.get_site() langs = mysite.languages() @@ -353,7 +361,7 @@ self.assertIn(item, langs) self.assertIsNone(self.site.namespaces.lookup_name(item)) - def testNamespaceMethods(self): + def test_mamespace_methods(self): """Test cases for methods manipulating namespace names.""" mysite = self.get_site() ns = mysite.namespaces @@ -420,7 +428,7 @@ self.assertEqual(mysite.list_to_text(('pywikibot',)), 'pywikibot') - def testEnglishSpecificMethods(self): + def test_english_specific_methods(self): """Test Site methods using English specific inputs and outputs.""" mysite = self.get_site() if mysite.lang != 'en': @@ -428,11 +436,12 @@ 'English-specific tests not valid on %s' % mysite) self.assertEqual(mysite.months_names[4], (u'May', u'May')) - self.assertEqual(mysite.list_to_text(('Pride', 'Prejudice')), 'Pride and Prejudice') + self.assertEqual(mysite.list_to_text(('Pride', 'Prejudice')), + 'Pride and Prejudice') self.assertEqual(mysite.list_to_text(('This', 'that', 'the other')), 'This, that and the other') - def testPageMethods(self): + def test_page_methods(self): """Test ApiSite methods for getting page-specific info.""" mysite = self.get_site() mainpage = self.get_mainpage() @@ -441,7 +450,8 @@ self.assertIsInstance(mysite.page_can_be_edited(mainpage), bool) self.assertIsInstance(mysite.page_isredirect(mainpage), bool) if mysite.page_isredirect(mainpage): - self.assertIsInstance(mysite.getredirtarget(mainpage), pywikibot.Page) + self.assertIsInstance(mysite.getredirtarget(mainpage), + pywikibot.Page) else: self.assertRaises(pywikibot.IsNotRedirectPage, mysite.getredirtarget, mainpage) @@ -478,7 +488,8 @@ """Test Site.pagereferences.""" # pagereferences includes both backlinks and embeddedin backlinks = set(self.site.pagebacklinks(self.mainpage, namespaces=[0])) - embedded = set(self.site.page_embeddedin(self.mainpage, namespaces=[0])) + embedded = set(self.site.page_embeddedin(self.mainpage, + namespaces=[0])) refs = set(self.site.pagereferences(self.mainpage, namespaces=[0])) self.assertLessEqual(backlinks, refs) @@ -499,8 +510,10 @@ redirs = set(self.site.pagebacklinks( self.mainpage, namespaces=0, filterRedirects=True)) # including links to redirect pages (but not the redirects): - indirect = set(self.site.pagebacklinks( - self.mainpage, namespaces=[0], followRedirects=True, filterRedirects=False)) + indirect = set( + self.site.pagebacklinks(self.mainpage, namespaces=[0], + followRedirects=True, + filterRedirects=False)) for bl in backlinks_ns_0: self.assertIsInstance(bl, pywikibot.Page) @@ -603,7 +616,8 @@ self.assertPagesInNamespaces(links_gen, {0, 1}) for target in self.site.preloadpages( - self.site.pagelinks(self.mainpage, follow_redirects=True, total=5)): + self.site.pagelinks(self.mainpage, follow_redirects=True, + total=5)): self.assertIsInstance(target, pywikibot.Page) self.assertFalse(target.isRedirectPage()) @@ -681,11 +695,10 @@ if (len(page.text.encode(mysite.encoding())) > 200 and mysite.data_repository() == mysite): unittest_print( - '{0}.text is > 200 bytes while raw JSON is <= 200'.format( - page)) + '{}.text is > 200 bytes while raw JSON is <= 200' + .format(page)) continue - self.assertLessEqual(len(page.text.encode(mysite.encoding())), - 200) + self.assertLessEqual(len(page.text.encode(mysite.encoding())), 200) def test_allpages_protection(self): """Test allpages with protect_type parameter.""" @@ -701,7 +714,7 @@ self.assertIn("edit", page._protection) self.assertIn("sysop", page._protection["edit"]) - def testAllLinks(self): + def test_all_links(self): """Test the site.alllinks() method.""" if self.site.family.name == 'wsbeta': raise unittest.SkipTest('Test fails on betawiki; T69931') @@ -731,7 +744,7 @@ errgen = mysite.alllinks(unique=True, fromids=True) self.assertRaises(pywikibot.Error, next, errgen) - def testAllCategories(self): + def test_all_categories(self): """Test the site.allcategories() method.""" mysite = self.get_site() ac = list(mysite.allcategories(total=10)) @@ -806,7 +819,7 @@ self.assertIn('groups' in user) self.assertIn('sysop' in user['groups']) - def testAllImages(self): + def test_all_images(self): """Test the site.allimages() method.""" mysite = self.get_site() ai = list(mysite.allimages(total=10)) @@ -842,8 +855,10 @@ self.assertLessEqual(len(the_list), 10) self.assertTrue(all(isinstance(tup, tuple) and len(tup) == 4 for tup in the_list)) - self.assertTrue(all(isinstance(tup[0], pywikibot.FilePage) for tup in the_list)) - self.assertTrue(all(isinstance(tup[1], pywikibot.Timestamp) for tup in the_list)) + self.assertTrue(all(isinstance(tup[0], pywikibot.FilePage) + for tup in the_list)) + self.assertTrue(all(isinstance(tup[1], pywikibot.Timestamp) + for tup in the_list)) self.assertTrue(all(isinstance(tup[2], unicode) for tup in the_list)) self.assertTrue(all(isinstance(tup[3], unicode) for tup in the_list)) @@ -854,8 +869,10 @@ # Make sure each object returned by site.longpages() is # a tuple of a Page object and an int - self.assertTrue(all(isinstance(tup, tuple) and len(tup) == 2) for tup in longpages) - self.assertTrue(all(isinstance(tup[0], pywikibot.Page) for tup in longpages)) + self.assertTrue(all(isinstance(tup, tuple) and len(tup) == 2 + for tup in longpages)) + self.assertTrue(all(isinstance(tup[0], pywikibot.Page) + for tup in longpages)) self.assertTrue(all(isinstance(tup[1], int) for tup in longpages)) def test_shortpages(self): @@ -865,8 +882,10 @@ # Make sure each object returned by site.shortpages() is # a tuple of a Page object and an int - self.assertTrue(all(isinstance(tup, tuple) and len(tup) == 2) for tup in shortpages) - self.assertTrue(all(isinstance(tup[0], pywikibot.Page) for tup in shortpages)) + self.assertTrue(all(isinstance(tup, tuple) and len(tup) == 2 + for tup in shortpages)) + self.assertTrue(all(isinstance(tup[0], pywikibot.Page) + for tup in shortpages)) self.assertTrue(all(isinstance(tup[1], int) for tup in shortpages)) def test_ancientpages(self): @@ -876,9 +895,12 @@ # Make sure each object returned by site.ancientpages() is # a tuple of a Page object and a Timestamp object - self.assertTrue(all(isinstance(tup, tuple) and len(tup) == 2) for tup in ancientpages) - self.assertTrue(all(isinstance(tup[0], pywikibot.Page) for tup in ancientpages)) - self.assertTrue(all(isinstance(tup[1], pywikibot.Timestamp) for tup in ancientpages)) + self.assertTrue(all(isinstance(tup, tuple) and len(tup) == 2 + for tup in ancientpages)) + self.assertTrue(all(isinstance(tup[0], pywikibot.Page) + for tup in ancientpages)) + self.assertTrue(all(isinstance(tup[1], pywikibot.Timestamp) + for tup in ancientpages)) def test_unwatchedpages(self): """Test the site.unwatchedpages() method.""" @@ -888,14 +910,17 @@ except api.APIError as error: if error.code in ('specialpage-cantexecute', 'gqpspecialpage-cantexecute'): - # User must have correct permissions to use Special:UnwatchedPages + # User must have correct permissions to use + # Special:UnwatchedPages raise unittest.SkipTest(error) raise - # Make sure each object returned by site.unwatchedpages() is a Page object - self.assertTrue(all(isinstance(p, pywikibot.Page) for p in unwatchedpages)) + # Make sure each object returned by site.unwatchedpages() is a + # Page object + self.assertTrue(all(isinstance(p, pywikibot.Page) + for p in unwatchedpages)) - def testBlocks(self): + def test_blocks(self): """Test the site.blocks() method.""" mysite = self.get_site() props = ("id", "by", "timestamp", "expiry", "reason") @@ -922,45 +947,55 @@ self.assertGreaterEqual(timestamps[t], timestamps[t - 1]) for block in mysite.blocks( - starttime=pywikibot.Timestamp.fromISOformat('2008-07-01T00:00:01Z'), + starttime=pywikibot.Timestamp.fromISOformat( + '2008-07-01T00:00:01Z'), total=5): self.assertIsInstance(block, dict) for prop in props: self.assertIn(prop, block) for block in mysite.blocks( - endtime=pywikibot.Timestamp.fromISOformat('2008-07-31T23:59:59Z'), + endtime=pywikibot.Timestamp.fromISOformat( + '2008-07-31T23:59:59Z'), total=5): self.assertIsInstance(block, dict) for prop in props: self.assertIn(prop, block) for block in mysite.blocks( - starttime=pywikibot.Timestamp.fromISOformat('2008-08-02T00:00:01Z'), - endtime=pywikibot.Timestamp.fromISOformat("2008-08-02T23:59:59Z"), + starttime=pywikibot.Timestamp.fromISOformat( + '2008-08-02T00:00:01Z'), + endtime=pywikibot.Timestamp.fromISOformat( + '2008-08-02T23:59:59Z'), reverse=True, total=5): self.assertIsInstance(block, dict) for prop in props: self.assertIn(prop, block) for block in mysite.blocks( - starttime=pywikibot.Timestamp.fromISOformat('2008-08-03T23:59:59Z'), - endtime=pywikibot.Timestamp.fromISOformat("2008-08-03T00:00:01Z"), + starttime=pywikibot.Timestamp.fromISOformat( + '2008-08-03T23:59:59Z'), + endtime=pywikibot.Timestamp.fromISOformat( + '2008-08-03T00:00:01Z'), total=5): self.assertIsInstance(block, dict) for prop in props: self.assertIn(prop, block) # starttime earlier than endtime self.assertRaises(pywikibot.Error, mysite.blocks, total=5, - starttime=pywikibot.Timestamp.fromISOformat("2008-08-03T00:00:01Z"), - endtime=pywikibot.Timestamp.fromISOformat('2008-08-03T23:59:59Z')) + starttime=pywikibot.Timestamp.fromISOformat( + '2008-08-03T00:00:01Z'), + endtime=pywikibot.Timestamp.fromISOformat( + '2008-08-03T23:59:59Z')) # reverse: endtime earlier than starttime self.assertRaises(pywikibot.Error, mysite.blocks, - starttime=pywikibot.Timestamp.fromISOformat("2008-08-03T23:59:59Z"), - endtime=pywikibot.Timestamp.fromISOformat('2008-08-03T00:00:01Z'), + starttime=pywikibot.Timestamp.fromISOformat( + '2008-08-03T23:59:59Z'), + endtime=pywikibot.Timestamp.fromISOformat( + '2008-08-03T00:00:01Z'), reverse=True, total=5) for block in mysite.blocks(users='80.100.22.71', total=5): self.assertIsInstance(block, dict) self.assertEqual(block['user'], '80.100.22.71') - def testExturlusage(self): + def test_exturl_usage(self): """Test the site.exturlusage() method.""" mysite = self.get_site() url = "www.google.com" @@ -978,7 +1013,8 @@ p1 = pywikibot.Page(site, u'Foo') site.lock_page(page=p1, block=True) - self.assertRaises(pywikibot.site.PageInUse, site.lock_page, page=p1, block=False) + self.assertRaises(pywikibot.site.PageInUse, site.lock_page, page=p1, + block=False) site.unlock_page(page=p1) # verify it's unlocked site.lock_page(page=p1, block=False) @@ -1180,7 +1216,7 @@ "nosuchright"): self.assertIsInstance(mysite.has_right(rgt), bool) - def testLogEvents(self): + def test_logevents(self): """Test the site.logevents() method.""" mysite = self.get_site() for entry in mysite.logevents(user=mysite.user(), total=3): @@ -1215,22 +1251,29 @@ """Test logevents method.""" mysite = self.get_site() for entry in mysite.logevents( - start=pywikibot.Timestamp.fromISOformat('2008-09-01T00:00:01Z'), total=5): + start=pywikibot.Timestamp.fromISOformat( + '2008-09-01T00:00:01Z'), total=5): self.assertIsInstance(entry, pywikibot.logentries.LogEntry) - self.assertLessEqual(str(entry.timestamp()), "2008-09-01T00:00:01Z") + self.assertLessEqual(str(entry.timestamp()), + '2008-09-01T00:00:01Z') for entry in mysite.logevents( - end=pywikibot.Timestamp.fromISOformat('2008-09-02T23:59:59Z'), total=5): + end=pywikibot.Timestamp.fromISOformat('2008-09-02T23:59:59Z'), + total=5): self.assertIsInstance(entry, pywikibot.logentries.LogEntry) - self.assertGreaterEqual(str(entry.timestamp()), "2008-09-02T23:59:59Z") + self.assertGreaterEqual(str(entry.timestamp()), + '2008-09-02T23:59:59Z') for entry in mysite.logevents( - start=pywikibot.Timestamp.fromISOformat('2008-02-02T00:00:01Z'), + start=pywikibot.Timestamp.fromISOformat( + '2008-02-02T00:00:01Z'), end=pywikibot.Timestamp.fromISOformat("2008-02-02T23:59:59Z"), reverse=True, total=5): self.assertIsInstance(entry, pywikibot.logentries.LogEntry) self.assertTrue( - "2008-02-02T00:00:01Z" <= str(entry.timestamp()) <= "2008-02-02T23:59:59Z") + '2008-02-02T00:00:01Z' <= str(entry.timestamp()) + <= '2008-02-02T23:59:59Z') for entry in mysite.logevents( - start=pywikibot.Timestamp.fromISOformat('2008-02-03T23:59:59Z'), + start=pywikibot.Timestamp.fromISOformat( + '2008-02-03T23:59:59Z'), end=pywikibot.Timestamp.fromISOformat("2008-02-03T00:00:01Z"), total=5): self.assertIsInstance(entry, pywikibot.logentries.LogEntry) @@ -1238,12 +1281,16 @@ "2008-02-03T00:00:01Z" <= str(entry.timestamp()) <= "2008-02-03T23:59:59Z") # starttime earlier than endtime self.assertRaises(pywikibot.Error, mysite.logevents, - start=pywikibot.Timestamp.fromISOformat("2008-02-03T00:00:01Z"), - end=pywikibot.Timestamp.fromISOformat("2008-02-03T23:59:59Z"), total=5) + start=pywikibot.Timestamp.fromISOformat( + '2008-02-03T00:00:01Z'), + end=pywikibot.Timestamp.fromISOformat( + '2008-02-03T23:59:59Z'), total=5) # reverse: endtime earlier than starttime self.assertRaises(pywikibot.Error, mysite.logevents, - start=pywikibot.Timestamp.fromISOformat("2008-02-03T23:59:59Z"), - end=pywikibot.Timestamp.fromISOformat('2008-02-03T00:00:01Z'), + start=pywikibot.Timestamp.fromISOformat( + '2008-02-03T23:59:59Z'), + end=pywikibot.Timestamp.fromISOformat( + '2008-02-03T00:00:01Z'), reverse=True, total=5) @@ -1309,7 +1356,8 @@ """Test the site.recentchanges() method with start/end.""" mysite = self.site for change in mysite.recentchanges( - start=pywikibot.Timestamp.fromISOformat("2008-10-01T01:02:03Z"), + start=pywikibot.Timestamp.fromISOformat( + '2008-10-01T01:02:03Z'), total=5): self.assertIsInstance(change, dict) self.assertLessEqual(change['timestamp'], "2008-10-01T01:02:03Z") @@ -1317,39 +1365,48 @@ end=pywikibot.Timestamp.fromISOformat('2008-04-01T02:03:04Z'), total=5): self.assertIsInstance(change, dict) - self.assertGreaterEqual(change['timestamp'], "2008-10-01T02:03:04Z") + self.assertGreaterEqual(change['timestamp'], + '2008-10-01T02:03:04Z') for change in mysite.recentchanges( - start=pywikibot.Timestamp.fromISOformat('2008-10-01T03:05:07Z'), + start=pywikibot.Timestamp.fromISOformat( + '2008-10-01T03:05:07Z'), total=5, reverse=True): self.assertIsInstance(change, dict) - self.assertGreaterEqual(change['timestamp'], "2008-10-01T03:05:07Z") + self.assertGreaterEqual(change['timestamp'], + '2008-10-01T03:05:07Z') for change in mysite.recentchanges( end=pywikibot.Timestamp.fromISOformat('2008-10-01T04:06:08Z'), total=5, reverse=True): self.assertIsInstance(change, dict) self.assertLessEqual(change['timestamp'], "2008-10-01T04:06:08Z") for change in mysite.recentchanges( - start=pywikibot.Timestamp.fromISOformat('2008-10-03T11:59:59Z'), + start=pywikibot.Timestamp.fromISOformat( + '2008-10-03T11:59:59Z'), end=pywikibot.Timestamp.fromISOformat("2008-10-03T00:00:01Z"), total=5): self.assertIsInstance(change, dict) self.assertTrue( - "2008-10-03T00:00:01Z" <= change['timestamp'] <= "2008-10-03T11:59:59Z") + '2008-10-03T00:00:01Z' <= change['timestamp'] + <= '2008-10-03T11:59:59Z') for change in mysite.recentchanges( - start=pywikibot.Timestamp.fromISOformat('2008-10-05T06:00:01Z'), + start=pywikibot.Timestamp.fromISOformat( + '2008-10-05T06:00:01Z'), end=pywikibot.Timestamp.fromISOformat("2008-10-05T23:59:59Z"), reverse=True, total=5): self.assertIsInstance(change, dict) self.assertTrue( - "2008-10-05T06:00:01Z" <= change['timestamp'] <= "2008-10-05T23:59:59Z") + '2008-10-05T06:00:01Z' <= change['timestamp'] + <= '2008-10-05T23:59:59Z') # start earlier than end self.assertRaises(pywikibot.Error, mysite.recentchanges, start="2008-02-03T00:00:01Z", end="2008-02-03T23:59:59Z", total=5) # reverse: end earlier than start self.assertRaises(pywikibot.Error, mysite.recentchanges, - start=pywikibot.Timestamp.fromISOformat("2008-02-03T23:59:59Z"), - end=pywikibot.Timestamp.fromISOformat('2008-02-03T00:00:01Z'), + start=pywikibot.Timestamp.fromISOformat( + '2008-02-03T23:59:59Z'), + end=pywikibot.Timestamp.fromISOformat( + '2008-02-03T00:00:01Z'), reverse=True, total=5) def test_ns_file(self): @@ -1487,7 +1544,7 @@ raise unittest.SkipTest( 'The site %r does not use MediaWiki search' % self.site) - def testSearch(self): + def test_search(self): """Test the site.search() method.""" mysite = self.site try: @@ -1511,7 +1568,8 @@ self.assertEqual(hit.namespace(), 0) except pywikibot.data.api.APIError as e: if e.code == "gsrsearch-error" and "timed out" in e.info: - raise unittest.SkipTest("gsrsearch returned timeout on site: %r" % e) + raise unittest.SkipTest( + 'gsrsearch returned timeout on site: %r' % e) raise @suppress_warnings("where='title' is deprecated", DeprecationWarning) @@ -1548,8 +1606,9 @@ self.assertLessEqual(len(uc), 10) self.assertTrue(all(isinstance(contrib, dict) for contrib in uc)) - self.assertTrue(all('user' in contrib and contrib['user'] == mysite.user() - for contrib in uc)) + self.assertTrue( + all('user' in contrib and contrib['user'] == mysite.user() + for contrib in uc)) def test_namespaces(self): """Test the site.usercontribs() method using namespaces.""" @@ -1665,7 +1724,7 @@ user = True - def testWatchlistrevs(self): + def test_watchlist_revs(self): """Test the site.watchlist_revs() method.""" mysite = self.get_site() wl = list(mysite.watchlist_revs(total=10)) @@ -1693,13 +1752,15 @@ total=5): self.assertIsInstance(rev, dict) self.assertTrue( - "2008-10-13T00:00:01Z" <= rev['timestamp'] <= "2008-10-13T11:59:59Z") + '2008-10-13T00:00:01Z' <= rev['timestamp'] + <= '2008-10-13T11:59:59Z') for rev in mysite.watchlist_revs(start="2008-10-15T06:00:01Z", end="2008-10-15T23:59:59Z", reverse=True, total=5): self.assertIsInstance(rev, dict) self.assertTrue( - "2008-10-15T06:00:01Z" <= rev['timestamp'] <= "2008-10-15T23:59:59Z") + '2008-10-15T06:00:01Z' <= rev['timestamp'] + <= '2008-10-15T23:59:59Z') # start earlier than end self.assertRaises(pywikibot.Error, mysite.watchlist_revs, start="2008-09-03T00:00:01Z", @@ -1750,7 +1811,7 @@ self.assertIsInstance(mysite.has_group("bots", True), bool) self.assertFalse(mysite.has_group("nonexistent_group", True)) - def testDeletedrevs(self): + def test_deletedrevs(self): """Test the site.deletedrevs() method.""" mysite = self.get_site() mainpage = self.get_mainpage() @@ -1772,13 +1833,15 @@ page=mainpage, total=5): for rev in item['revisions']: self.assertIsInstance(rev, dict) - self.assertGreaterEqual(rev['timestamp'], "2008-10-11T02:03:04Z") + self.assertGreaterEqual(rev['timestamp'], + '2008-10-11T02:03:04Z') for item in mysite.deletedrevs(start="2008-10-11T03:05:07Z", page=mainpage, total=5, reverse=True): for rev in item['revisions']: self.assertIsInstance(rev, dict) - self.assertGreaterEqual(rev['timestamp'], "2008-10-11T03:05:07Z") + self.assertGreaterEqual(rev['timestamp'], + '2008-10-11T03:05:07Z') for item in mysite.deletedrevs(end="2008-10-11T04:06:08Z", page=mainpage, total=5, reverse=True): @@ -1791,7 +1854,8 @@ for rev in item['revisions']: self.assertIsInstance(rev, dict) self.assertLessEqual(rev['timestamp'], "2008-10-13T11:59:59Z") - self.assertGreaterEqual(rev['timestamp'], "2008-10-13T00:00:01Z") + self.assertGreaterEqual(rev['timestamp'], + '2008-10-13T00:00:01Z') for item in mysite.deletedrevs(start="2008-10-15T06:00:01Z", end="2008-10-15T23:59:59Z", page=mainpage, reverse=True, @@ -1799,7 +1863,8 @@ for rev in item['revisions']: self.assertIsInstance(rev, dict) self.assertLessEqual(rev['timestamp'], "2008-10-15T23:59:59Z") - self.assertGreaterEqual(rev['timestamp'], "2008-10-15T06:00:01Z") + self.assertGreaterEqual(rev['timestamp'], + '2008-10-15T06:00:01Z') # start earlier than end self.assertRaises(pywikibot.Error, mysite.deletedrevs, @@ -1827,7 +1892,8 @@ site = self.get_site() p1 = pywikibot.Page(site, u'User:Unicodesnowman/ProtectTest') - r = site.protect(protections={'edit': 'sysop', 'move': 'autoconfirmed'}, + r = site.protect(protections={'edit': 'sysop', + 'move': 'autoconfirmed'}, page=p1, reason='Pywikibot unit test') self.assertEqual(r, None) @@ -1842,8 +1908,8 @@ reason='Pywikibot unit test') self.assertEqual(site.page_restrictions(page=p1), - {u'edit': (u'sysop', u'2050-01-01T00:00:00Z'), - u'move': (u'autoconfirmed', u'2050-01-01T00:00:00Z')}) + {'edit': ('sysop', '2050-01-01T00:00:00Z'), + 'move': ('autoconfirmed', '2050-01-01T00:00:00Z')}) site.protect(protections={'edit': '', 'move': ''}, page=p1, @@ -1855,7 +1921,8 @@ site = self.get_site() p1 = pywikibot.Page(site, u'User:Unicodesnowman/ProtectTest') - r = site.protect(protections={'edit': 'sysop', 'move': 'autoconfirmed'}, + r = site.protect(protections={'edit': 'sysop', + 'move': 'autoconfirmed'}, page=p1, reason='Pywikibot unit test') self.assertEqual(r, None) @@ -1871,8 +1938,8 @@ reason='Pywikibot unit test') self.assertEqual(site.page_restrictions(page=p1), - {u'edit': (u'sysop', u'2050-01-01T00:00:00Z'), - u'move': (u'autoconfirmed', u'2050-01-01T00:00:00Z')}) + {'edit': ('sysop', '2050-01-01T00:00:00Z'), + 'move': ('autoconfirmed', '2050-01-01T00:00:00Z')}) p1 = pywikibot.Page(site, u'User:Unicodesnowman/ProtectTest') site.protect(protections={'edit': '', 'move': ''}, @@ -1881,7 +1948,7 @@ self.assertEqual(site.page_restrictions(page=p1), {}) def test_protect_exception(self): - """Test that site.protect() throws an exception when passed invalid args.""" + """Test that site.protect() throws an exception for invalid args.""" site = self.get_site() p1 = pywikibot.Page(site, u'User:Unicodesnowman/ProtectTest') self.assertRaises(pywikibot.Error, site.protect, @@ -1938,7 +2005,7 @@ cached = True - def testUsers(self): + def test_users(self): """Test the site.users() method with preset usernames.""" mysite = self.site cnt = 0 @@ -1963,7 +2030,7 @@ token_type = 'patrol' write = True - def testPatrol(self): + def test_patrol(self): """Test the site.patrol() method.""" mysite = self.get_site() @@ -2102,7 +2169,8 @@ if tokentype: self.assertRegex( unicode(error_msg), - "Action '[a-z]+' is not allowed for user .* on .* wiki.") + "Action '[a-z]+' is not allowed " + 'for user .* on .* wiki.') # test __contains__ self.assertNotIn(tokentype[0], self.mysite.tokens) else: @@ -2141,7 +2209,8 @@ def testInvalidToken(self): """Test invalid token.""" - self.assertRaises(pywikibot.Error, lambda t: self.mysite.tokens[t], "invalidtype") + self.assertRaises(pywikibot.Error, lambda t: self.mysite.tokens[t], + 'invalidtype') class TestDeprecatedEditTokenFunctions(TokenTestBase, @@ -2183,7 +2252,8 @@ """Test site.getPatrolToken.""" self.mysite = self.site try: - self.assertEqual(self.mysite.getPatrolToken(), self.mysite.tokens['patrol']) + self.assertEqual(self.mysite.getPatrolToken(), + self.mysite.tokens['patrol']) self.assertOneDeprecation() except pywikibot.Error as error_msg: self.assertRegex( @@ -2199,7 +2269,7 @@ cached = True - def testExtensions(self): + def test_extensions(self): """Test Extensions.""" mysite = self.get_site() # test automatically getting extensions cache @@ -2222,7 +2292,7 @@ cached = True - def test_API_limits_with_site_methods(self): + def test_api_limits_with_site_methods(self): """Test step/total parameters for different sitemethods.""" mysite = self.get_site() mypage = pywikibot.Page(mysite, 'Albert Einstein') @@ -2258,18 +2328,20 @@ cached = True - def testSiteinfo(self): + def test_siteinfo(self): """Test the siteinfo property.""" # general enteries mysite = self.get_site() self.assertIsInstance(mysite.siteinfo['timeoffset'], (int, float)) self.assertTrue(-12 * 60 <= mysite.siteinfo['timeoffset'] <= +14 * 60) self.assertEqual(mysite.siteinfo['timeoffset'] % 15, 0) - 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"]) + 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.""" + """Test conversion of boolean properties from empty strings.""" mysite = self.get_site() self.assertIsInstance(mysite.siteinfo['titleconversion'], bool) @@ -2285,7 +2357,8 @@ self.assertIsInstance( datetime.strptime(mysite.siteinfo['time'], '%Y-%m-%dT%H:%M:%SZ'), datetime) - self.assertEqual(re.findall(r'\$1', mysite.siteinfo['articlepath']), ['$1']) + self.assertEqual(re.findall(r'\$1', mysite.siteinfo['articlepath']), + ['$1']) def test_properties_with_defaults(self): """Test the siteinfo properties with defaults.""" @@ -2319,11 +2392,15 @@ self.assertEqual(len(mysite.siteinfo.get(not_exists)), 0) self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists))) if PY2: - self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists).iteritems())) - self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists).itervalues())) - self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists).iterkeys())) + self.assertFalse( + entered_loop(mysite.siteinfo.get(not_exists).iteritems())) + self.assertFalse( + entered_loop(mysite.siteinfo.get(not_exists).itervalues())) + self.assertFalse( + entered_loop(mysite.siteinfo.get(not_exists).iterkeys())) self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists).items())) - self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists).values())) + self.assertFalse( + entered_loop(mysite.siteinfo.get(not_exists).values())) self.assertFalse(entered_loop(mysite.siteinfo.get(not_exists).keys())) @@ -2370,9 +2447,10 @@ """Setup tests.""" super(TestSiteLoadRevisions, self).setUp() self.mysite = self.get_site() - self.mainpage = pywikibot.Page(pywikibot.Link("Main Page", self.mysite)) + self.mainpage = pywikibot.Page(pywikibot.Link('Main Page', + self.mysite)) - def testLoadRevisions_basic(self): + def test_loadrevisions_basic(self): """Test the site.loadrevisions() method.""" # Load revisions without content self.mysite.loadrevisions(self.mainpage, total=15) @@ -2389,18 +2467,21 @@ self.mysite.loadrevisions(self.mainpage, content=True, total=5) self.assertFalse(hasattr(self.mainpage, '_text')) self.assertIn(self.mainpage._revid, self.mainpage._revisions) - self.assertIsNotNone(self.mainpage._revisions[self.mainpage._revid].text) + self.assertIsNotNone( + self.mainpage._revisions[self.mainpage._revid].text) self.assertTrue(self.mainpage._revisions[self.mainpage._revid].text) self.assertIsNotNone(self.mainpage.text) - def testLoadRevisions_revids(self): + def test_loadrevisions_revids(self): """Test the site.loadrevisions() method, listing based on revid.""" # revids as list of int self.mysite.loadrevisions(self.mainpage, revids=[139992, 139993]) - self.assertTrue(all(rev in self.mainpage._revisions for rev in [139992, 139993])) + self.assertTrue(all(rev in self.mainpage._revisions + for rev in [139992, 139993])) # revids as list of str self.mysite.loadrevisions(self.mainpage, revids=['139994', '139995']) - self.assertTrue(all(rev in self.mainpage._revisions for rev in [139994, 139995])) + self.assertTrue(all(rev in self.mainpage._revisions + for rev in [139994, 139995])) # revids as int self.mysite.loadrevisions(self.mainpage, revids=140000) self.assertIn(140000, self.mainpage._revisions) @@ -2411,17 +2492,17 @@ self.assertRaises(pywikibot.Error, self.mysite.loadrevisions, self.mainpage, revids=130000) - def testLoadRevisions_querycontinue(self): + def test_loadrevisions_querycontinue(self): """Test the site.loadrevisions() method with query-continue.""" self.mysite.loadrevisions(self.mainpage, step=5, total=12) self.assertEqual(len(self.mainpage._revisions), 12) - def testLoadRevisions_revdir(self): + def test_loadrevisions_revdir(self): """Test the site.loadrevisions() method with rvdir=True.""" self.mysite.loadrevisions(self.mainpage, rvdir=True, total=15) self.assertEqual(len(self.mainpage._revisions), 15) - def testLoadRevisions_timestamp(self): + def test_loadrevisions_timestamp(self): """Test the site.loadrevisions() method, listing based on timestamp.""" self.mysite.loadrevisions(self.mainpage, rvdir=True, total=15) self.assertEqual(len(self.mainpage._revisions), 15) @@ -2433,15 +2514,17 @@ # Raises "loadrevisions: starttime > endtime with rvdir=True" self.assertRaises(ValueError, self.mysite.loadrevisions, self.mainpage, rvdir=True, - starttime="2002-02-01T00:00:00Z", endtime="2002-01-01T00:00:00Z") + starttime='2002-02-01T00:00:00Z', + endtime='2002-01-01T00:00:00Z') # Retrieve newest revisions; listing based on timestamp. # Raises "loadrevisions: endtime > starttime with rvdir=False" self.assertRaises(ValueError, self.mysite.loadrevisions, self.mainpage, rvdir=False, - starttime="2002-01-01T00:00:00Z", endtime="2002-02-01T00:00:00Z") + starttime='2002-01-01T00:00:00Z', + endtime='2002-02-01T00:00:00Z') - def testLoadRevisions_rev_id(self): + def test_loadrevisions_rev_id(self): """Test the site.loadrevisions() method, listing based on rev_id.""" self.mysite.loadrevisions(self.mainpage, rvdir=True, total=15) self.assertEqual(len(self.mainpage._revisions), 15) @@ -2460,7 +2543,7 @@ self.mainpage, rvdir=False, startid="100000", endid="200000") - def testLoadRevisions_user(self): + def test_loadrevisions_user(self): """Test the site.loadrevisions() method, filtering by user.""" # Only list revisions made by this user. self.mainpage._revisions = {} @@ -2469,14 +2552,15 @@ revs = self.mainpage._revisions self.assertTrue(all(revs[rev].user == "Magnus Manske" for rev in revs)) - def testLoadRevisions_excludeuser(self): + def test_loadrevisions_excludeuser(self): """Test the site.loadrevisions() method, excluding user.""" # Do not list revisions made by this user. self.mainpage._revisions = {} self.mysite.loadrevisions(self.mainpage, rvdir=True, excludeuser="Magnus Manske") revs = self.mainpage._revisions - self.assertFalse(any(revs[rev].user == "Magnus Manske" for rev in revs)) + self.assertFalse(any(revs[rev].user == 'Magnus Manske' + for rev in revs)) # TODO test other optional arguments @@ -2506,7 +2590,7 @@ cached = True - def testInterWikiForward(self): + def test_interwiki_forward(self): """Test interwiki forward.""" self.site = self.get_site() self.mainpage = pywikibot.Page(pywikibot.Link("Main Page", self.site)) @@ -2526,7 +2610,7 @@ cached = True - def testNamespaceCase(self): + def test_namespace_case(self): """Test namespace case.""" site = self.get_site() @@ -2545,7 +2629,7 @@ cached = True - def testNamespaceAliases(self): + def test_namespace_aliases(self): """Test namespace aliases.""" site = self.get_site() @@ -3080,7 +3164,7 @@ def test_continue(self): """Test that continue parameter in search_entities works.""" datasite = self.get_repo() - kwargs = {'limit': 50} + kwargs = {'total': 50} pages = datasite.search_entities('Rembrandt', 'en', **kwargs) kwargs['continue'] = 1 pages_continue = datasite.search_entities('Rembrandt', 'en', **kwargs) @@ -3091,7 +3175,8 @@ site = self.get_site() lang_codes = site._paraminfo.parameter('wbsearchentities', 'language')['type'] - lang_codes2 = [lang['code'] for lang in site._siteinfo.get('languages')] + lang_codes2 = [lang['code'] + for lang in site._siteinfo.get('languages')] self.assertEqual(lang_codes, lang_codes2) def test_invalid_language(self): @@ -3349,7 +3434,7 @@ net = False - def testNonMWsites(self): + def test_non_mw_sites(self): """Test NonMWAPISite for sites not using MediaWiki.""" self._run_test("http://moinmo.in/$1") self._run_test("http://twiki.org/cgi-bin/view/$1") @@ -3381,7 +3466,7 @@ cached = True - def test_cache_proofreadinfo_on_site_with_ProofreadPage(self): + def test_cache_proofreadinfo_on_site_with_proofreadpage(self): """Test Site._cache_proofreadinfo().""" site = self.get_site('en.ws') ql_res = {0: u'Without text', 1: u'Not proofread', 2: u'Problematic', @@ -3395,13 +3480,17 @@ del site._proofread_page_ns # Check that property reloads. self.assertEqual(site.namespaces[104], site.proofread_page_ns) - def test_cache_proofreadinfo_on_site_without_ProofreadPage(self): + def test_cache_proofreadinfo_on_site_without_proofreadpage(self): """Test Site._cache_proofreadinfo().""" site = self.get_site('en.wp') - self.assertRaises(pywikibot.UnknownExtension, site._cache_proofreadinfo) - self.assertRaises(pywikibot.UnknownExtension, lambda x: x.proofread_index_ns, site) - self.assertRaises(pywikibot.UnknownExtension, lambda x: x.proofread_page_ns, site) - self.assertRaises(pywikibot.UnknownExtension, lambda x: x.proofread_levels, site) + self.assertRaises(pywikibot.UnknownExtension, + site._cache_proofreadinfo) + self.assertRaises(pywikibot.UnknownExtension, + lambda x: x.proofread_index_ns, site) + self.assertRaises(pywikibot.UnknownExtension, + lambda x: x.proofread_page_ns, site) + self.assertRaises(pywikibot.UnknownExtension, + lambda x: x.proofread_levels, site) class TestPropertyNames(DefaultSiteTestCase): -- To view, visit https://gerrit.wikimedia.org/r/425217 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibd296ef2dd551d6cd4ea383bdffaaf8f7834b6cf Gerrit-Change-Number: 425217 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [cleanup] use content parameter instead of getText in loadrevisions
by jenkins-bot (Code Review) 11 Apr '18

11 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425128 ) Change subject: [cleanup] use content parameter instead of getText in loadrevisions ...................................................................... [cleanup] use content parameter instead of getText in loadrevisions deprecate "getText" parameter of Site.loadrevisions and use "content" instead. "content" is used on all other methods to preload text. Change-Id: I6125fd1f1aec429548f2335e2d052dbccbb222f1 --- M pywikibot/page.py M pywikibot/site.py M tests/basepage_tests.py M tests/site_tests.py 4 files changed, 14 insertions(+), 12 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index ddef974..46a43e1 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -508,7 +508,7 @@ # If not already stored, fetch revision if self._latest_cached_revision() is None: try: - self.site.loadrevisions(self, getText=True, sysop=sysop) + self.site.loadrevisions(self, content=True, sysop=sysop) except (pywikibot.NoPage, pywikibot.SectionError) as e: self._getexception = e raise @@ -530,7 +530,7 @@ if force or oldid not in self._revisions \ or self._revisions[oldid].text is None: self.site.loadrevisions(self, - getText=True, + content=True, revids=oldid, sysop=sysop) # TODO: what about redirects, errors? @@ -1697,7 +1697,7 @@ rollback=False, starttime=None, endtime=None): """Generator which loads the version history as Revision instances.""" # TODO: Only request uncached revisions - self.site.loadrevisions(self, getText=content, rvdir=reverse, + self.site.loadrevisions(self, content=content, rvdir=reverse, starttime=starttime, endtime=endtime, total=total, rollback=rollback) return (self._revisions[rev] for rev in diff --git a/pywikibot/site.py b/pywikibot/site.py index e5bc29a..20c6d62 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3981,7 +3981,8 @@ total=total, g_content=content, **cmargs) return cmgen - def loadrevisions(self, page, getText=False, revids=None, + @deprecated_args(getText='content') + def loadrevisions(self, page, content=False, revids=None, startid=None, endid=None, starttime=None, endtime=None, rvdir=None, user=None, excludeuser=None, section=None, sysop=False, step=None, total=None, @@ -4000,10 +4001,11 @@ @param page: retrieve revisions of this Page (required unless ids is specified) - @param getText: if True, retrieve the wiki-text of each revision; + @param content: if True, retrieve the wiki-text of each revision; otherwise, only retrieve the revision metadata (default) + @type content: bool @param section: if specified, retrieve only this section of the text - (getText must be True); section must be given by number (top of + (content must be True); section must be given by number (top of the article is section 0), not name @type section: int @param revids: retrieve only the specified revision ids (raise @@ -4058,7 +4060,7 @@ rvargs['rvprop'].append('contentmodel') if MediaWikiVersion(self.version()) >= MediaWikiVersion('1.19'): rvargs['rvprop'].append('sha1') - if getText: + if content: rvargs['rvprop'].append('content') if section is not None: rvargs[u"rvsection"] = unicode(section) diff --git a/tests/basepage_tests.py b/tests/basepage_tests.py index 99449de..58bbde9 100644 --- a/tests/basepage_tests.py +++ b/tests/basepage_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for BasePage subclasses.""" # -# (C) Pywikibot team, 2015 +# (C) Pywikibot team, 2015-2018 # # Distributed under the terms of the MIT license. # @@ -65,7 +65,7 @@ self.assertFalse(hasattr(page, '_text')) self.assertIsNone(page._latest_cached_revision()) - self.site.loadrevisions(page, total=1, getText=True) + self.site.loadrevisions(page, total=1, content=True) self.assertFalse(hasattr(page, '_text')) self.assertIsNotNone(page._latest_cached_revision()) diff --git a/tests/site_tests.py b/tests/site_tests.py index e42c3eb..667011e 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -2384,9 +2384,9 @@ # The revision content will be loaded by .text self.assertIsNotNone(self.mainpage.text) - def testLoadRevisions_getText(self): - """Test the site.loadrevisions() method with getText=True.""" - self.mysite.loadrevisions(self.mainpage, getText=True, total=5) + def test_loadrevisions_content(self): + """Test the site.loadrevisions() method with content=True.""" + self.mysite.loadrevisions(self.mainpage, content=True, total=5) self.assertFalse(hasattr(self.mainpage, '_text')) self.assertIn(self.mainpage._revid, self.mainpage._revisions) self.assertIsNotNone(self.mainpage._revisions[self.mainpage._revid].text) -- To view, visit https://gerrit.wikimedia.org/r/425128 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I6125fd1f1aec429548f2335e2d052dbccbb222f1 Gerrit-Change-Number: 425128 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [bugfix] create site attribute first
by jenkins-bot (Code Review) 11 Apr '18

11 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425463 ) Change subject: [bugfix] create site attribute first ...................................................................... [bugfix] create site attribute first Bug: T191949 Change-Id: I7fac15af1cd6284afb6929854c8fd661b21532fc --- M scripts/editarticle.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/editarticle.py b/scripts/editarticle.py index 938bde2..e44c0b1 100755 --- a/scripts/editarticle.py +++ b/scripts/editarticle.py @@ -52,8 +52,8 @@ def __init__(self, *args): """Constructor.""" self.set_options(*args) - self.setpage() self.site = pywikibot.Site() + self.setpage() def set_options(self, *args): """Parse commandline and set options attribute.""" -- To view, visit https://gerrit.wikimedia.org/r/425463 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7fac15af1cd6284afb6929854c8fd661b21532fc Gerrit-Change-Number: 425463 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [IMPR] use context manager to open a file
by jenkins-bot (Code Review) 11 Apr '18

11 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425465 ) Change subject: [IMPR] use context manager to open a file ...................................................................... [IMPR] use context manager to open a file also remove hidden comment because it is unclear what to do with it Change-Id: I88814540b446aceb138fdf0b335125e022c3013c --- M scripts/editarticle.py 1 file changed, 2 insertions(+), 7 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/editarticle.py b/scripts/editarticle.py index 938bde2..f89e58a 100755 --- a/scripts/editarticle.py +++ b/scripts/editarticle.py @@ -45,10 +45,6 @@ """Edit a wiki page.""" - # join lines if line starts with this ones - # TODO: No apparent usage - # joinchars = string.letters + '[]' + string.digits - def __init__(self, *args): """Constructor.""" self.set_options(*args) @@ -85,9 +81,8 @@ def handle_edit_conflict(self, new): """When an edit conflict occures save the new text to a file.""" fn = os.path.join(tempfile.gettempdir(), self.page.title()) - fp = open(fn, 'w') - fp.write(new) - fp.close() + with open(fn, 'w') as fp: + fp.write(new) pywikibot.output( "An edit conflict has arisen. Your edit has been saved to %s. " "Please try again." % fn) -- To view, visit https://gerrit.wikimedia.org/r/425465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I88814540b446aceb138fdf0b335125e022c3013c Gerrit-Change-Number: 425465 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Use existing site attribute
by jenkins-bot (Code Review) 10 Apr '18

10 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/222708 ) Change subject: Use existing site attribute ...................................................................... Use existing site attribute Also keep lines below 80 chars Change-Id: I54410460a314126ad69f1d11beb98815daddae91 --- M scripts/editarticle.py M scripts/isbn.py M scripts/reflinks.py 3 files changed, 46 insertions(+), 30 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/editarticle.py b/scripts/editarticle.py index b51fb07..938bde2 100755 --- a/scripts/editarticle.py +++ b/scripts/editarticle.py @@ -23,7 +23,7 @@ """ # # (C) Gerrit Holl, 2004 -# (C) Pywikibot team, 2004-2017 +# (C) Pywikibot team, 2004-2018 # # Distributed under the terms of the MIT license. # @@ -77,9 +77,8 @@ def setpage(self): """Set page and page title.""" - site = pywikibot.Site() pageTitle = self.options.page or pywikibot.input("Page to edit:") - self.page = pywikibot.Page(pywikibot.Link(pageTitle, site)) + self.page = pywikibot.Page(pywikibot.Link(pageTitle, self.site)) if not self.options.edit_redirect and self.page.isRedirectPage(): self.page = self.page.getRedirectTarget() @@ -105,7 +104,7 @@ if new and old != new: pywikibot.showDiff(old, new) changes = pywikibot.input("What did you change?") - comment = i18n.twtranslate(pywikibot.Site(), 'editarticle-edit', + comment = i18n.twtranslate(self.site, 'editarticle-edit', {'description': changes}) try: self.page.put(new, summary=comment, minorEdit=False, diff --git a/scripts/isbn.py b/scripts/isbn.py index ee7b9ad..94cd33d 100755 --- a/scripts/isbn.py +++ b/scripts/isbn.py @@ -35,7 +35,7 @@ """ # -# (C) Pywikibot team, 2009-2017 +# (C) Pywikibot team, 2009-2018 # # Distributed under the terms of the MIT license. # @@ -64,7 +64,7 @@ '&params;': pagegenerators.parameterHelp, } -# Maps each group number to the list of its publisher number ranges. Taken from: +# Maps each group number to the list of its publisher number ranges. Source: # https://web.archive.org/web/20090823122028/http://www.isbn-international.or… ranges = { '0': [ # English speaking area @@ -267,7 +267,8 @@ ('85000', '94999'), ('970000', '999999'), ], - '92': [ # International Publishers (Unesco, EU), European Community Organizations + # International Publishers (Unesco, EU), European Community Organizations + '92': [ ('0', '5'), ('60', '79'), ('800', '899'), @@ -1492,7 +1493,7 @@ self.generator = generator self.isbnR = re.compile(r'(?<=ISBN )(?P<code>[\d\-]+[Xx]?)') - self.comment = i18n.twtranslate(pywikibot.Site(), 'isbn-formatting') + self.comment = i18n.twtranslate(self.site, 'isbn-formatting') def treat(self, page): """Treat a page.""" @@ -1558,7 +1559,7 @@ self.isbn_10_prop_id = self.get_property_by_name('ISBN-10') if self.isbn_13_prop_id is None: self.isbn_13_prop_id = self.get_property_by_name('ISBN-13') - self.comment = i18n.twtranslate(pywikibot.Site(), 'isbn-formatting') + self.comment = i18n.twtranslate(self.site, 'isbn-formatting') def treat_page_and_item(self, page, item): """Treat a page.""" @@ -1596,7 +1597,8 @@ if old_isbn == new_isbn: continue # remove 'ISBN ' prefix - assert new_isbn.startswith('ISBN '), 'ISBN should start with "ISBN"' + assert new_isbn.startswith('ISBN '), \ + 'ISBN should start with "ISBN"' new_isbn = new_isbn[5:] claim.setTarget(new_isbn) change_messages.append('Changing %s (%s --> %s)' % diff --git a/scripts/reflinks.py b/scripts/reflinks.py index d713f9f..3e73007 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -120,7 +120,8 @@ re.IGNORECASE) # matches an URL at the index of a website dirIndex = re.compile( - r'^\w+://[^/]+/((default|index)\.(asp|aspx|cgi|htm|html|phtml|mpx|mspx|php|shtml|var))?$', + r'^\w+://[^/]+/((default|index)\.' + r'(asp|aspx|cgi|htm|html|phtml|mpx|mspx|php|shtml|var))?$', re.IGNORECASE) # Extracts the domain name domain = re.compile(r'^(\w+)://(?:www.|)([^/]+)') @@ -179,7 +180,8 @@ # unbracketed with() r'^\[\]\s<>"]+$[^\[\]\s<>"]+[^\[\]\s\.:;\\,<>\?"]+|' + # unbracketed without () - r'[^\[\]\s<>"]+[^\[\]\s$\.:;\\,<>\?"]+|[^\[\]\s<>"]+))[!?,\s]*\]?\s*</ref>') + r'[^\[\]\s<>"]+[^\[\]\s\)\.:;\\,<>\?"]+|[^\[\]\s<>"]+))' + r'[!?,\s]*\]?\s*</ref>') # Download this file : # http://www.twoevils.org/files/wikipedia/404-links.txt.gz @@ -194,11 +196,11 @@ """Container to handle a single bare reference.""" - def __init__(self, link, name): + def __init__(self, link, name, site=None): """Constructor.""" self.refname = name self.link = link - self.site = pywikibot.Site() + self.site = site or pywikibot.Site() self.linkComment = i18n.twtranslate(self.site, 'reflinks-comment') self.url = re.sub(u'#.*', '', self.link) self.title = None @@ -278,7 +280,11 @@ name the first, and remove the content of the others """ - def __init__(self): + def __init__(self, site=None): + """Constructor.""" + if not site: + site = pywikibot.Site() + """Constructor.""" # Match references self.REFS = re.compile( @@ -287,7 +293,7 @@ r'(?i).*name\s*=\s*(?P<quote>"?)\s*(?P<name>.+)\s*(?P=quote).*') self.GROUPS = re.compile( r'(?i).*group\s*=\s*(?P<quote>"?)\s*(?P<group>.+)\s*(?P=quote).*') - self.autogen = i18n.twtranslate(pywikibot.Site(), 'reflinks-autogen') + self.autogen = i18n.twtranslate(site, 'reflinks-autogen') def process(self, text): """Process the page.""" @@ -380,7 +386,8 @@ if v[1]: name = u'"%s"' % name text = re.sub( - u'<ref name\\s*=\\s*(?P<quote>"?)\\s*%s\\s*(?P=quote)\\s*/>' % k, + '<ref name\\s*=\\s*(?P<quote>"?)\\s*{}\\s*(?P=quote)\\s*/>' + .format(k), u'<ref name=%s />' % name, text) return text @@ -400,7 +407,8 @@ super(ReferencesRobot, self).__init__(**kwargs) self.generator = generator self.site = pywikibot.Site() - self._use_fake_user_agent = config.fake_user_agent_default.get('reflinks', False) + self._use_fake_user_agent = config.fake_user_agent_default.get( + 'reflinks', False) # Check manual = 'mw:Manual:Pywikibot/refLinks' code = None @@ -422,7 +430,7 @@ bad = globalbadtitles self.titleBlackList = re.compile(bad, re.I | re.S | re.X) self.norefbot = noreferences.NoReferencesBot(None, verbose=False) - self.deduplicator = DuplicateReferences() + self.deduplicator = DuplicateReferences(self.site) self.site_stop_page = i18n.translate(self.site, stop_page) if self.site_stop_page: @@ -466,7 +474,8 @@ try: pdfinfo_out = subprocess.Popen([r"pdfinfo", "/dev/stdin"], - stdin=urlobj, stdout=subprocess.PIPE, + stdin=urlobj, + stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False).communicate()[0] for aline in pdfinfo_out.splitlines(): @@ -508,7 +517,8 @@ % page.title(asLink=True)) continue except pywikibot.NoPage: - pywikibot.output(u'Page %s not found' % page.title(asLink=True)) + pywikibot.output('Page {} not found' + .format(page.title(asLink=True))) continue except pywikibot.IsRedirectPage: pywikibot.output(u'Page %s is a redirect' @@ -526,7 +536,7 @@ # TODO: Clean URL blacklist continue - ref = RefLink(link, match.group('name')) + ref = RefLink(link, match.group('name'), site=self.site) f = None try: @@ -582,17 +592,19 @@ % (f.status, ref.url, page.title(asLink=True)), toStdout=True) - # 410 Gone, indicates that the resource has been purposely - # removed + # 410 Gone, indicates that the resource has been + # purposely removed if f.status == 410 or \ - (f.status == 404 and (u'\t%s\t' % ref.url in deadLinks)): + (f.status == 404 and ('\t{}\t'.format(ref.url) + in deadLinks)): repl = ref.refDead() new_text = new_text.replace(match.group(), repl) continue linkedpagetext = f.raw except UnicodeError: - # example : http://www.adminet.com/jo/20010615¦/ECOC0100037D.html + # example: + # http://www.adminet.com/jo/20010615¦/ECOC0100037D.html # in [[fr:Cyanure]] pywikibot.output(color_format( '{lightred}Bad link{default} : {0} in {1}', @@ -641,7 +653,7 @@ else: pywikibot.output(u'No charset found for %s' % ref.link) if not contentType: - pywikibot.output(u'No content-type found for %s' % ref.link) + pywikibot.output('No content-type found for %s' % ref.link) continue elif not self.MIME.search(contentType): pywikibot.output(color_format( @@ -672,7 +684,8 @@ try: u = linkedpagetext.decode(enc[0]) # Bug T69410 except (UnicodeDecodeError, LookupError) as e: - pywikibot.output(u'%s : Decoding error - %s' % (ref.link, e)) + pywikibot.output('{} : Decoding error - {}' + .format(ref.link, e)) continue # Retrieves the first non empty string inside <title> tags @@ -729,8 +742,10 @@ else: editedpages += 1 - if self.getOption('limit') and editedpages >= self.getOption('limit'): - pywikibot.output('Edited %s pages, stopping.' % self.getOption('limit')) + if self.getOption('limit') \ + and editedpages >= self.getOption('limit'): + pywikibot.output('Edited {} pages, stopping.' + .format(self.getOption('limit'))) return if self.site_stop_page and editedpages % 20 == 0: -- To view, visit https://gerrit.wikimedia.org/r/222708 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I54410460a314126ad69f1d11beb98815daddae91 Gerrit-Change-Number: 222708 Gerrit-PatchSet: 4 Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Update search result of test_searchitem_language
by jenkins-bot (Code Review) 10 Apr '18

10 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425229 ) Change subject: [bugfix] Update search result of test_searchitem_language ...................................................................... [bugfix] Update search result of test_searchitem_language The aliases has been changed. Change the searchitem result accordingly Bug: T191870 Change-Id: I7cb175beca2611a017cc4d1436c8b88fcbdeeb58 --- M tests/pagegenerators_tests.py 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 7b2b9ff..7a98d93 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -1252,9 +1252,9 @@ gf.handleArg('-limit:1') gen = gf.getCombinedGenerator() self.assertIsNotNone(gen) - # American Broadcasting Company + # alphabet, also known as ABC page1 = next(gen) - self.assertEqual(page1.title(), 'Q169889') + self.assertEqual(page1.title(), 'Q9779') gf = pagegenerators.GeneratorFactory(site=self.site) gf.handleArg('-searchitem:en:abc') @@ -1264,9 +1264,9 @@ # American Broadcasting Company page1 = next(gen) self.assertEqual(page1.title(), 'Q169889') - # Australian Broadcasting Corporation + # alphabet, also known as ABC page2 = next(gen) - self.assertEqual(page2.title(), 'Q781365') + self.assertEqual(page2.title(), 'Q9779') def test_get_category_site(self): """Test the getCategory method.""" -- To view, visit https://gerrit.wikimedia.org/r/425229 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7cb175beca2611a017cc4d1436c8b88fcbdeeb58 Gerrit-Change-Number: 425229 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Revert "Cleanup .appveyor.yml file"
by jenkins-bot (Code Review) 10 Apr '18

10 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425221 ) Change subject: Revert "Cleanup .appveyor.yml file" ...................................................................... Revert "Cleanup .appveyor.yml file" This reverts commit c8c8e32ae1e85c6c3c1ffb18d2a46bb1942f2152. We need the installer for 2.7.2 and 3.4.0, otherwise appveyor falls back to Python 2.7.14 for those versions. Bug: T191188 Change-Id: Ib39aa22fc60da0c8061518db0d7b7c8cf42aea78 --- M .appveyor.yml 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index d50e536..2755449 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,6 +2,12 @@ environment: global: + APPVEYOR_PYTHON_URL: "https://raw.githubusercontent.com/ogrisel/python-appveyor-demo/master/appve…" + + # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the + # /E:ON and /V:ON options are not enabled in the batch script intepreter + # See: http://stackoverflow.com/a/13751649/163740 + CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd" PYWIKIBOT2_DIR: "%appdata%\\Pywikibot" PYWIKIBOT2_USER_CONFIG: "%appdata%\\Pywikibot\\user-config.py" @@ -67,6 +73,14 @@ install: - git submodule update --init + # Download the Appveyor Python build accessories into subdirectory .\appveyor + - mkdir appveyor + - ps: $wc = new-object net.webclient + - ps: $run = $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'run_with_env.cmd') + - ps: $run | Out-File -Encoding ascii -FilePath appveyor\run_with_env.cmd + + # This is needed for Python versions not installed on Appveyor build machines + - ps: if (-not(Test-Path($env:PYTHON))) { iex $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'install.ps1') } - pip install virtualenv - virtualenv env - env\Scripts\activate.bat @@ -84,7 +98,7 @@ - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT2_USER_CONFIG, 'max_retries = 2; maximum_GET_length = 5000; transliteration_target = None;')" - set PYSETUP_TEST_NO_UI=1 - - coverage run setup.py test + - "%CMD_IN_ENV% coverage run setup.py test" on_failure: - codecov -- To view, visit https://gerrit.wikimedia.org/r/425221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib39aa22fc60da0c8061518db0d7b7c8cf42aea78 Gerrit-Change-Number: 425221 Gerrit-PatchSet: 3 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [tox] Disable flake8-string-format rule P101
by jenkins-bot (Code Review) 10 Apr '18

10 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425121 ) Change subject: [tox] Disable flake8-string-format rule P101 ...................................................................... [tox] Disable flake8-string-format rule P101 P101 rule "format string does contain unindexed parameters" was introduced for python 2.6 compatibility. Since py 2.6 was dropped, the implicit index arguments of format strings could be enabled which is by the wax closer to the modulo format string. Change-Id: I131c760881da3ae6b67b03b6976cc6653b6f7d77 --- M tox.ini 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index 700e857..bd0cf03 100644 --- a/tox.ini +++ b/tox.ini @@ -150,6 +150,7 @@ # H405: docstring summary line # H301,I100,I101,202: import order rules; Pywikibot uses rules H306 and I201 # W503: line break before binary operator; against current PEP 8 recommendation +# P101: format string does contain unindexed parameters # The following are to be fixed # D102: Missing docstring in public method @@ -163,7 +164,7 @@ # D413: Missing blank line after last section # D412: No blank lines allowed between a section header and its content -ignore = E402,D105,D211,FI10,FI12,FI13,FI15,FI16,FI17,FI5,H101,H236,H301,H404,H405,H903,I100,I101,I202,N802,N803,N806,D401,D413,D103,D412,W503 +ignore = E402,D105,D211,FI10,FI12,FI13,FI15,FI16,FI17,FI5,H101,H236,H301,H404,H405,H903,I100,I101,I202,N802,N803,N806,D401,D413,D103,D412,P101,W503 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/*,scripts/userscripts/* min-version = 2.7 max_line_length = 100 -- To view, visit https://gerrit.wikimedia.org/r/425121 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I131c760881da3ae6b67b03b6976cc6653b6f7d77 Gerrit-Change-Number: 425121 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [bugfix] ensure that Timestamp.microsecond is not 0
by jenkins-bot (Code Review) 10 Apr '18

10 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425116 ) Change subject: [bugfix] ensure that Timestamp.microsecond is not 0 ...................................................................... [bugfix] ensure that Timestamp.microsecond is not 0 ensure that Timestamp.microsecond is not 0 when compairing with mediawiki timestamp. Bug: T191827 Change-Id: I523eb3f264e0ddd13cff9cf9c6762d23260399ce --- M tests/timestamp_tests.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/timestamp_tests.py b/tests/timestamp_tests.py index f6c76b8..9b893f3 100644 --- a/tests/timestamp_tests.py +++ b/tests/timestamp_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for the Timestamp class.""" # -# (C) Pywikibot team, 2014-2017 +# (C) Pywikibot team, 2014-2018 # # Distributed under the terms of the MIT license. # @@ -80,6 +80,8 @@ def test_mediawiki_format(self): """Test conversion from and to timestamp format.""" t1 = Timestamp.utcnow() + if not t1.microsecond: # T191827: ensure microsecond is not 0 + t1 = t1.replace(microsecond=1000) ts1 = t1.totimestampformat() t2 = Timestamp.fromtimestampformat(ts1) ts2 = t2.totimestampformat() -- To view, visit https://gerrit.wikimedia.org/r/425116 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I523eb3f264e0ddd13cff9cf9c6762d23260399ce Gerrit-Change-Number: 425116 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: generate_user_config.py: Check a previous user-password.py
by jenkins-bot (Code Review) 08 Apr '18

08 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/423200 ) Change subject: generate_user_config.py: Check a previous user-password.py ...................................................................... generate_user_config.py: Check a previous user-password.py If file exists, it'll simply print a warning (using file_exists() fct) and bypass the filling of botpasswords. Bug: T167573 Change-Id: I71606c0075e49ac1a7161c9bcbeace3ae2d3dc45 --- M generate_user_files.py 1 file changed, 3 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_user_files.py b/generate_user_files.py index 67f79af..5c62f78 100755 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- """Script to create user-config.py.""" # -# (C) Pywikibot team, 2010-2017 +# (C) Pywikibot team, 2010-2018 # # Distributed under the terms of the MIT license. # @@ -238,8 +238,7 @@ """ _fnc = os.path.join(base_dir, "user-config.py") _fncpass = os.path.join(base_dir, 'user-password.py') - # TODO: T167573: better check for existing user-password file - if file_exists(_fnc) or file_exists(_fncpass): + if file_exists(_fnc): return if args and force and not config.verbose_output: @@ -261,7 +260,7 @@ if not main_username: usernames = "# usernames['{0}']['{1}'] = u'MyUsername'".format( main_family, main_code) - else: + elif not file_exists(_fncpass): # For each different username entered, ask if user wants to save a # BotPassword (username, BotPassword name, BotPassword pass) seen = set() -- To view, visit https://gerrit.wikimedia.org/r/423200 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I71606c0075e49ac1a7161c9bcbeace3ae2d3dc45 Gerrit-Change-Number: 423200 Gerrit-PatchSet: 3 Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [IMPR] reduce complexity of pywikibot.__init__.Site
by jenkins-bot (Code Review) 08 Apr '18

08 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/423884 ) Change subject: [IMPR] reduce complexity of pywikibot.__init__.Site ...................................................................... [IMPR] reduce complexity of pywikibot.__init__.Site - Reduce code complexity measures by radon from 26 to 19 using a private procedure to store and retrieve code and family pair for a given url. - Simplify matching_sites conditions. Don't save None for an invalid url because it is raising an exception already. Check for code and fam with url later in the code. - Shorten the try clause when importing interface part Change-Id: Ice41f5dcb2080eebe1eacf44ac88204949588fcc --- M pywikibot/__init__.py 1 file changed, 40 insertions(+), 32 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 0d612f3..62080b9 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -1176,6 +1176,35 @@ _url_cache = {} # The code/fam pair for each URL +def _code_fam_from_url(url): + """Set url to cache and get code and family from cache. + + Site helper method. + @param url: The site URL to get code and family + @type url: string + @raises SiteDefinitionError: Unknown URL + """ + if url not in _url_cache: + matched_sites = [] + # Iterate through all families and look, which does apply to + # the given URL + for fam in config.family_files: + family = Family.load(fam) + code = family.from_url(url) + if code is not None: + matched_sites.append((code, family)) + + if not matched_sites: + # TODO: As soon as AutoFamily is ready, try and use an + # AutoFamily + raise SiteDefinitionError("Unknown URL '{0}'.".format(url)) + if len(matched_sites) > 1: + warning('Found multiple matches for URL "{0}": {1} (use first)' + .format(url, ', '.join(str(s) for s in matched_sites))) + _url_cache[url] = matched_sites[0] + return _url_cache[url] + + def Site(code=None, fam=None, user=None, sysop=None, interface=None, url=None): """A factory method to obtain a Site object. @@ -1199,41 +1228,19 @@ URL. Still requires that the family supporting that URL exists. @type url: string @rtype: pywikibot.site.APISite - + @raises ValueError: URL and pair of code and family given + @raises ValueError: Invalid interface name + @raises SiteDefinitionError: Unknown URL """ - # Either code and fam or only url - if url and (code or fam): - raise ValueError('URL to the wiki OR a pair of code and family name ' - 'should be provided') _logger = "wiki" if url: - if url not in _url_cache: - matched_sites = [] - # Iterate through all families and look, which does apply to - # the given URL - for fam in config.family_files: - family = Family.load(fam) - code = family.from_url(url) - if code is not None: - matched_sites += [(code, family)] - - if matched_sites: - if len(matched_sites) > 1: - warning( - 'Found multiple matches for URL "{0}": {1} (use first)' - .format(url, ', '.join(str(s) for s in matched_sites))) - _url_cache[url] = matched_sites[0] - else: - # TODO: As soon as AutoFamily is ready, try and use an - # AutoFamily - _url_cache[url] = None - - cached = _url_cache[url] - if cached: - code, fam = cached - else: - raise SiteDefinitionError("Unknown URL '{0}'.".format(url)) + # Either code and fam or only url + if code or fam: + raise ValueError( + 'URL to the wiki OR a pair of code and family name ' + 'should be provided') + code, fam = _code_fam_from_url(url) else: # Fallback to config defaults code = code or config.mylang @@ -1259,9 +1266,10 @@ # If it isnt a class, assume it is a string try: tmp = __import__('pywikibot.site', fromlist=[interface]) - interface = getattr(tmp, interface) except ImportError: raise ValueError('Invalid interface name: {0}'.format(interface)) + else: + interface = getattr(tmp, interface) if not issubclass(interface, BaseSite): warning('Site called with interface=%s' % interface.__name__) -- To view, visit https://gerrit.wikimedia.org/r/423884 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ice41f5dcb2080eebe1eacf44ac88204949588fcc Gerrit-Change-Number: 423884 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Cleanup .appveyor.yml file
by jenkins-bot (Code Review) 08 Apr '18

08 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/424768 ) Change subject: Cleanup .appveyor.yml file ...................................................................... Cleanup .appveyor.yml file We currently do not need python-appveyor-demo files for appveyor builds. The installer has bugs. Remove it (and related lines). If required, it might be easier to write our own Python installer in the future than to debug these ones. Bug: T191188 Change-Id: I89cc9e72260ca5a4d9854b756ece6b0585d5ecc7 --- M .appveyor.yml 1 file changed, 1 insertion(+), 15 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 2755449..d50e536 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,12 +2,6 @@ environment: global: - APPVEYOR_PYTHON_URL: "https://raw.githubusercontent.com/ogrisel/python-appveyor-demo/master/appve…" - - # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the - # /E:ON and /V:ON options are not enabled in the batch script intepreter - # See: http://stackoverflow.com/a/13751649/163740 - CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd" PYWIKIBOT2_DIR: "%appdata%\\Pywikibot" PYWIKIBOT2_USER_CONFIG: "%appdata%\\Pywikibot\\user-config.py" @@ -73,14 +67,6 @@ install: - git submodule update --init - # Download the Appveyor Python build accessories into subdirectory .\appveyor - - mkdir appveyor - - ps: $wc = new-object net.webclient - - ps: $run = $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'run_with_env.cmd') - - ps: $run | Out-File -Encoding ascii -FilePath appveyor\run_with_env.cmd - - # This is needed for Python versions not installed on Appveyor build machines - - ps: if (-not(Test-Path($env:PYTHON))) { iex $wc.DownloadString($env:APPVEYOR_PYTHON_URL + 'install.ps1') } - pip install virtualenv - virtualenv env - env\Scripts\activate.bat @@ -98,7 +84,7 @@ - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT2_USER_CONFIG, 'max_retries = 2; maximum_GET_length = 5000; transliteration_target = None;')" - set PYSETUP_TEST_NO_UI=1 - - "%CMD_IN_ENV% coverage run setup.py test" + - coverage run setup.py test on_failure: - codecov -- To view, visit https://gerrit.wikimedia.org/r/424768 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I89cc9e72260ca5a4d9854b756ece6b0585d5ecc7 Gerrit-Change-Number: 424768 Gerrit-PatchSet: 1 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Allow whitespace at end of html tags
by jenkins-bot (Code Review) 06 Apr '18

06 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/424385 ) Change subject: Allow whitespace at end of html tags ...................................................................... Allow whitespace at end of html tags Whitespace is allowed after tag names in XML and HTML, so regexps should also look for it. Reg: https://www.w3.org/TR/REC-xml/#sec-starttags and https://html.spec.whatwg.org/multipage/syntax.html#start-tags Bug: T191559 Change-Id: I29d03e2ee7c1fc5278a8df5e05252529f10d5a5f --- M pywikibot/textlib.py M tests/textlib_tests.py 2 files changed, 37 insertions(+), 33 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 8f3da8a..0c0940b 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -244,48 +244,48 @@ def _create_default_regexes(): """Fill (and possibly overwrite) _regex_cache with default regexes.""" _regex_cache.update({ - 'comment': re.compile(r'(?s)'), + 'comment': re.compile(r'(?s)'), # section headers - 'header': re.compile(r'(?m)^=+.+=+ *$'), + 'header': re.compile(r'(?m)^=+.+=+ *$'), # preformatted text - 'pre': re.compile(r'(?is)<pre[ >].*?</pre>'), - 'source': re.compile(r'(?is)<source .*?</source>'), - 'score': re.compile(r'(?is)<score[ >].*?</score>'), + 'pre': re.compile(r'(?is)<pre[ >].*?</pre\s*>'), + 'source': re.compile(r'(?is)<source .*?</source\s*>'), + 'score': re.compile(r'(?is)<score[ >].*?</score\s*>'), # inline references - 'ref': re.compile(r'(?is)<ref[ >].*?</ref>'), - 'template': NESTED_TEMPLATE_REGEX, + 'ref': re.compile(r'(?is)<ref[ >].*?</ref>'), + 'template': NESTED_TEMPLATE_REGEX, # lines that start with a space are shown in a monospace font and # have whitespace preserved. - 'startspace': re.compile(r'(?m)^ (.*?)$'), + 'startspace': re.compile(r'(?m)^ (.*?)$'), # tables often have whitespace that is used to improve wiki # source code readability. # TODO: handle nested tables. - 'table': re.compile(r'(?ims)^{\|.*?^\|}|<table[ >].*?</table>'), - 'hyperlink': compileLinkR(), - 'gallery': re.compile(r'(?is)<gallery.*?>.*?</gallery>'), + 'table': re.compile(r'(?ims)' + r'^{\|.*?^\|}|<table[ >].*?</table\s*>'), + 'hyperlink': compileLinkR(), + 'gallery': re.compile(r'(?is)<gallery.*?>.*?</gallery\s*>'), # this matches internal wikilinks, but also interwiki, categories, and # images. - 'link': re.compile(r'\[\[[^\]\|]*(\|[^\]]*)?\]\]'), + 'link': re.compile(r'\[\[[^\]\|]*(\|[^\]]*)?\]\]'), # also finds links to foreign sites with preleading ":" - 'interwiki': (r'(?i)\[\[:?(%s)\s?:[^\]]*\]\][\s]*', - lambda site: '|'.join( - site.validLanguageLinks() + - list(site.family.obsolete.keys()))), + 'interwiki': (r'(?i)\[\[:?(%s)\s?:[^\]]*\]\][\s]*', + lambda site: '|'.join( + site.validLanguageLinks() + + list(site.family.obsolete.keys()))), # Wikibase property inclusions - 'property': (r'(?i)\{\{\s*\#(?:%s):\s*p\d+.*?\}\}', - lambda site: '|'.join( - site.getmagicwords('property'))), + 'property': (r'(?i)\{\{\s*\#(?:%s):\s*p\d+.*?\}\}', + lambda site: '|'.join(site.getmagicwords('property'))), # Module invocations (currently only Lua) - 'invoke': (r'(?is)\{\{\s*\#(?:%s):.*?\}\}', - lambda site: '|'.join(site.getmagicwords('invoke'))), + 'invoke': (r'(?is)\{\{\s*\#(?:%s):.*?\}\}', + lambda site: '|'.join(site.getmagicwords('invoke'))), # categories - 'category': (r'\[\[ *(?:%s)\s*:.*?\]\]', - lambda site: '|'.join(site.namespaces[14])), + 'category': (r'\[\[ *(?:%s)\s*:.*?\]\]', + lambda site: '|'.join(site.namespaces[14])), # files - 'file': (FILE_LINK_REGEX, - lambda site: '|'.join(site.namespaces[6])), + 'file': (FILE_LINK_REGEX, + lambda site: '|'.join(site.namespaces[6])), # pagelist tag (used in Proofread extension). - 'pagelist': re.compile(r'(?is)<pagelist.*?/>'), + 'pagelist': re.compile(r'(?is)<pagelist.*?/>'), }) @@ -321,12 +321,12 @@ # nowiki, noinclude, includeonly, timeline, math and other # extensions _regex_cache[exc] = re.compile( - r'(?is)<{0}>.*?</{0}>'.format(exc)) + r'(?is)<{0}\s*>.*?</{0}\s*>'.format(exc)) result.append(_regex_cache[exc]) # handle alias if exc == 'source': dontTouchRegexes.append(re.compile( - r'(?is)<syntaxhighlight .*?</syntaxhighlight>')) + r'(?is)<syntaxhighlight .*?</syntaxhighlight\s*>')) else: # assume it's a regular expression dontTouchRegexes.append(exc) @@ -469,11 +469,11 @@ """ regexes = { 'comments': r'', - 'includeonly': r'<includeonly>.*?</includeonly>', - 'nowiki': r'<nowiki>.*?</nowiki>', - 'pre': r'<pre>.*?</pre>', - 'source': r'<source .*?</source>', - 'syntaxhighlight': r'<syntaxhighlight .*?</syntaxhighlight>', + 'includeonly': r'<includeonly\s*>.*?</includeonly\s*>', + 'nowiki': r'<nowiki\s*>.*?</nowiki\s*>', + 'pre': r'<pre\s*>.*?</pre\s*>', + 'source': r'<source .*?</source\s*>', + 'syntaxhighlight': r'<syntaxhighlight .*?</syntaxhighlight\s*>', } if '*' in tags: tags = list(regexes.keys()) diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 073373c..bc9fa2e 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1159,6 +1159,10 @@ self.assertEqual(textlib.replaceExcept('<pre>x</pre>', 'x', 'y', ['pre'], site=self.site), '<pre>x</pre>') + self.assertEqual(textlib.replaceExcept('<nowiki >x</nowiki >x', + 'x', 'y', ['nowiki'], + site=self.site), + '<nowiki >x</nowiki >y') # T191559 self.assertEqual(textlib.replaceExcept('<source lang="xml">x</source>', 'x', 'y', ['source'], site=self.site), -- To view, visit https://gerrit.wikimedia.org/r/424385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I29d03e2ee7c1fc5278a8df5e05252529f10d5a5f Gerrit-Change-Number: 424385 Gerrit-PatchSet: 4 Gerrit-Owner: Danmichaelo <danmichaelo(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Update families files
by jenkins-bot (Code Review) 05 Apr '18

05 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/424356 ) Change subject: Update families files ...................................................................... Update families files Change-Id: Iee769583b918abe76314f62c31ad4e0ad2032c2b --- M pywikibot/families/wikipedia_family.py 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index e1a4a20..87349c7 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -32,7 +32,7 @@ """Constructor.""" self.languages_by_size = [ 'en', 'ceb', 'sv', 'de', 'fr', 'nl', 'ru', 'it', 'es', 'pl', 'war', - 'vi', 'ja', 'zh', 'pt', 'uk', 'sr', 'fa', 'ca', 'ar', 'no', 'sh', + 'vi', 'ja', 'zh', 'pt', 'uk', 'fa', 'sr', 'ca', 'ar', 'no', 'sh', 'fi', 'hu', 'id', 'ko', 'cs', 'ro', 'ms', 'tr', 'eu', 'eo', 'bg', 'hy', 'da', 'zh-min-nan', 'sk', 'he', 'min', 'kk', 'hr', 'lt', 'et', 'ce', 'sl', 'be', 'gl', 'el', 'ur', 'nn', 'az', 'simple', @@ -50,15 +50,15 @@ 'frr', 'rue', 'gan', 'vls', 'km', 'bo', 'crh', 'vep', 'sc', 'glk', 'co', 'fiu-vro', 'lrc', 'tk', 'kv', 'csb', 'myv', 'gv', 'as', 'lad', 'so', 'nv', 'zea', 'udm', 'ay', 'lez', 'stq', 'ie', 'kw', - 'nrm', 'pcd', 'mwl', 'ug', 'gom', 'rm', 'gn', 'koi', 'ab', 'lij', - 'mt', 'sn', 'fur', 'dsb', 'dv', 'ang', 'ln', 'frp', 'cbk-zam', + 'nrm', 'pcd', 'mwl', 'ug', 'gom', 'gn', 'rm', 'koi', 'ab', 'lij', + 'sn', 'mt', 'fur', 'dsb', 'dv', 'ang', 'ln', 'cbk-zam', 'frp', 'kab', 'ext', 'dty', 'ksh', 'lo', 'gag', 'olo', 'pag', 'pi', 'av', 'bxr', 'haw', 'pfl', 'xal', 'krc', 'pap', 'kaa', 'rw', 'pdc', 'bjn', 'ha', 'to', 'nov', 'kl', 'arc', 'jam', 'kbd', 'tyv', 'tpi', 'tet', 'kbp', 'ki', 'ig', 'na', 'roa-rup', 'jbo', 'lbe', 'ty', 'mdf', 'za', 'kg', 'bi', 'wo', 'lg', 'srn', 'tcy', 'zu', 'chr', 'ltg', 'sm', 'om', 'xh', 'rmy', 'cu', 'tn', 'pih', 'rn', 'chy', - 'tw', 'tum', 'ts', 'bm', 'got', 'st', 'pnt', 'ak', 'ss', 'atj', + 'tw', 'tum', 'ts', 'bm', 'got', 'st', 'ak', 'pnt', 'atj', 'ss', 'ch', 'fj', 'ady', 'iu', 'ny', 'ee', 'ks', 'ik', 've', 'sg', 'ff', 'dz', 'ti', 'cr', 'din', ] -- To view, visit https://gerrit.wikimedia.org/r/424356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iee769583b918abe76314f62c31ad4e0ad2032c2b Gerrit-Change-Number: 424356 Gerrit-PatchSet: 1 Gerrit-Owner: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [cleanup] use assert instead of raising AssertionError
by jenkins-bot (Code Review) 05 Apr '18

05 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403906 ) Change subject: [cleanup] use assert instead of raising AssertionError ...................................................................... [cleanup] use assert instead of raising AssertionError Change-Id: I9ae1af2cb2557169239052a3bb5f7b23e6283fb1 --- M pywikibot/date.py M pywikibot/page.py 2 files changed, 22 insertions(+), 26 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/date.py b/pywikibot/date.py index b6c45ab..bf01478 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -7,7 +7,7 @@ # (C) Andre Engels, 2004-2005 # (C) Yuri Astrakhan, 2005-2006 (<Firstname><Lastname>@gmail.com) # (years/decades/centuries/millenniums str <=> int conversions) -# (C) Pywikibot team, 2004-2017 +# (C) Pywikibot team, 2004-2018 # # Distributed under the terms of the MIT license. # @@ -384,10 +384,9 @@ if isinstance(dec, basestring): # Special case for strings that are replaced instead of # decoded - if len(s) == 3: - raise AssertionError( - "Invalid pattern %s: Cannot use zero padding size " - "in %s!" % (pattern, s)) + assert len(s) < 3, ( + 'Invalid pattern {0}: Cannot use zero padding size ' + 'in {1}!'.format(pattern, s)) newPattern += re.escape(dec) strPattern += s # Keep the original text else: @@ -451,8 +450,8 @@ for i in range(len(decoders))] decValue = decf(values) - if isinstance(decValue, basestring): - raise AssertionError("Decoder must not return a string!") + assert not isinstance(decValue, basestring), \ + 'Decoder must not return a string!' # recursive call to re-encode and see if we get the original # (may through filter exception) @@ -473,19 +472,17 @@ MakeParameter = _make_parameter if type(params) in _listTypes: - if len(params) != len(decoders): - raise AssertionError( - "parameter count (%d) does not match decoder count (%d)" - % (len(params), len(decoders))) + assert len(params) == len(decoders), ( + 'parameter count ({0}) does not match decoder count ({1})' + .format(len(params), len(decoders))) # convert integer parameters into their textual representation params = [MakeParameter(decoders[i], params[i]) for i in range(len(params))] return strPattern % tuple(params) else: - if 1 != len(decoders): - raise AssertionError( - "A single parameter does not match %d decoders." - % len(decoders)) + assert len(decoders) == 1, ( + 'A single parameter does not match {0} decoders.' + .format(len(decoders))) # convert integer parameter into its textual representation return strPattern % MakeParameter(decoders[0], params) @@ -1959,15 +1956,16 @@ def addFmt1(lang, isMnthOfYear, patterns): - """Add 12 month formats for a specific type ('January','Feb..), for a given language. + """Add 12 month formats for a specific type ('January', 'Feb.'). The function must accept one parameter for the ->int or ->string conversions, just like everywhere else in the formats map. The patterns parameter is a list of 12 elements to be used for each month. + @param lang: language code + @type lang: str """ - if len(patterns) != 12: - raise AssertionError(u'pattern %s does not have 12 elements' % lang) + assert len(patterns) == 12, 'pattern %s does not have 12 elements' % lang for i in range(12): if patterns[i] is not None: diff --git a/pywikibot/page.py b/pywikibot/page.py index 6cff93b..22438fd 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -5219,10 +5219,9 @@ @rtype: int or long @raises AssertionError: parent id not supplied to the constructor """ - if self._parent_id is None: - raise AssertionError( - 'Revision %d was instantiated without a parent id' - % self.revid) + assert self._parent_id is not None, ( + 'Revision {0} was instantiated without a parent id' + .format(self.revid)) return self._parent_id @@ -5237,10 +5236,9 @@ which always occurs for MediaWiki versions lower than 1.21. """ # TODO: T102735: Add a sane default of 'wikitext' and others for <1.21 - if self._content_model is None: - raise AssertionError( - 'Revision %d was instantiated without a content model' - % self.revid) + assert self._content_model is not None, ( + 'Revision {0} was instantiated without a content model' + .format(self.revid)) return self._content_model -- To view, visit https://gerrit.wikimedia.org/r/403906 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9ae1af2cb2557169239052a3bb5f7b23e6283fb1 Gerrit-Change-Number: 403906 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [IMPR] LogDict: Raise HiddenKeyError when a key is hidden
by jenkins-bot (Code Review) 05 Apr '18

05 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/421805 ) Change subject: [IMPR] LogDict: Raise HiddenKeyError when a key is hidden ...................................................................... [IMPR] LogDict: Raise HiddenKeyError when a key is hidden When part of a log event (key) is hidden 'actionhidden', 'commenthidden', and/or 'userhidden' keys are included in the API response. If the desired key is missing and the corresponsing hidden key is present, then raise HiddenKeyError. Bug: T187635 Change-Id: Iba46f5b17057ce825d6d1a94d9ccacb2a6a051dc --- M pywikibot/exceptions.py M pywikibot/logentries.py M tests/logentry_tests.py 3 files changed, 25 insertions(+), 11 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index 929c1a4..07d47b7 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -542,6 +542,13 @@ pass +class HiddenKeyError(UserRightsError, KeyError): + + """Insufficient user rights to view the hidden key.""" + + pass + + class NotEmailableError(PageRelatedError): """This user is not emailable.""" diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index c12ff73..01f2246 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -10,7 +10,7 @@ import sys import pywikibot -from pywikibot.exceptions import Error +from pywikibot.exceptions import Error, HiddenKeyError from pywikibot.tools import deprecated, classproperty if sys.version_info[0] > 2: @@ -22,7 +22,10 @@ class LogDict(dict): """ - Simple custom dict that raises a custom KeyError when a key is missing. + Simple custom dict that raises custom Errors when a key is missing. + + HiddenKeyError is raised when the user does not have permission. + KeyError is raised otherwise. It also logs debugging information when a key is missing. """ @@ -31,6 +34,13 @@ """Debug when the key is missing.""" pywikibot.debug(u"API log entry received:\n" + repr(self), _logger) + if ((key in ('ns', 'title', 'pageid', 'logpage', 'params', 'action') + and 'actionhidden' in self) + or (key == 'comment' and 'commenthidden' in self) + or (key == 'user' and 'userhidden' in self)): + raise HiddenKeyError( + "Log entry ({0}) has a hidden '{1}' key and you don't have " + 'permission to view it.'.format(self._type, key)) raise KeyError("Log entry (%s) has no '%s' key" % (self._type, key)) @@ -112,12 +122,8 @@ """ Page on which action was performed. - @note: title may be missing in data dict e.g. by oversight action to - hide the title. In that case a KeyError exception will raise - @return: page on action was performed @rtype: pywikibot.Page - @raise: KeyError: title was missing from log entry """ if not hasattr(self, '_page'): self._page = pywikibot.Page(self.site, self.data['title']) @@ -146,7 +152,6 @@ def comment(self): """Return the logentry's comment. - @raise KeyError: The log entry has no 'comment' key. @rtype: str """ return self.data['comment'] @@ -300,11 +305,7 @@ """ Return FilePage on which action was performed. - Note: title may be missing in data dict e.g. by oversight action to - hide the title. In that case a KeyError exception will raise - @rtype: pywikibot.FilePage - @raise: KeyError: title was missing from log entry """ if not hasattr(self, '_page'): self._page = pywikibot.FilePage(self.site, self.data['title']) diff --git a/tests/logentry_tests.py b/tests/logentry_tests.py index 50f900a..05c734f 100644 --- a/tests/logentry_tests.py +++ b/tests/logentry_tests.py @@ -11,6 +11,7 @@ import pywikibot +from pywikibot.exceptions import HiddenKeyError from pywikibot.logentries import LogEntryFactory, UserTargetLogEntry from pywikibot.tools import ( MediaWikiVersion, @@ -77,6 +78,11 @@ self.assertIsInstance(logentry.action(), unicode) try: self.assertIsInstance(logentry.comment(), unicode) + except HiddenKeyError as e: + self.assertRegex( + str(e), + "Log entry ([^)]+) has a hidden 'comment' key, and you don't " + 'have permission to view it.') except KeyError as e: self.assertRegex(str(e), "Log entry ([^)]+) has no 'comment' key") self.assertIsInstance(logentry.logid(), int) -- To view, visit https://gerrit.wikimedia.org/r/421805 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iba46f5b17057ce825d6d1a94d9ccacb2a6a051dc Gerrit-Change-Number: 421805 Gerrit-PatchSet: 11 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [IMPR] give a more precise message when L10N test fails
by jenkins-bot (Code Review) 05 Apr '18

05 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/424284 ) Change subject: [IMPR] give a more precise message when L10N test fails ...................................................................... [IMPR] give a more precise message when L10N test fails Bug: T191509 Change-Id: I63bfb1f28bf483aaa4d0d5588519f8d156c16b53 --- M tests/l10n_tests.py 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py index 55d2daa..ec803f6 100644 --- a/tests/l10n_tests.py +++ b/tests/l10n_tests.py @@ -49,7 +49,12 @@ # check whether template exists title = templates[0][0] page = pywikibot.Page(site, title, ns=10) - self.assertTrue(page.exists()) + self.assertTrue( + page.exists(), + msg='Invalid L10N in package "{package}"\n' + 'template "{title}" does not exist for lang ' + '"{site.lang}" on site "{site}"' + .format(package=package, title=title, site=site)) return test_template -- To view, visit https://gerrit.wikimedia.org/r/424284 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I63bfb1f28bf483aaa4d0d5588519f8d156c16b53 Gerrit-Change-Number: 424284 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/i18n[master]: [bugfix] remove invalid io template which does not exist
by jenkins-bot (Code Review) 05 Apr '18

05 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/424258 ) Change subject: [bugfix] remove invalid io template which does not exist ...................................................................... [bugfix] remove invalid io template which does not exist Bug: T191509 Change-Id: I1862eaeb92f7aa59169cc4890be4f8882d7318ec --- M archivebot/io.json 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/archivebot/io.json b/archivebot/io.json index f460bbd..aafaa2e 100644 --- a/archivebot/io.json +++ b/archivebot/io.json @@ -6,7 +6,6 @@ }, "archivebot-archive-full": "(ARKIVO PLENIGITA)", "archivebot-archive-summary": "Bot: konservo %(count)d {{PLURAL:%(count)d|filo|fili}} de [[%(from)s]]", - "archivebot-archiveheader": "{{talk archive}}", "archivebot-older-than": "plu anciena kam %(duration)s", "archivebot-page-summary": "Bot: konservo di %(count)d {{PLURAL:%(count)d|filo|fili}} (%(why)s) al %(archives)s" } -- To view, visit https://gerrit.wikimedia.org/r/424258 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1862eaeb92f7aa59169cc4890be4f8882d7318ec Gerrit-Change-Number: 424258 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: site.categorymembers: Support cmstartsortkeyprefix API parameter
by jenkins-bot (Code Review) 05 Apr '18

05 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364423 ) Change subject: site.categorymembers: Support cmstartsortkeyprefix API parameter ...................................................................... site.categorymembers: Support cmstartsortkeyprefix API parameter site.py: - Fix the docstring for `startsort` and `endsort`. They are in binary string format and cannot be compared with a title directly. Also mention that they are deprecated in MW 1.24. - Add two new parameters, `startprefix` and `endprefix`, to be passed to API as `cmstartsortkeyprefix` and `cmendsortkeyprefix`. The old `startsort` is passed to API as `cmstartsortkey` which is deprecated and is not compatible with `cmstartsortkeyprefix`. Also working with `startsort` is difficult as it should be a "binary string" usually obtained via API or directly from the database. (See T74101) page.py: - Add the new parameters to `Category.articles`. Bug: T170265 Change-Id: I08f4a7a4bb1bbe5c10fe678cc7a951a273f61d07 --- M pywikibot/page.py M pywikibot/site.py 2 files changed, 64 insertions(+), 15 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 6b4d8cf..97f03e1 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2802,7 +2802,9 @@ def articles(self, recurse=False, total=None, content=False, namespaces=None, sortby=None, reverse=False, starttime=None, endtime=None, - startsort=None, endsort=None): + startsort=None, endsort=None, + startprefix=None, endprefix=None, + ): """ Yield all articles in the current category. @@ -2833,12 +2835,22 @@ @param endtime: if provided, only generate pages added before this time; not valid unless sortby="timestamp" @type endtime: pywikibot.Timestamp - @param startsort: if provided, only generate pages >= this title - lexically; not valid if sortby="timestamp" + @param startsort: if provided, only generate pages that have a + sortkey >= startsort; not valid if sortby="timestamp" + (Deprecated in MW 1.24) @type startsort: str - @param endsort: if provided, only generate pages <= this title - lexically; not valid if sortby="timestamp" + @param endsort: if provided, only generate pages that have a + sortkey <= endsort; not valid if sortby="timestamp" + (Deprecated in MW 1.24) @type endsort: str + @param startprefix: if provided, only generate pages >= this title + lexically; not valid if sortby="timestamp"; overrides "startsort" + (requires MW 1.18+) + @type startprefix: str + @param endprefix: if provided, only generate pages < this title + lexically; not valid if sortby="timestamp"; overrides "endsort" + (requires MW 1.18+) + @type endprefix: str """ for member in self.site.categorymembers(self, namespaces=namespaces, @@ -2849,6 +2861,8 @@ endtime=endtime, startsort=startsort, endsort=endsort, + startprefix=startprefix, + endprefix=endprefix, member_type=['page', 'file'] ): yield member @@ -2868,7 +2882,9 @@ starttime=starttime, endtime=endtime, startsort=startsort, - endsort=endsort + endsort=endsort, + startprefix=startprefix, + endprefix=endprefix, ): yield article if total is not None: diff --git a/pywikibot/site.py b/pywikibot/site.py index 88f48eb..e5bc29a 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3811,7 +3811,9 @@ def categorymembers(self, category, namespaces=None, sortby=None, reverse=False, starttime=None, endtime=None, startsort=None, endsort=None, total=None, - content=False, member_type=None): + content=False, member_type=None, + startprefix=None, endprefix=None, + ): """Iterate members of specified category. @param category: The Category to iterate. @@ -3833,13 +3835,22 @@ @type starttime: pywikibot.Timestamp @param endtime: if provided, only generate pages added before this time; not valid unless sortby="timestamp" - @type endtime: pywikibot.Timestamp - @param startsort: if provided, only generate pages >= this title - lexically; not valid if sortby="timestamp" + @param startsort: if provided, only generate pages that have a + sortkey >= startsort; not valid if sortby="timestamp" + (Deprecated in MW 1.24) @type startsort: str - @param endsort: if provided, only generate pages <= this title - lexically; not valid if sortby="timestamp" + @param endsort: if provided, only generate pages that have a + sortkey <= endsort; not valid if sortby="timestamp" + (Deprecated in MW 1.24) @type endsort: str + @param startprefix: if provided, only generate pages >= this title + lexically; not valid if sortby="timestamp"; overrides "startsort" + (requires MW 1.18+) + @type startprefix: str + @param endprefix: if provided, only generate pages < this title + lexically; not valid if sortby="timestamp"; overrides "endsort" + (requires MW 1.18+) + @type endprefix: str @param content: if True, load the current content of each iterated page (default False) @type content: bool @@ -3849,6 +3860,8 @@ @type member_type: str or iterable of str; values: page, subcat, file @raises KeyError: a namespace identifier was not resolved + @raises NotImplementedError: startprefix or endprefix parameters are + given but site.version is less than 1.18. @raises TypeError: a namespace identifier has an inappropriate type such as NoneType or bool """ @@ -3868,7 +3881,10 @@ if starttime and endtime and starttime > endtime: raise ValueError( "categorymembers: starttime must be before endtime") - if startsort and endsort and startsort > endsort: + if startprefix and endprefix and startprefix > endprefix: + raise ValueError( + 'categorymembers: startprefix must be less than endprefix') + elif startsort and endsort and startsort > endsort: raise ValueError( "categorymembers: startsort must be less than endsort") @@ -3923,6 +3939,7 @@ # sort; we take care of this reversal for the user (starttime, endtime) = (endtime, starttime) (startsort, endsort) = (endsort, startsort) + (startprefix, endprefix) = (endprefix, startprefix) if starttime and sortby == "timestamp": cmargs["gcmstart"] = starttime elif starttime: @@ -3933,12 +3950,28 @@ elif endtime: raise ValueError("categorymembers: " "invalid combination of 'sortby' and 'endtime'") - if startsort and sortby != "timestamp": + if startprefix and sortby != 'timestamp': + if self.version() < MediaWikiVersion('1.18'): + raise NotImplementedError( + 'categorymembers: "startprefix" requires MW 1.18+') + cmargs['gcmstartsortkeyprefix'] = startprefix + elif startprefix: + raise ValueError('categorymembers: invalid combination of ' + "'sortby' and 'startprefix'") + elif startsort and sortby != 'timestamp': cmargs["gcmstartsortkey"] = startsort elif startsort: raise ValueError("categorymembers: " "invalid combination of 'sortby' and 'startsort'") - if endsort and sortby != "timestamp": + if endprefix and sortby != 'timestamp': + if self.version() < MediaWikiVersion('1.18'): + raise NotImplementedError( + 'categorymembers: "endprefix" requires MW 1.18+') + cmargs['cmendsortkeyprefix'] = endprefix + elif endprefix: + raise ValueError('categorymembers: ' + "invalid combination of 'sortby' and 'endprefix'") + elif endsort and sortby != 'timestamp': cmargs["gcmendsortkey"] = endsort elif endsort: raise ValueError("categorymembers: " -- To view, visit https://gerrit.wikimedia.org/r/364423 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I08f4a7a4bb1bbe5c10fe678cc7a951a273f61d07 Gerrit-Change-Number: 364423 Gerrit-PatchSet: 12 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: appveyor.yml: Use a shallow clone instead of cloning the whole reposi...
by jenkins-bot (Code Review) 04 Apr '18

04 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/423829 ) Change subject: appveyor.yml: Use a shallow clone instead of cloning the whole repository ...................................................................... appveyor.yml: Use a shallow clone instead of cloning the whole repository A depth of 50 is chosen as it would be very unusual for pywikibot to have more than 50 builds in Appveyor queue. See https://www.appveyor.com/docs/how-to/repository-shallow-clone/ for more info. Change-Id: Ic9959ffb5f75592eb78fdcea9c41bf8812aae79a --- M .appveyor.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index 85ccee8..2755449 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,3 +1,4 @@ +clone_depth: 50 environment: global: -- To view, visit https://gerrit.wikimedia.org/r/423829 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic9959ffb5f75592eb78fdcea9c41bf8812aae79a Gerrit-Change-Number: 423829 Gerrit-PatchSet: 1 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [doc] Prepare next release
by jenkins-bot (Code Review) 03 Apr '18

03 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/423704 ) Change subject: [doc] Prepare next release ...................................................................... [doc] Prepare next release Change-Id: I2d95732d235d27652ed44ffc4a1f61acfe0b08a6 --- M HISTORY.rst M docs/conf.py 2 files changed, 8 insertions(+), 1 deletion(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/HISTORY.rst b/HISTORY.rst index 525006e..067510d 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,13 @@ Current release --------------- + +* Bugfixes and improvements +* Localisation updates + +3.0.20180403 +------------ + * Deprecation warning: support for py2.7.2 and py2.7.3 will be dropped * Dropped support for Python 2.6 (T154771) * Dropped support for Python 3.3 (T184508) diff --git a/docs/conf.py b/docs/conf.py index 9ead2b0..2c140a4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -67,7 +67,7 @@ # The short X.Y version. version = '3.0' # The full version, including alpha/beta/rc tags. -release = '3.0.20180304' +release = '3.0.20180403' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -- To view, visit https://gerrit.wikimedia.org/r/423704 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I2d95732d235d27652ed44ffc4a1f61acfe0b08a6 Gerrit-Change-Number: 423704 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [cleanup] Cleanup TODO list
by jenkins-bot (Code Review) 03 Apr '18

03 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/423702 ) Change subject: [cleanup] Cleanup TODO list ...................................................................... [cleanup] Cleanup TODO list remove "Rewrite help parser to support earlier releases" from TODO list. MW 1.10 seems early enough. Change-Id: Idaae1e38cf2234dfbb8a994cf48a790602e824ed --- M pywikibot/data/api.py 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 278ff81..29030fe 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -172,8 +172,6 @@ It does not support the format modules. - TODO: Rewrite help parser to support earlier releases. - TODO: establish a data structure in the class which prefills the param information available for a site given its version, using the API information available for each -- To view, visit https://gerrit.wikimedia.org/r/423702 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idaae1e38cf2234dfbb8a994cf48a790602e824ed Gerrit-Change-Number: 423702 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Use the parameters argument of PropertyGenerator
by jenkins-bot (Code Review) 03 Apr '18

03 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/423592 ) Change subject: Use the parameters argument of PropertyGenerator ...................................................................... Use the parameters argument of PropertyGenerator This is to avoid pywikibot.data.api.Request._warn_kwargs warning. Change-Id: I3123d8492ef2521ff1811f3be68cbd427dfed673 --- M pywikibot/site.py M tests/api_tests.py 2 files changed, 19 insertions(+), 16 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 050d8be..88f48eb 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3489,9 +3489,10 @@ # don't request patrol query = api.PropertyGenerator( 'info', - titles='Dummy page', - intoken=valid_tokens - {'patrol'}, - site=self) + site=self, + parameters={ + 'intoken': valid_tokens - {'patrol'}, + 'titles': 'Dummy page'}) query.request._warning_handler = warn_handler for item in query: diff --git a/tests/api_tests.py b/tests/api_tests.py index aabfcb8..041af5f 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -672,7 +672,7 @@ for l in links] gen = api.PropertyGenerator(site=self.site, prop="info", - titles='|'.join(titles)) + parameters={'titles': '|'.join(titles)}) count = 0 for pagedata in gen: @@ -690,7 +690,7 @@ for l in links] gen = api.PropertyGenerator(site=self.site, prop="revisions", - titles='|'.join(titles)) + parameters={'titles': '|'.join(titles)}) gen.set_maximum_items(-1) # suppress use of "rvlimit" parameter count = 0 @@ -710,7 +710,7 @@ for l in links] gen = api.PropertyGenerator(site=self.site, prop="revisions|coordinates", - titles='|'.join(titles)) + parameters={'titles': '|'.join(titles)}) gen.set_maximum_items(-1) # suppress use of "rvlimit" parameter count = 0 @@ -729,10 +729,12 @@ links = list(self.site.pagelinks(mainpage, total=30)) titles = [l.title(withSection=False) for l in links] - gen = api.PropertyGenerator(site=self.site, - prop="revisions|info|categoryinfo|langlinks|templates", - rvprop="ids|flags|timestamp|user|comment|content", - titles='|'.join(titles)) + gen = api.PropertyGenerator( + site=self.site, + prop='revisions|info|categoryinfo|langlinks|templates', + parameters={ + 'rvprop': 'ids|flags|timestamp|user|comment|content', + 'titles': '|'.join(titles)}) # An APIError is raised if set_maximum_items is not called. gen.set_maximum_items(-1) # suppress use of "rvlimit" parameter @@ -755,9 +757,9 @@ links = list(self.site.pagelinks(mainpage, total=30)) titles = [l.title(withSection=False) for l in links] - gen = api.PropertyGenerator(site=self.site, - prop="info|categoryinfo|langlinks|templates", - titles='|'.join(titles)) + gen = api.PropertyGenerator( + site=self.site, prop='info|categoryinfo|langlinks|templates', + parameters={'titles': '|'.join(titles)}) # Force the generator into continuation mode gen.set_query_increment(5) @@ -776,9 +778,9 @@ links = list(mainpage.backlinks(total=300)) titles = [l.title(withSection=False) for l in links] - gen = api.PropertyGenerator(site=self.site, - prop="info|categoryinfo|langlinks|templates", - titles='|'.join(titles)) + gen = api.PropertyGenerator( + site=self.site, prop='info|categoryinfo|langlinks|templates', + parameters={'titles': '|'.join(titles)}) # Force the generator into continuation mode gen.set_query_increment(50) -- To view, visit https://gerrit.wikimedia.org/r/423592 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I3123d8492ef2521ff1811f3be68cbd427dfed673 Gerrit-Change-Number: 423592 Gerrit-PatchSet: 2 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [cleanup] Remove old for dropped python versions
by jenkins-bot (Code Review) 03 Apr '18

03 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/423483 ) Change subject: [cleanup] Remove old for dropped python versions ...................................................................... [cleanup] Remove old for dropped python versions - tools module: python 2.7.0 and python 2.6 aren't supported anymore Therefore the ContextManagerWrapper code part for bz2 and gzip files could be removed - bot module: total_seconds() was introduced with 2.7 - deprecate ContextManagerWrapper Change-Id: I50cc95bc7b9a8845b11d2515a97313511668cdcd --- M pywikibot/bot.py M pywikibot/tools/__init__.py M tests/tools_tests.py 3 files changed, 56 insertions(+), 61 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index ceb9459..802ab04 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -96,7 +96,7 @@ ) from pywikibot.logging import critical from pywikibot.tools import ( - deprecated, deprecate_arg, deprecated_args, PY2, PYTHON_VERSION, + deprecated, deprecate_arg, deprecated_args, PY2, ) from pywikibot.tools._logging import ( LoggingFormatter as _LoggingFormatter, @@ -1380,10 +1380,7 @@ % (self._treat_counter, self._save_counter)) if hasattr(self, '_start_ts'): delta = (pywikibot.Timestamp.now() - self._start_ts) - if PYTHON_VERSION >= (2, 7): - seconds = int(delta.total_seconds()) - else: - seconds = delta.seconds + delta.days * 86400 + seconds = int(delta.total_seconds()) if delta.days: pywikibot.output("Execution time: %d days, %d seconds" % (delta.days, delta.seconds)) diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 95eae41..4df67fc 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -988,48 +988,6 @@ raise StopIteration -class ContextManagerWrapper(object): - - """ - Wraps an object in a context manager. - - It is redirecting all access to the wrapped object and executes 'close' when - used as a context manager in with-statements. In such statements the value - set via 'as' is directly the wrapped object. For example: - - >>> class Wrapper(object): - ... def close(self): pass - >>> an_object = Wrapper() - >>> wrapped = ContextManagerWrapper(an_object) - >>> with wrapped as another_object: - ... assert another_object is an_object - - It does not subclass the object though, so isinstance checks will fail - outside a with-statement. - """ - - def __init__(self, wrapped): - """Create a new wrapper.""" - super(ContextManagerWrapper, self).__init__() - super(ContextManagerWrapper, self).__setattr__('_wrapped', wrapped) - - def __enter__(self): - """Enter a context manager and use the wrapped object directly.""" - return self._wrapped - - def __exit__(self, exc_type, exc_value, traceback): - """Call close on the wrapped object when exiting a context manager.""" - self._wrapped.close() - - def __getattr__(self, name): - """Get the attribute from the wrapped object.""" - return getattr(self._wrapped, name) - - def __setattr__(self, name, value): - """Set the attribute in the wrapped object.""" - setattr(self._wrapped, name, value) - - def open_archive(filename, mode='rb', use_extension=True): """ Open a file and uncompress it if needed. @@ -1060,17 +1018,8 @@ It is also raised by bz2 when its content is invalid. gzip does not immediately raise that error but only on reading it. @return: A file-like object returning the uncompressed data in binary mode. - Before Python 2.7 the GzipFile object and before 2.7.1 the BZ2File are - wrapped in a ContextManagerWrapper with its advantages/disadvantages. @rtype: file-like object """ - def wrap(wrapped, sub_ver): - """Wrap in a wrapper when this is below Python version 2.7.""" - if PYTHON_VERSION < (2, 7, sub_ver): - return ContextManagerWrapper(wrapped) - else: - return wrapped - if mode in ('r', 'a', 'w'): mode += 'b' elif mode not in ('rb', 'ab', 'wb'): @@ -1097,9 +1046,9 @@ if extension == 'bz2': if isinstance(bz2, ImportError): raise bz2 - return wrap(bz2.BZ2File(filename, mode), 1) + return bz2.BZ2File(filename, mode) elif extension == 'gz': - return wrap(gzip.open(filename, mode), 0) + return gzip.open(filename, mode) elif extension == '7z': if mode != 'rb': raise NotImplementedError('It is not possible to write a 7z file.') @@ -1785,8 +1734,53 @@ sha.update(read_bytes) return sha.hexdigest() +# deprecated parts ############################################################ + + +class ContextManagerWrapper(object): + + """ + DEPRECATED. Wraps an object in a context manager. + + It is redirecting all access to the wrapped object and executes 'close' + when used as a context manager in with-statements. In such statements the + value set via 'as' is directly the wrapped object. For example: + + >>> class Wrapper(object): + ... def close(self): pass + >>> an_object = Wrapper() + >>> wrapped = ContextManagerWrapper(an_object) + >>> with wrapped as another_object: + ... assert another_object is an_object + + It does not subclass the object though, so isinstance checks will fail + outside a with-statement. + """ + + def __init__(self, wrapped): + """Create a new wrapper.""" + super(ContextManagerWrapper, self).__init__() + super(ContextManagerWrapper, self).__setattr__('_wrapped', wrapped) + + def __enter__(self): + """Enter a context manager and use the wrapped object directly.""" + return self._wrapped + + def __exit__(self, exc_type, exc_value, traceback): + """Call close on the wrapped object when exiting a context manager.""" + self._wrapped.close() + + def __getattr__(self, name): + """Get the attribute from the wrapped object.""" + return getattr(self._wrapped, name) + + def __setattr__(self, name, value): + """Set the attribute in the wrapped object.""" + setattr(self._wrapped, name, value) + wrapper = ModuleDeprecationWrapper(__name__) wrapper._add_deprecated_attr('Counter', collections.Counter) wrapper._add_deprecated_attr('OrderedDict', collections.OrderedDict) wrapper._add_deprecated_attr('count', itertools.count) +wrapper._add_deprecated_attr('ContextManagerWrapper', replacement_name='') diff --git a/tests/tools_tests.py b/tests/tools_tests.py index ab58205..e0429c0 100644 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -16,7 +16,7 @@ import warnings from pywikibot import tools -from pywikibot.tools import classproperty +from pywikibot.tools import classproperty, suppress_warnings from tests import join_xml_data_path, mock from tests.aspects import ( @@ -49,7 +49,9 @@ def test_wrapper(self): """Create a test instance and verify the wrapper redirects.""" obj = self.DummyClass() - wrapped = tools.ContextManagerWrapper(obj) + with suppress_warnings( + 'pywikibot.tools.ContextManagerWrapper is deprecated.'): + wrapped = tools.ContextManagerWrapper(obj) self.assertIs(wrapped.class_var, obj.class_var) self.assertIs(wrapped.instance_var, obj.instance_var) self.assertIs(wrapped._wrapped, obj) @@ -63,7 +65,9 @@ def test_exec_wrapper(self): """Check that the wrapper permits exceptions.""" - wrapper = tools.ContextManagerWrapper(self.DummyClass()) + with suppress_warnings( + 'pywikibot.tools.ContextManagerWrapper is deprecated.'): + wrapper = tools.ContextManagerWrapper(self.DummyClass()) self.assertFalse(wrapper.closed) with self.assertRaisesRegex(ZeroDivisionError, '(integer division or modulo by zero|division by zero)'): -- To view, visit https://gerrit.wikimedia.org/r/423483 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I50cc95bc7b9a8845b11d2515a97313511668cdcd Gerrit-Change-Number: 423483 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [L10N] Update languages_by_size
by jenkins-bot (Code Review) 02 Apr '18

02 Apr '18

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/423472 ) Change subject: [L10N] Update languages_by_size ...................................................................... [L10N] Update languages_by_size Change-Id: I26570f8eb70356698e02d220852474f639f5124b --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wiktionary_family.py 5 files changed, 18 insertions(+), 18 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index dffaf7b..f71669d 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -37,11 +37,11 @@ self.languages_by_size = [ 'en', 'hu', 'de', 'fr', 'pt', 'ja', 'it', 'nl', 'es', 'pl', 'th', 'he', 'id', 'sq', 'fi', 'fa', 'zh', 'ca', 'ru', 'az', 'vi', 'da', - 'gl', 'sv', 'sr', 'ko', 'cs', 'hr', 'ba', 'no', 'tr', 'ar', 'ta', + 'sv', 'gl', 'sr', 'ko', 'cs', 'hr', 'ba', 'no', 'tr', 'ar', 'ta', 'sa', 'sk', 'uk', 'hi', 'is', 'ro', 'eo', 'si', 'mk', 'bn', 'bg', 'ka', 'ms', 'lt', 'tt', 'li', 'el', 'ur', 'sl', 'km', 'tl', 'kk', 'et', 'ml', 'oc', 'be', 'ia', 'ne', 'eu', 'pa', 'hy', 'la', 'cv', - 'tg', 'fy', 'ku', 'bs', 'te', 'af', 'cy', 'mr', 'mg', 'ky', + 'tg', 'fy', 'ku', 'bs', 'cy', 'te', 'af', 'mr', 'mg', 'ky', ] super(Family, self).__init__() diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 332fd7d..e1a4a20 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -34,7 +34,7 @@ 'en', 'ceb', 'sv', 'de', 'fr', 'nl', 'ru', 'it', 'es', 'pl', 'war', 'vi', 'ja', 'zh', 'pt', 'uk', 'sr', 'fa', 'ca', 'ar', 'no', 'sh', 'fi', 'hu', 'id', 'ko', 'cs', 'ro', 'ms', 'tr', 'eu', 'eo', 'bg', - 'hy', 'da', 'zh-min-nan', 'sk', 'min', 'he', 'kk', 'lt', 'hr', + 'hy', 'da', 'zh-min-nan', 'sk', 'he', 'min', 'kk', 'hr', 'lt', 'et', 'ce', 'sl', 'be', 'gl', 'el', 'ur', 'nn', 'az', 'simple', 'uz', 'la', 'hi', 'th', 'ka', 'vo', 'ta', 'cy', 'mk', 'tg', 'tl', 'mg', 'oc', 'lv', 'ky', 'tt', 'bs', 'ast', 'sq', 'new', 'azb', @@ -51,15 +51,15 @@ 'co', 'fiu-vro', 'lrc', 'tk', 'kv', 'csb', 'myv', 'gv', 'as', 'lad', 'so', 'nv', 'zea', 'udm', 'ay', 'lez', 'stq', 'ie', 'kw', 'nrm', 'pcd', 'mwl', 'ug', 'gom', 'rm', 'gn', 'koi', 'ab', 'lij', - 'mt', 'sn', 'fur', 'dsb', 'dv', 'ang', 'ln', 'kab', 'ext', - 'cbk-zam', 'frp', 'dty', 'ksh', 'lo', 'gag', 'olo', 'pag', 'pi', - 'av', 'bxr', 'pfl', 'haw', 'xal', 'krc', 'pap', 'kaa', 'rw', 'pdc', + 'mt', 'sn', 'fur', 'dsb', 'dv', 'ang', 'ln', 'frp', 'cbk-zam', + 'kab', 'ext', 'dty', 'ksh', 'lo', 'gag', 'olo', 'pag', 'pi', 'av', + 'bxr', 'haw', 'pfl', 'xal', 'krc', 'pap', 'kaa', 'rw', 'pdc', 'bjn', 'ha', 'to', 'nov', 'kl', 'arc', 'jam', 'kbd', 'tyv', 'tpi', - 'tet', 'kbp', 'ki', 'na', 'ig', 'bi', 'jbo', 'roa-rup', 'lbe', - 'ty', 'mdf', 'za', 'kg', 'wo', 'lg', 'srn', 'tcy', 'zu', 'chr', + 'tet', 'kbp', 'ki', 'ig', 'na', 'roa-rup', 'jbo', 'lbe', 'ty', + 'mdf', 'za', 'kg', 'bi', 'wo', 'lg', 'srn', 'tcy', 'zu', 'chr', 'ltg', 'sm', 'om', 'xh', 'rmy', 'cu', 'tn', 'pih', 'rn', 'chy', - 'tw', 'tum', 'ts', 'got', 'st', 'bm', 'pnt', 'ss', 'atj', 'ch', - 'ak', 'fj', 'ady', 'iu', 'ny', 'ee', 'ks', 'ik', 've', 'sg', 'ff', + 'tw', 'tum', 'ts', 'bm', 'got', 'st', 'pnt', 'ak', 'ss', 'atj', + 'ch', 'fj', 'ady', 'iu', 'ny', 'ee', 'ks', 'ik', 've', 'sg', 'ff', 'dz', 'ti', 'cr', 'din', ] diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 267f550..7290009 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -36,7 +36,7 @@ 'fr', 'bs', 'he', 'tr', 'fi', 'ca', 'lt', 'th', 'bg', 'sl', 'eo', 'hy', 'el', 'hr', 'nn', 'id', 'zh', 'ar', 'hu', 'su', 'li', 'az', 'ko', 'nl', 'ja', 'gu', 'sv', 'sr', 'gl', 'ur', 'te', 'ta', 'cy', - 'la', 'no', 'ml', 'vi', 'et', 'be', 'kn', 'ku', 'ro', 'eu', 'hi', + 'la', 'no', 'ml', 'vi', 'et', 'be', 'kn', 'ku', 'eu', 'ro', 'hi', 'ka', 'da', 'sa', 'is', 'sq', 'mr', 'br', 'af', 'uz', 'zh-min-nan', 'wo', 'ky', ] diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index f52cd68..7d81644 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -32,8 +32,8 @@ 'en', 'pl', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'ar', 'cs', 'pt', 'www', 'fa', 'hu', 'ml', 'ko', 'sv', 'gu', 'sr', 'bn', 'sl', 'te', 'sa', 'el', 'ro', 'fi', 'uk', 'hy', 'vi', 'ja', 'th', 'az', - 'ca', 'ta', 'kn', 'br', 'hr', 'nl', 'is', 'la', 'no', 'vec', 'eo', - 'tr', 'et', 'be', 'mk', 'yi', 'id', 'da', 'bg', 'li', 'mr', 'as', + 'ca', 'ta', 'kn', 'br', 'nl', 'hr', 'is', 'la', 'no', 'vec', 'eo', + 'tr', 'et', 'be', 'mk', 'yi', 'da', 'id', 'bg', 'li', 'mr', 'as', 'or', 'bs', 'sah', 'lt', 'gl', 'sk', 'cy', 'pa', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index a1b2acf..529bf67 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -32,15 +32,15 @@ def __init__(self): """Initializer.""" self.languages_by_size = [ - 'en', 'mg', 'fr', 'sh', 'ru', 'es', 'zh', 'de', 'nl', 'sv', 'lt', - 'pl', 'ku', 'el', 'it', 'fi', 'ta', 'hu', 'tr', 'ca', 'ko', 'io', + 'en', 'mg', 'fr', 'sh', 'ru', 'es', 'zh', 'de', 'nl', 'ku', 'sv', + 'lt', 'pl', 'el', 'it', 'fi', 'ta', 'hu', 'tr', 'ca', 'ko', 'io', 'kn', 'pt', 'hy', 'vi', 'sr', 'ja', 'chr', 'hi', 'th', 'ro', 'no', 'id', 'ml', 'et', 'my', 'uz', 'li', 'or', 'te', 'cs', 'fa', 'eo', 'ar', 'jv', 'az', 'eu', 'gl', 'oc', 'da', 'br', 'lo', 'uk', 'hr', 'fj', 'tg', 'bg', 'simple', 'ps', 'sk', 'cy', 'vo', 'wa', 'is', - 'zh-min-nan', 'la', 'af', 'scn', 'ast', 'he', 'ky', 'tl', 'sw', - 'fy', 'nn', 'lv', 'pa', 'co', 'pnb', 'mn', 'ka', 'nds', 'sl', 'sq', - 'lb', 'bs', 'nah', 'sa', 'kk', 'bn', 'tk', 'km', 'sm', 'mk', 'hsb', + 'la', 'zh-min-nan', 'af', 'scn', 'ast', 'he', 'ky', 'tl', 'sw', + 'fy', 'nn', 'lv', 'bn', 'pa', 'co', 'pnb', 'mn', 'ka', 'nds', 'sl', + 'sq', 'lb', 'bs', 'nah', 'sa', 'kk', 'tk', 'km', 'sm', 'mk', 'hsb', 'ur', 'be', 'ms', 'ga', 'an', 'wo', 'vec', 'ang', 'tt', 'sd', 'mt', 'gn', 'mr', 'ie', 'so', 'csb', 'ug', 'gd', 'st', 'roa-rup', 'si', 'hif', 'ia', 'mi', 'ay', 'kl', 'fo', 'jbo', 'ln', 'zu', 'na', 'gu', -- To view, visit https://gerrit.wikimedia.org/r/423472 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I26570f8eb70356698e02d220852474f639f5124b Gerrit-Change-Number: 423472 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits April 2018