Pywikibot-commits April 2018

pywikibot-commits@lists.wikimedia.org

1 participants
88 discussions

[Gerrit] pywikibot/core[master]: [pep8] Follow naming convention

by jenkins-bot (Code Review)

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 <>

6 years

[Gerrit] pywikibot/core[master]: [cleanup] use content parameter instead of getText in loadrevisions

by jenkins-bot (Code Review)

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 <>

6 years

[Gerrit] pywikibot/core[master]: [bugfix] create site attribute first

by jenkins-bot (Code Review)

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 <>

6 years

[Gerrit] pywikibot/core[master]: [IMPR] use context manager to open a file

by jenkins-bot (Code Review)

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 <>

6 years

[Gerrit] pywikibot/core[master]: Use existing site attribute

by jenkins-bot (Code Review)

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 <>

6 years

[Gerrit] pywikibot/core[master]: [bugfix] Update search result of test_searchitem_language

by jenkins-bot (Code Review)

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 <>

6 years

[Gerrit] pywikibot/core[master]: Revert "Cleanup .appveyor.yml file"

by jenkins-bot (Code Review)

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 <>

6 years, 1 month

[Gerrit] pywikibot/core[master]: [tox] Disable flake8-string-format rule P101

by jenkins-bot (Code Review)

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 <>

6 years, 1 month

[Gerrit] pywikibot/core[master]: [bugfix] ensure that Timestamp.microsecond is not 0

by jenkins-bot (Code Review)

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 <>

6 years, 1 month

[Gerrit] pywikibot/core[master]: generate_user_config.py: Check a previous user-password.py

by jenkins-bot (Code Review)

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 <>

6 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits April 2018