Pywikibot-commits October 2014

pywikibot-commits@lists.wikimedia.org

1 participants
155 discussions

[Gerrit] Improve comment in page_tests.testBasePageConstructor - change (pywikibot/core)
by jenkins-bot (Code Review) 28 Oct '14

28 Oct '14

jenkins-bot has submitted this change and it was merged. Change subject: Improve comment in page_tests.testBasePageConstructor ...................................................................... Improve comment in page_tests.testBasePageConstructor Comment in page_tests.testBasePageConstructor was misleading, now fixed. Change-Id: Iaa3254f56c35dc8e10a4051f374c55e7c0f2a1d4 --- M tests/page_tests.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Nullzero: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/page_tests.py b/tests/page_tests.py index 98616e5..460f1e8 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -281,8 +281,8 @@ site = self.get_site() # Should not raise an error as the constructor only requires - # the site parameter, with the title parameter defaulted to - # empty string + # the site parameter. + # Empty string or None as title raises error. page = pywikibot.page.BasePage(site) self.assertRaises(InvalidTitle, page.title) page = pywikibot.page.BasePage(site, title=u'') -- To view, visit https://gerrit.wikimedia.org/r/169220 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaa3254f56c35dc8e10a4051f374c55e7c0f2a1d4 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Nullzero <nullzero.free(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Bug 64188 - getVersionHistory does not follow total parameter - change (pywikibot/core)
by jenkins-bot (Code Review) 27 Oct '14

27 Oct '14

jenkins-bot has submitted this change and it was merged. Change subject: Bug 64188 - getVersionHistory does not follow total parameter ...................................................................... Bug 64188 - getVersionHistory does not follow total parameter When a version history is already loaded, decreasing the total parameter getVersionHistory() now returns the decreased amount of values. Fixed also for getVersionHistoryTable() and fullVersionHistory() methods. Created namedtuple classes: - HistEntry - FullHistEntry to improve handling of data returned by getVersionHistory(). Adapted scripts to make use of new classes. Fixed also a bug in page.previousRevision(), when page is new page. Bug: 64188 Change-Id: I9aa1372e7e6366e3dee454d069b742abbc372b64 --- M pywikibot/page.py M scripts/checkimages.py M scripts/newitem.py 3 files changed, 82 insertions(+), 75 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 2c3db36..08a27ba 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -518,11 +518,9 @@ return self._lastNonBotUser self._lastNonBotUser = None - for vh in self.getVersionHistory(): - (revid, timestmp, username, comment) = vh[:4] - - if username and (not self.site.isBot(username)): - self._lastNonBotUser = username + for entry in self.getVersionHistory(): + if entry.user and (not self.site.isBot(entry.user)): + self._lastNonBotUser = entry.user break return self._lastNonBotUser @@ -540,11 +538,16 @@ def previousRevision(self): """Return the revision id for the previous revision of this Page. + If the page has only one revision, it shall return -1. + @return: long """ - self.getVersionHistory(total=2) - revkey = sorted(self._revisions, reverse=True)[1] - return revkey + history = self.getVersionHistory(total=2) + + if len(history) == 1: + return -1 + else: + return min(x.revid for x in history) def exists(self): """Return True if page exists on the wiki, even if it's a redirect. @@ -1360,8 +1363,7 @@ # returned no more than 500 revisions; now, it iterates # all revisions unless 'total' argument is used @deprecated_args(forceReload=None, revCount="total", getAll=None) - def getVersionHistory(self, reverseOrder=False, step=None, - total=None): + def getVersionHistory(self, reverseOrder=False, step=None, total=None): """Load the version history page and return history information. Return value is a list of tuples, where each tuple represents one @@ -1375,25 +1377,21 @@ """ self.site.loadrevisions(self, getText=False, rvdir=reverseOrder, step=step, total=total) - return [(self._revisions[rev].revid, - self._revisions[rev].timestamp, - self._revisions[rev].user, - self._revisions[rev].comment - ) for rev in sorted(self._revisions, - reverse=not reverseOrder) - ] + + return [rev.hist_entry() + for revid, rev in sorted(self._revisions.items(), + reverse=not reverseOrder) + ][:total] @deprecated_args(forceReload=None) def getVersionHistoryTable(self, reverseOrder=False, step=None, total=None): """Return the version history as a wiki table.""" result = '{| class="wikitable"\n' result += '! oldid || date/time || username || edit summary\n' - for oldid, time, username, summary \ - in self.getVersionHistory(reverseOrder=reverseOrder, - step=step, total=total): + for entry in self.getVersionHistory(reverseOrder=reverseOrder, + step=step, total=total): result += '|----\n' - result += '| %s || %s || %s || <nowiki>%s</nowiki>\n'\ - % (oldid, time, username, summary) + result += '| %s || %s || %s || <nowiki>%s</nowiki>\n' % entry result += '|}\n' return result @@ -1408,17 +1406,13 @@ edit date/time, user name and content """ - self.site.loadrevisions(self, getText=True, - rvdir=reverseOrder, + self.site.loadrevisions(self, getText=True, rvdir=reverseOrder, step=step, total=total, rollback=rollback) - return [(self._revisions[rev].revid, - self._revisions[rev].timestamp, - self._revisions[rev].user, - self._revisions[rev].text, - self._revisions[rev].rollbacktoken - ) for rev in sorted(self._revisions, - reverse=not reverseOrder) - ] + + return [rev.hist_entry() + for revid, rev in sorted(self._revisions.items(), + reverse=not reverseOrder) + ][:total] def contributingUsers(self, step=None, total=None): """Return a set of usernames (or IPs) of users who edited this page. @@ -1427,8 +1421,8 @@ @param total: iterate no more than this number of revisions in total """ - edits = self.getVersionHistory(step=step, total=total) - users = set([edit[2] for edit in edits]) + history = self.getVersionHistory(step=step, total=total) + users = set(entry.user for entry in history) return users @deprecate_arg("throttle", None) @@ -3846,6 +3840,19 @@ """A structure holding information about a single revision of a Page.""" + HistEntry = collections.namedtuple('HistEntry', + ['revid', + 'timestamp', + 'user', + 'comment']) + + FullHistEntry = collections.namedtuple('FullHistEntry', + ['revid', + 'timestamp', + 'user', + 'text', + 'rollbacktoken']) + def __init__(self, revid, timestamp, user, anon=False, comment=u"", text=None, minor=False, rollbacktoken=None): """ @@ -3879,6 +3886,16 @@ self.minor = minor self.rollbacktoken = rollbacktoken + def hist_entry(self): + """Return a namedtuple with a Page history record.""" + return Revision.HistEntry(self.revid, self.timestamp, self.user, + self.comment) + + def full_hist_entry(self): + """Return a namedtuple with a Page full history record.""" + return Revision.FullHistEntry(self.revid, self.timestamp, self.user, + self.text, self.rollbacktoken) + class Link(ComparableMixin): diff --git a/scripts/checkimages.py b/scripts/checkimages.py index ff56c81..8179fff 100644 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -1,9 +1,10 @@ #!/usr/bin/python # -*- coding: utf-8 -*- """ -Script to check recently uploaded files. This script checks if a file -description is present and if there are other problems in the image's -description. +Script to check recently uploaded files. + +This script checks if a file description is present and if there are other +problems in the image's description. This script will have to be configured for each language. Please submit translations as addition to the Pywikibot framework. @@ -565,24 +566,16 @@ class LogIsFull(pywikibot.Error): - """An exception indicating that the log is full and the Bot cannot add - other data to prevent Errors. - - """ + """Log is full and the Bot cannot add other data to prevent Errors.""" class NothingFound(pywikibot.Error): - """ An exception indicating that a regex has return [] instead of results. - - """ + """Regex returned [] instead of results.""" def printWithTimeZone(message): - """ Function to print the messages followed by the TimeZone encoded - correctly. - - """ + """Print the messages followed by the TimeZone encoded correctly.""" if message[-1] != ' ': message = '%s ' % unicode(message) if locale.getlocale()[1]: @@ -596,6 +589,8 @@ class checkImagesBot(object): + + """A robot to check recently uploaded files.""" def __init__(self, site, logFulNumber=25000, sendemailActive=False, duplicatesReport=False, logFullError=True): @@ -639,9 +634,10 @@ self.list_licenses = self.load_licenses() def setParameters(self, imageName): - """ Function to set parameters, now only image but maybe it can be used - for others in "future" + """ + Set parameters. + Now only image but maybe it can be used for others in "future". """ self.imageName = imageName self.image = pywikibot.FilePage(self.site, self.imageName) @@ -707,10 +703,7 @@ return upBotArray[0] def tag_image(self, put=True): - """ Function to add the template in the image and to find out - who's the user that has uploaded the file. - - """ + """Add template to the Image page and find out the uploader.""" # Get the image's description reportPageObject = pywikibot.FilePage(self.site, self.image_to_report) @@ -829,9 +822,10 @@ return def untaggedGenerator(self, untaggedProject, limit): - """ Generator that yield the files without license. It's based on a - tool of the toolserver. + """ + Generator that yield the files without license. + It's based on a tool of the toolserver. """ lang = untaggedProject.split('.', 1)[0] project = '.%s' % untaggedProject.split('.', 1)[1] @@ -863,10 +857,7 @@ u'that it works!') def regexGenerator(self, regexp, textrun): - """ Generator used when an user use a regex parsing a page to yield the - results - - """ + """Find page to yield using regex to parse text.""" regex = re.compile(r'%s' % regexp, re.UNICODE | re.DOTALL) results = regex.findall(textrun) for image in results: @@ -935,7 +926,7 @@ user_list = list() for data in history: - user_list.append(data[2]) + user_list.append(data.user) number_edits = 0 for username in userlist: @@ -1319,11 +1310,7 @@ return list_licenses def miniTemplateCheck(self, template): - """ - Check whether the given template given in the licenses allowed or in the - licenses to skip. - - """ + """Check if template is in allowed licenses or in licenses to skip.""" # the list_licenses are loaded in the __init__ # (not to load them multimple times) if template in self.list_licenses: @@ -1345,11 +1332,12 @@ def templateInList(self): """ + Check if template is in list. + The problem is the calls to the Mediawiki system because they can be pretty slow. While searching in a list of objects is really fast, so first of all let's see if we can find something in the info that we already have, then make a deeper check. - """ for template in self.licenses_found: result = self.miniTemplateCheck(template) @@ -1368,10 +1356,12 @@ continue def smartDetection(self): - """The bot instead of checking if there's a simple template in the + """ + Detect templates. + + The bot instead of checking if there's a simple template in the image's description, checks also if that template is a license or something else. In this sense this type of check is smart. - """ self.seems_ok = False self.license_found = None @@ -1522,9 +1512,10 @@ pywikibot.output('') def wait(self, waitTime, generator, normal, limit): - """ Skip the images uploaded before x seconds to let - the users to fix the image's problem alone in the - first x seconds. + """ + Skip the images uploaded before x seconds. + + Let the users to fix the image's problem alone in the first x seconds. """ imagesToSkip = 0 # if normal, we can take as many images as "limit" has told us, diff --git a/scripts/newitem.py b/scripts/newitem.py index f320e0e..acba3da 100644 --- a/scripts/newitem.py +++ b/scripts/newitem.py @@ -78,9 +78,8 @@ % (page, page.editTime().isoformat())) return - (revId, revTimestamp, revUser, - revComment) = page.getVersionHistory(reverseOrder=True, total=1)[0] - if revTimestamp > self.pageAgeBefore: + rev = page.getVersionHistory(reverseOrder=True, total=1)[0] + if rev.timestamp > self.pageAgeBefore: pywikibot.output( u'Page creation of %s on %s is too recent. Skipping.' % (page, page.editTime().isoformat())) -- To view, visit https://gerrit.wikimedia.org/r/168503 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9aa1372e7e6366e3dee454d069b742abbc372b64 Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Sysop and user tests - change (pywikibot/core)
by jenkins-bot (Code Review) 27 Oct '14

27 Oct '14

jenkins-bot has submitted this change and it was merged. Change subject: Sysop and user tests ...................................................................... Sysop and user tests Some tests require a user or sysop, but are not yet flagged as user=True. This changeset also adds a sysop flag, to identify tests which require a sysop account, skipping the test if this condition is not met. All tests except pwb.py-based tests can now be run without user-config.py, with tests skipping if they require a username. Change-Id: I690423556f1266f3ebe0bee11aa91b41b9965baf --- M tests/aspects.py M tests/page_tests.py M tests/script_tests.py M tests/site_tests.py 4 files changed, 100 insertions(+), 53 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index 0f3b9f1..3089fc3 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -204,12 +204,14 @@ user = True @classmethod - def require_site_user(cls): + def require_site_user(cls, family, code, sysop=False): """Check the user config has a valid login to the site.""" - if not cls.has_site_user(cls.family, cls.code): + if not cls.has_site_user(family, code, sysop=sysop): raise unittest.SkipTest( - '%s: No username for %s:%s' - % (cls.__name__, cls.family, cls.code)) + '%s: No %susername for %s:%s' + % (cls.__name__, + "sysop " if sysop else "", + family, code)) @classmethod def setUpClass(cls): @@ -221,14 +223,19 @@ """ super(RequireUserMixin, cls).setUpClass() - cls.require_site_user() + sysop = hasattr(cls, 'sysop') and cls.sysop - cls.site.login() + for site in cls.sites.values(): + cls.require_site_user(site['family'], site['code'], sysop) - if not cls.site.user(): - raise unittest.SkipTest( - '%s: Unable able to login to %s' - % cls.__name__, cls.site) + site['site'].login(sysop) + + if not site['site'].user(): + raise unittest.SkipTest( + '%s: Unable able to login to %s as %s' + % (cls.__name__, + 'sysop' if sysop else 'bot', + site['site'])) def setUp(self): """ @@ -237,9 +244,17 @@ Login to the site if it is not logged in. """ super(RequireUserMixin, self).setUp() - site = self.get_site() - if not site.logged_in(): - site.login() + + sysop = hasattr(self, 'sysop') and self.sysop + + # There may be many sites, and setUp doesnt know + # which site is to be tested; ensure they are all + # logged in. + for site in self.sites.values(): + site = site['site'] + + if not site.logged_in(sysop): + site.login(sysop) class MetaTestCaseClass(type): @@ -351,7 +366,7 @@ if 'write' in dct and dct['write']: bases = tuple([SiteWriteMixin] + list(bases)) - if 'user' in dct and dct['user']: + if ('user' in dct and dct['user']) or ('sysop' in dct and dct['sysop']): bases = tuple([RequireUserMixin] + list(bases)) for test in tests: @@ -449,15 +464,17 @@ return cls.sites[name]['site'] @classmethod - def has_site_user(cls, family, code): + def has_site_user(cls, family, code, sysop=False): """Check the user config has a user for the site.""" if not family: raise Exception('no family defined for %s' % cls.__name__) if not code: raise Exception('no site code defined for %s' % cls.__name__) - return code in config.usernames[family] or \ - '*' in config.usernames[family] + usernames = config.sysopnames if sysop else config.usernames + + return code in usernames[family] or \ + '*' in usernames[family] def __init__(self, *args, **kwargs): """Constructor.""" @@ -666,6 +683,11 @@ pwb = True spawn = True + # pywikibot.handleArgs currently instantiates a Site object + # and tries to fetch the users messages. + site = True + net = True + user = True class DeprecationTestCase(TestCase): diff --git a/tests/page_tests.py b/tests/page_tests.py index 3169d1e..98616e5 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -409,7 +409,6 @@ self.assertIsInstance(mainpage.editTime(), pywikibot.Timestamp) self.assertIsInstance(mainpage.previousRevision(), int) self.assertIsInstance(mainpage.permalink(), basestring) - self.assertIsInstance(mainpage.purge(), bool) def testIsDisambig(self): """Test the integration with Extension:Disambiguator.""" @@ -579,6 +578,18 @@ self.assertFalse(cat_not_hidden.isHiddenCategory()) +class TestPageUserAction(DefaultSiteTestCase): + + """Test page user actions.""" + + cached = True + user = True + + def test_purge(self): + mainpage = self.get_mainpage() + self.assertIsInstance(mainpage.purge(), bool) + + if __name__ == '__main__': try: unittest.main() diff --git a/tests/script_tests.py b/tests/script_tests.py index 5763c37..0cb3958 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -415,6 +415,7 @@ site = True def setUp(self): + super(TestScript, self).setUp() """Prepare the environment for running the pwb.py script.""" self.old_pywikibot_dir = None if 'PYWIKIBOT2_DIR' in os.environ: @@ -423,6 +424,7 @@ def tearDown(self): """Restore the environment after running the pwb.py script.""" + super(TestScript, self).tearDown() del os.environ['PYWIKIBOT2_DIR'] if self.old_pywikibot_dir: os.environ['PYWIKIBOT2_DIR'] = self.old_pywikibot_dir diff --git a/tests/site_tests.py b/tests/site_tests.py index 6c600c7..1e35899 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -144,11 +144,6 @@ self.assertFalse(mysite.isInterwikiLink("foo")) self.assertIsInstance(mysite.redirectRegex().pattern, basestring) self.assertIsInstance(mysite.category_on_one_line(), bool) - for grp in ("user", "autoconfirmed", "bot", "sysop", "nosuchgroup"): - self.assertIsInstance(mysite.has_group(grp), bool) - for rgt in ("read", "edit", "move", "delete", "rollback", "block", - "nosuchright"): - self.assertIsInstance(mysite.has_right(rgt), bool) def testConstructors(self): """Test cases for site constructors.""" @@ -223,21 +218,6 @@ self.assertIsInstance(mysite.logged_in(), bool) self.assertIsInstance(mysite.logged_in(True), bool) self.assertIsInstance(mysite.userinfo, dict) - self.assertIsInstance(mysite.is_blocked(), bool) - self.assertIsInstance(mysite.messages(), bool) - self.assertIsInstance(mysite.has_right("edit"), bool) - self.assertFalse(mysite.has_right("nonexistent_right")) - self.assertIsInstance(mysite.has_group("bots"), bool) - self.assertFalse(mysite.has_group("nonexistent_group")) - try: - self.assertIsInstance(mysite.is_blocked(True), bool) - self.assertIsInstance(mysite.has_right("edit", True), bool) - self.assertFalse(mysite.has_right("nonexistent_right", True)) - self.assertIsInstance(mysite.has_group("bots", True), bool) - self.assertFalse(mysite.has_group("nonexistent_group", True)) - except pywikibot.NoUsername: - pywikibot.warning( - "Cannot test Site methods for sysop; no sysop account configured.") for msg in ("1movedto2", "about", "aboutpage", "aboutsite", "accesskey-n-portal"): @@ -619,9 +599,9 @@ self.assertRaises(pywikibot.Error, mysite.blocks, starttime="2008-08-03T23:59:59Z", endtime="2008-08-03T00:00:01Z", reverse=True, total=5) - for block in mysite.blocks(users=mysite.user(), total=5): + for block in mysite.blocks(users='80.100.22.71', total=5): self.assertIsInstance(block, dict) - self.assertEqual(block['user'], mysite.user()) + self.assertEqual(block['user'], '80.100.22.71') def testExturlusage(self): """Test the site.exturlusage() method.""" @@ -712,6 +692,20 @@ """Test site method using a user.""" user = True + + def test_methods(self): + mysite = self.get_site() + self.assertIsInstance(mysite.is_blocked(), bool) + self.assertIsInstance(mysite.messages(), bool) + self.assertIsInstance(mysite.has_right("edit"), bool) + self.assertFalse(mysite.has_right("nonexistent_right")) + self.assertIsInstance(mysite.has_group("bots"), bool) + self.assertFalse(mysite.has_group("nonexistent_group")) + for grp in ("user", "autoconfirmed", "bot", "sysop", "nosuchgroup"): + self.assertIsInstance(mysite.has_group(grp), bool) + for rgt in ("read", "edit", "move", "delete", "rollback", "block", + "nosuchright"): + self.assertIsInstance(mysite.has_right(rgt), bool) def testLogEvents(self): """Test the site.logevents() method.""" @@ -1028,17 +1022,25 @@ for rev in mysite.watchlist_revs(showAnon=False, total=5): self.assertIsInstance(rev, dict) + +class SiteSysopTestCase(DefaultSiteTestCase): + + """Test site method using a sysop account.""" + + sysop = True + + def test_methods(self): + mysite = self.get_site() + self.assertIsInstance(mysite.is_blocked(True), bool) + self.assertIsInstance(mysite.has_right("edit", True), bool) + self.assertFalse(mysite.has_right("nonexistent_right", True)) + self.assertIsInstance(mysite.has_group("bots", True), bool) + self.assertFalse(mysite.has_group("nonexistent_group", True)) + def testDeletedrevs(self): """Test the site.deletedrevs() method.""" mysite = self.get_site() mainpage = self.get_mainpage() - if not mysite.logged_in(True): - try: - mysite.login(True) - except pywikibot.NoUsername: - pywikibot.warning( - "Cannot test Site.deleted_revs; no sysop account configured.") - return gen = mysite.deletedrevs(total=10, page=mainpage) for dr in gen: break @@ -1095,6 +1097,13 @@ page=mainpage, start="2008-09-03T23:59:59Z", end="2008-09-03T00:00:01Z", reverse=True, total=5) + + +class SiteUserTestCase2(DefaultSiteTestCase): + + """More tests that rely on a user account.""" + + user = True def testUsers(self): """Test the site.users() method.""" @@ -1503,20 +1512,23 @@ 'wikidatatest': { 'family': 'wikidata', 'code': 'test', + 'enabled': False, }, 'wikipediatest': { 'family': 'wikipedia', 'code': 'test', + 'enabled': True, } } - def test_is_uploaddisabled_wp(self): - site = self.get_site('wikipediatest') - self.assertFalse(site.is_uploaddisabled()) + user = True - def test_is_uploaddisabled_wd(self): - site = self.get_site('wikidatatest') - self.assertTrue(site.is_uploaddisabled()) + def test_is_uploaddisabled(self, key): + site = self.get_site(key) + if self.sites[key]['enabled']: + self.assertFalse(site.is_uploaddisabled()) + else: + self.assertTrue(site.is_uploaddisabled()) class TestDataSitePreloading(WikidataTestCase): -- To view, visit https://gerrit.wikimedia.org/r/168958 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I690423556f1266f3ebe0bee11aa91b41b9965baf Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] PEP257 tests/ - change (pywikibot/core)
by jenkins-bot (Code Review) 27 Oct '14

27 Oct '14

jenkins-bot has submitted this change and it was merged. Change subject: PEP257 tests/ ...................................................................... PEP257 tests/ Change-Id: I8a3254fc48090b50f68c89a81a7d35f29edb4d25 --- M tests/__init__.py M tests/data_ingestion_tests.py M tests/date_tests.py M tests/file_tests.py M tests/i18n/__init__.py M tests/i18n/test.py M tests/i18n_tests.py M tests/interwiki_link_tests.py M tests/ipregex_tests.py M tests/link_tests.py M tests/page_tests.py M tests/pagegenerators_tests.py M tests/pwb/print_locals.py M tests/pwb_tests.py M tests/site_tests.py M tests/textlib_tests.py M tests/timestripper_tests.py M tests/ui_tests.py M tests/weblib_tests.py M tests/wikibase_tests.py M tests/wikidataquery_tests.py M tests/xmlreader_tests.py M tox.ini 23 files changed, 159 insertions(+), 30 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/__init__.py b/tests/__init__.py index e2bdd7a..b903565 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +"""Package tests.""" # # (C) Pywikibot team, 2007-2014 # @@ -17,16 +18,16 @@ # - ordereddict is only needed as a fallback for python 2.6 # - mwparserfromhell is optional, so is only imported in textlib_tests try: - import httplib2 + import httplib2 # noqa except ImportError as e: print("ImportError: %s" % e) sys.exit(1) try: - from collections import OrderedDict + from collections import OrderedDict # noqa except ImportError: try: - from ordereddict import OrderedDict + from ordereddict import OrderedDict # noqa except ImportError as e: print("ImportError: %s" % e) if sys.version_info[0] == 2 and sys.version_info[1] == 6: @@ -191,6 +192,7 @@ """Add caching to every Request except logins.""" def __init__(self, *args, **kwargs): + """Constructor.""" super(TestRequest, self).__init__(0, *args, **kwargs) def _expired(self, dt): @@ -225,6 +227,7 @@ def patch_request(): + """Patch Request classes with TestRequest.""" global original_expired pywikibot.data.api.Request = TestRequest original_expired = pywikibot.data.api.CachedRequest._expired @@ -232,5 +235,6 @@ def unpatch_request(): + """Un-patch Request classes with TestRequest.""" pywikibot.data.api.Request = _original_Request pywikibot.data.api.CachedRequest._expired = original_expired diff --git a/tests/data_ingestion_tests.py b/tests/data_ingestion_tests.py index 7586528..deec8a1 100644 --- a/tests/data_ingestion_tests.py +++ b/tests/data_ingestion_tests.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -"""Unit tests for data_ingestion.py""" +"""Unit tests for data_ingestion.py script.""" __version__ = '$Id$' import os @@ -11,6 +11,8 @@ class TestPhoto(TestCase): + + """Test Photo class.""" net = True @@ -50,6 +52,8 @@ class TestCSVReader(TestCase): + """Test CSVReader class.""" + net = False def setUp(self): diff --git a/tests/date_tests.py b/tests/date_tests.py index 5d26688..8c236f3 100644 --- a/tests/date_tests.py +++ b/tests/date_tests.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +"""Tests for the date module.""" # # (C) Pywikibot team, 2014 # @@ -12,10 +13,10 @@ class TestDateMeta(MetaTestCaseClass): - """Test meta class""" + """Date test meta class.""" def __new__(cls, name, bases, dct): - """Create the new class""" + """Create the new class.""" def test_method(formatname): def testMapEntry(self): diff --git a/tests/file_tests.py b/tests/file_tests.py index 8f204bd..f8a7c14 100644 --- a/tests/file_tests.py +++ b/tests/file_tests.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +"""FilePage tests.""" # # (C) Pywikibot team, 2014 # @@ -13,6 +14,8 @@ class TestShareFiles(TestCase): + """Test methods fileIsShared, exists and fileUrl with shared files.""" + sites = { 'enwiki': { 'family': 'wikipedia', diff --git a/tests/i18n/__init__.py b/tests/i18n/__init__.py index e69de29..66f0234 100644 --- a/tests/i18n/__init__.py +++ b/tests/i18n/__init__.py @@ -0,0 +1 @@ +""" Test i18n data package. """ diff --git a/tests/i18n/test.py b/tests/i18n/test.py index 048b063..b2585f7 100644 --- a/tests/i18n/test.py +++ b/tests/i18n/test.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +""" Test i18n data. """ msg = { 'de': { 'test-plural': u'Bot: Ändere %(num)d {{PLURAL:num|Seite|Seiten}}.', diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 39c9ef2..63b18dc 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +"""Test i18n module.""" # # (C) Pywikibot team, 2007-2014 # @@ -12,6 +13,8 @@ class TestTranslate(TestCase): + + """Test translate method.""" net = False @@ -75,6 +78,8 @@ class TestTWN(TestCase): + """Base class for TranslateWiki tests.""" + net = False def setUp(self): @@ -88,6 +93,8 @@ class TestTWTranslate(TestTWN): + + """Test twtranslate method.""" def testLocalized(self): self.assertEqual(i18n.twtranslate('en', 'test-localized'), @@ -231,7 +238,7 @@ u'Bot: Ändere dreihunderteinundzwanzig Zeilen von mehreren Seiten.') def testMultipleNonNumbers(self): - """Numbers or string numbers are required for tuple or list items.""" + """Test error handling for multiple non-numbers.""" with self.assertRaisesRegex(ValueError, "invalid literal for int with base 10: 'drei'"): self.assertEqual( i18n.twntranslate('de', 'test-multiple-plurals', ["drei", "1", 1]) diff --git a/tests/interwiki_link_tests.py b/tests/interwiki_link_tests.py index 2b34015..61e8ae4 100644 --- a/tests/interwiki_link_tests.py +++ b/tests/interwiki_link_tests.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +"""Test Interwiki Link functionality.""" # # (C) Pywikipedia bot team, 2014 # @@ -14,6 +15,8 @@ class TestPartiallyQualifiedLinkDifferentCodeParser(TestCase): + """Tests for interwiki links to local sites.""" + family = 'wikipedia' code = 'en' cached = True diff --git a/tests/ipregex_tests.py b/tests/ipregex_tests.py index 0498561..cf61a19 100644 --- a/tests/ipregex_tests.py +++ b/tests/ipregex_tests.py @@ -1,4 +1,5 @@ #!/usr/bin/python +"""Test IP regex.""" # -*- coding: utf-8 -*- # # (C) Pywikibot team, 2014 diff --git a/tests/link_tests.py b/tests/link_tests.py index b1ca6d0..0e37551 100644 --- a/tests/link_tests.py +++ b/tests/link_tests.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +"""Test Link functionality.""" # # (C) Pywikipedia bot team, 2014 # @@ -16,6 +17,8 @@ class TestPartiallyQualifiedExplicitLinkSameSiteParser(TestCase): + + """Link tests.""" family = 'wikipedia' code = 'en' @@ -72,6 +75,8 @@ class TestPartiallyQualifiedExplicitLinkDifferentCodeParser(TestCase): + """Link tests.""" + family = 'wikipedia' code = 'en' cached = True @@ -106,6 +111,8 @@ class TestPartiallyQualifiedExplicitLinkDifferentFamilyParser(TestCase): + + """Link tests.""" family = 'wikipedia' code = 'en' @@ -142,6 +149,8 @@ class TestFullyQualifiedSameNamespaceFamilyParser(TestCase): + """Link tests.""" + family = 'wikipedia' code = 'en' cached = True @@ -163,6 +172,8 @@ class TestFullyQualifiedExplicitLinkSameFamilyParser(TestCase): + + """Link tests.""" family = 'wikipedia' code = 'en' @@ -190,6 +201,8 @@ class TestFullyQualifiedExplicitLinkDifferentFamilyParser(TestCase): + + """Link tests.""" sites = { 'enws': { @@ -246,6 +259,8 @@ class TestFullyQualifiedExplicitLinkNoLangConfigFamilyParser(TestCase): + """Link tests.""" + sites = { 'wikidata': { 'family': 'wikidata', @@ -300,6 +315,8 @@ class TestFullyQualifiedNoLangFamilyExplicitLinkParser(TestCase): + + """Link tests.""" sites = { 'wikidata': { @@ -360,6 +377,8 @@ class TestFullyQualifiedOneSiteFamilyExplicitLinkParser(TestCase): + """Link tests.""" + family = 'species' code = 'species' cached = True @@ -389,6 +408,8 @@ class TestPartiallyQualifiedImplicitLinkSameSiteParser(TestCase): + + """Link tests.""" family = 'wikipedia' code = 'en' @@ -445,6 +466,8 @@ class TestPartiallyQualifiedImplicitLinkDifferentCodeParser(TestCase): + """Link tests.""" + family = 'wikipedia' code = 'en' cached = True @@ -479,6 +502,8 @@ class TestPartiallyQualifiedImplicitLinkDifferentFamilyParser(TestCase): + + """Link tests.""" family = 'wikipedia' code = 'en' @@ -515,6 +540,8 @@ class TestFullyQualifiedImplicitLinkSameFamilyParser(TestCase): + """Link tests.""" + family = 'wikipedia' code = 'en' cached = True @@ -541,6 +568,8 @@ class TestFullyQualifiedImplicitLinkDifferentFamilyParser(TestCase): + + """Link tests.""" sites = { 'enws': { @@ -597,6 +626,8 @@ class TestFullyQualifiedImplicitLinkNoLangConfigFamilyParser(TestCase): + """Link tests.""" + sites = { 'wikidata': { 'family': 'wikidata', @@ -652,6 +683,8 @@ class TestFullyQualifiedNoLangFamilyImplicitLinkParser(TestCase): + """Link tests.""" + family = 'wikidata' code = 'test' cached = True @@ -699,6 +732,8 @@ class TestFullyQualifiedOneSiteFamilyImplicitLinkParser(TestCase): + """Link tests.""" + family = 'species' code = 'species' cached = True diff --git a/tests/page_tests.py b/tests/page_tests.py index 54355cf..3169d1e 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -160,6 +160,8 @@ class TestPageObjectEnglish(TestCase): + """Test Page Object using English Wikipedia.""" + family = 'wikipedia' code = 'en' @@ -252,6 +254,8 @@ class TestPageObject(DefaultSiteTestCase): + + """Test Page object.""" cached = True @@ -524,6 +528,8 @@ class TestPageRedirects(TestCase): + """Test redirects.""" + family = 'wikipedia' code = 'en' @@ -550,6 +556,8 @@ class TestCategoryObject(TestCase): + """Test Category object.""" + family = 'wikipedia' code = 'en' diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index f7f372c..44a99cd 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -1,5 +1,6 @@ #!/usr/bin/python # -*- coding: utf-8 -*- +"""Test pagegenerators module.""" # # (C) Pywikibot team, 2014 # diff --git a/tests/pwb/print_locals.py b/tests/pwb/print_locals.py index ea04770..3f94864 100644 --- a/tests/pwb/print_locals.py +++ b/tests/pwb/print_locals.py @@ -1,4 +1,4 @@ -"""docstring""" +"""Script that forms part of pwb_tests.""" for k, v in locals().copy().items(): print("%r: %r" % (k, v)) diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index 109505e..883d4f4 100644 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +"""Test pwb.py.""" # # (C) Pywikibot team, 2007-2014 # @@ -20,6 +21,7 @@ def check_output(command): + """Execute and return the output of a command.""" return subprocess.Popen(command, stdout=subprocess.PIPE).communicate()[0] diff --git a/tests/site_tests.py b/tests/site_tests.py index 9765017..6c600c7 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -1451,6 +1451,8 @@ class TestWiktionarySite(TestCase): + """Test Site Object on English Wiktionary.""" + family = 'wiktionary' code = 'en' @@ -1466,6 +1468,8 @@ class TestNonEnglishWikipediaSite(TestCase): + + """Test Site Object on Nynorsk Wikipedia.""" family = 'wikipedia' code = 'nn' @@ -1493,6 +1497,8 @@ class TestUploadEnabledSite(TestCase): + """Test Site.is_uploaddisabled.""" + sites = { 'wikidatatest': { 'family': 'wikidata', diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index d5547a7..a549035 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +"""Test textlib module.""" # # (C) Pywikibot team, 2007-2014 # @@ -29,6 +30,8 @@ class TestSectionFunctions(TestCase): + + """Test wikitext section handling function.""" net = False @@ -95,6 +98,8 @@ class TestFormatFunctions(TestCase): + """Test format functions.""" + family = 'wikipedia' code = 'en' @@ -142,8 +147,9 @@ class TestCategoryRearrangement(TestCase): """ - Tests to ensure that sorting keys are not being lost when - using .getCategoryLinks() and .replaceCategoryLinks(), + Ensure that sorting keys are not being lost. + + Tests .getCategoryLinks() and .replaceCategoryLinks(), with both a newline and an empty string as separators. """ diff --git a/tests/timestripper_tests.py b/tests/timestripper_tests.py index 6c31248..54af2a0 100644 --- a/tests/timestripper_tests.py +++ b/tests/timestripper_tests.py @@ -23,6 +23,7 @@ cached = True def setUp(self): + """Set up test cases.""" super(TestTimeStripperWithNoDigitsAsMonths, self).setUp() self.ts = TimeStripper(self.get_site()) @@ -86,7 +87,7 @@ class TestTimeStripperWithDigitsAsMonths(TestCase): - """Test cases for TimeStripper methods""" + """Test cases for TimeStripper methods.""" family = 'wikipedia' code = 'cs' @@ -125,7 +126,7 @@ class TestTimeStripperLanguage(TestCase): - """Test cases for English language""" + """Test cases for English language.""" sites = { 'cswiki': { diff --git a/tests/ui_tests.py b/tests/ui_tests.py index eb2655e..e5a053e 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -40,16 +40,19 @@ import threading class pywikibotWrapper(object): + + """pywikibot wrapper class.""" + def init(self): - import pywikibot + import pywikibot # noqa pywikibot.version._get_program_dir() def output(self, *args, **kwargs): - import pywikibot + import pywikibot # noqa return pywikibot.output(*args, **kwargs) def request_input(self, *args, **kwargs): - import pywikibot + import pywikibot # noqa self.input = None def threadedinput(): @@ -62,17 +65,20 @@ return self.input def set_config(self, key, value): - import pywikibot + import pywikibot # noqa setattr(pywikibot.config, key, value) def set_ui(self, key, value): - import pywikibot + import pywikibot # noqa setattr(pywikibot.ui, key, value) def cls(self): os.system('cls') class pywikibotManager(BaseManager): + + """pywikibot manager class.""" + pass pywikibotManager.register('pywikibot', pywikibotWrapper) @@ -91,11 +97,13 @@ newstdin = StringIO() def patch(): + """Patch standard terminal files.""" sys.stdout = newstdout sys.stderr = newstderr sys.stdin = newstdin def unpatch(): + """un-patch standard terminal files.""" sys.stdout = oldstdout sys.stderr = oldstderr sys.stdin = oldstdin @@ -115,6 +123,9 @@ 'newline': "\n"} class UITestCase(unittest.TestCase): + + """UI tests.""" + def setUp(self): patch() newstdout.truncate(0) @@ -130,6 +141,9 @@ unpatch() class TestTerminalOutput(UITestCase): + + """Terminal output tests.""" + def testOutputLevels_logging_debug(self): logger.log(DEBUG, 'debug', extra=loggingcontext) self.assertEqual(newstdout.getvalue(), "") @@ -232,6 +246,9 @@ self.assertNotEqual(stderrlines[-1], "\n") class TestTerminalInput(UITestCase): + + """Terminal input tests.""" + def testInput(self): newstdin.write("input to read\n") newstdin.seek(0) @@ -295,6 +312,9 @@ @unittest.skipUnless(os.name == "posix", "requires Unix console") class TestTerminalOutputColorUnix(UITestCase): + + """Terminal output color tests.""" + def testOutputColorizedText(self): pywikibot.output(u"normal text \03{lightpurple}light purple text\03{default} normal text") self.assertEqual(newstdout.getvalue(), "") @@ -313,13 +333,16 @@ self.assertEqual(newstderr.getvalue(), "normal text \x1b[35;1m light purple \x1b[94;1m light blue \x1b[35;1m light purple \x1b[0m normal text\n\x1b[0m") def testOutputColorCascade_incorrect(self): - ''' This test documents current (incorrect) behavior ''' + """ Test incorrect behavior of testOutputColorCascade. """ pywikibot.output(u"normal text \03{lightpurple} light purple \03{lightblue} light blue \03{default} light purple \03{default} normal text") self.assertEqual(newstdout.getvalue(), "") self.assertEqual(newstderr.getvalue(), "normal text \x1b[35;1m light purple \x1b[94;1m light blue \x1b[0m light purple \x1b[0m normal text\n\x1b[0m") @unittest.skipUnless(os.name == "posix", "requires Unix console") class TestTerminalUnicodeUnix(UITestCase): + + """Terminal output tests for unix.""" + def testOutputUnicodeText(self): pywikibot.output(u"Заглавная_страница") self.assertEqual(newstdout.getvalue(), "") @@ -339,6 +362,9 @@ @unittest.skipUnless(os.name == "posix", "requires Unix console") class TestTransliterationUnix(UITestCase): + + """Terminal output transliteration tests.""" + def testOutputTransliteratedUnicodeText(self): pywikibot.ui.encoding = 'latin-1' pywikibot.config.transliterate = True @@ -348,6 +374,9 @@ @unittest.skipUnless(os.name == "nt", "requires Windows console") class WindowsTerminalTestCase(UITestCase): + + """MS Windows terminal tests.""" + @classmethod def setUpProcess(cls, command): import pywinauto @@ -412,6 +441,9 @@ self._app.window_().TypeKeys('% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{ENTER}', with_spaces=True) class TestWindowsTerminalUnicode(WindowsTerminalTestCase): + + """MS Windows terminal unicode tests.""" + @classmethod def setUpClass(cls): import inspect @@ -458,6 +490,9 @@ self.assertEqual(returned, u"Заглавная_страница") class TestWindowsTerminalUnicodeArguments(WindowsTerminalTestCase): + + """MS Windows terminal unicode argument tests.""" + @classmethod def setUpClass(cls): cls.setUpProcess(["cmd", "/k", "echo off"]) @@ -488,6 +523,9 @@ else: class TestTerminalUI(unittest.TestCase): + + """Class to show all tests skipped under unittest.""" + @unittest.skip("Terminal UI tests can only be run by directly running tests/ui_tests.py") def testCannotBeRun(self): pass diff --git a/tests/weblib_tests.py b/tests/weblib_tests.py index 5a00dd0..14e338a 100644 --- a/tests/weblib_tests.py +++ b/tests/weblib_tests.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +"""Weblib test module.""" # # (C) Pywikibot team, 2014 # @@ -19,6 +20,8 @@ class TestArchiveSites(TestCase): + """Test weblib methods to access archive websites.""" + net = True @classmethod diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 4c6d932..d78bf9b 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -23,6 +23,7 @@ # fetch a page which is very likely to be unconnected, which doesnt have # a generator, and unit tests may be used to test old versions of pywikibot def _get_test_unconnected_page(site): + """Get unconnected page from site for tests.""" gen = pagegenerators.NewpagesPageGenerator(site=site, total=10, namespaces=[1, ]) for page in gen: @@ -31,6 +32,8 @@ class TestGeneral(WikidataTestCase): + + """General Wikibase tests.""" @classmethod def setUpClass(cls): @@ -443,6 +446,8 @@ class TestPropertyPage(WikidataTestCase): + """Test PropertyPage.""" + def test_property_empty_property(self): """Test creating a PropertyPage without a title.""" wikidata = self.get_repo() @@ -482,6 +487,8 @@ class TestClaimSetValue(WikidataTestCase): + + """Test setting claim values.""" def test_set_website(self): wikidata = self.get_repo() @@ -817,6 +824,8 @@ class TestOwnClient(TestCase): + """Test that a data repository family can be its own client.""" + sites = { # The main Wikidata is its own client. 'wikidata': { diff --git a/tests/wikidataquery_tests.py b/tests/wikidataquery_tests.py index ecfe70a..4c3b018 100644 --- a/tests/wikidataquery_tests.py +++ b/tests/wikidataquery_tests.py @@ -21,9 +21,7 @@ class TestApiFunctions(WikidataTestCase): - def setUp(self): - super(TestApiFunctions, self).setUp() - self.repo = self.get_repo() + """Test WikiDataQuery API functions.""" def testQueries(self): """ @@ -93,7 +91,7 @@ self.assertEqual(str(q), "claim[99:(tree[1][2,5][3,90])]") def testQueriesWDStructures(self): - """Queries using Wikibase page structures like ItemPage.""" + """Test queries using Wikibase page structures like ItemPage.""" q = query.HasClaim(PropertyPage(self.repo, "P99")) self.assertEqual(str(q), "claim[99]") @@ -217,6 +215,8 @@ class TestApiSlowFunctions(TestCase): + """Test slow WikiDataQuery API functions.""" + net = True def testQueryApiGetter(self): diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py index 292be70..8399d0a 100644 --- a/tests/xmlreader_tests.py +++ b/tests/xmlreader_tests.py @@ -16,6 +16,8 @@ class XmlReaderTestCase(TestCase): + """XML Reader test cases.""" + net = False def test_XmlDumpAllRevs(self): diff --git a/tox.ini b/tox.ini index b422aad..1e394e9 100644 --- a/tox.ini +++ b/tox.ini @@ -100,15 +100,8 @@ ./scripts/watchlist.py \ ./scripts/weblinkchecker.py \ ./scripts/welcome.py \ - ./tests/aspects.py \ - ./tests/deprecation_tests.py \ - ./tests/api_tests.py \ - ./tests/dry_api_tests.py \ - ./tests/dry_site_tests.py \ - ./tests/family_tests.py \ - ./tests/http_tests.py \ ./scripts/maintenance/cache.py \ - ./tests/upload_tests.py + ./tests/ deps = flake8>=2.2.5 flake8-docstrings -- To view, visit https://gerrit.wikimedia.org/r/167192 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a3254fc48090b50f68c89a81a7d35f29edb4d25 Gerrit-PatchSet: 7 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [FEAT/FIX] Use input_choice or new input_yn - change (pywikibot/core)
by jenkins-bot (Code Review) 27 Oct '14

27 Oct '14

jenkins-bot has submitted this change and it was merged. Change subject: [FEAT/FIX] Use input_choice or new input_yn ...................................................................... [FEAT/FIX] Use input_choice or new input_yn As inputChoice has been deprecated this updates all references to the replacement (input_choice). Also added input_yn which is like input_choice but returns a boolean and automatically sets the answers to [y]es and [n]o. Change-Id: Ib68e66a60e5bc5a78602253123312a380109657d --- M generate_user_files.py M pywikibot/__init__.py M pywikibot/bot.py M pywikibot/diff.py M pywikibot/page.py M scripts/add_text.py M scripts/basic.py M scripts/blockpageschecker.py M scripts/blockreview.py M scripts/capitalize_redirects.py M scripts/casechecker.py M scripts/cosmetic_changes.py M scripts/interwiki.py M scripts/maintenance/compat2core.py M scripts/movepages.py M scripts/nowcommons.py M scripts/protect.py M scripts/selflink.py M scripts/solve_disambiguation.py M scripts/spamremove.py M scripts/template.py M scripts/templatecount.py M scripts/unlink.py M scripts/upload.py M scripts/welcome.py 25 files changed, 199 insertions(+), 208 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_user_files.py b/generate_user_files.py index 8a99806..ea6915a 100644 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -98,7 +98,7 @@ set environment variables.""" % locals(), width=76) for line in msg: pywikibot.output(line) - if pywikibot.inputChoice("Is this OK?", ["yes", "no"], ["y", "n"], "n") == "y": + if pywikibot.input_yn('Is this OK?', default=False, automatic_quit=False): return new_base pywikibot.output("Aborting changes.") return False @@ -170,10 +170,10 @@ while not mylang: mylang = pywikibot.input(message) or default_lang if known_langs and mylang and mylang not in known_langs: - if pywikibot.inputChoice("The language code {0} is not in the " - "list of known languages. Do you want to " - "continue?".format(mylang), - ["yes", "no"], ["y", "n"], "n") == "n": + if not pywikibot.input_yn("The language code {0} is not in the " + "list of known languages. Do you want " + "to continue?".format(mylang), + default=False, automatic_quit=False): mylang = None username = None @@ -250,8 +250,8 @@ main_family, main_lang, main_username = get_site_and_lang() usernames = [(main_family, main_lang, main_username)] - while pywikibot.inputChoice("Do you want to add any other projects?", - ["yes", "no"], ["y", "n"], "n") == "y": + while pywikibot.input_yn("Do you want to add any other projects?", + default=False, automatic_quit=False): usernames += [get_site_and_lang(main_family, main_lang, main_username)] @@ -259,9 +259,9 @@ u"usernames['{0}']['{1}'] = u'{2}'".format(*username) for username in usernames) - extended = pywikibot.inputChoice( - "Which variant of user_config.py?", - ["small", "extended (with further information)"], ["s", "e"]) == "e" + extended = pywikibot.input_yn("Would you like the extended version of " + "user-config.py, with explanations " + "included?", automatic_quit=False) if extended: # config2.py will be in the pywikibot/ directory relative to this @@ -321,8 +321,8 @@ if __name__ == "__main__": while True: pywikibot.output(u'\nYour default user directory is "%s"' % base_dir) - if pywikibot.inputChoice("How to proceed?", ["keep", "change"], - ["k", "c"], "k") == "c": + if pywikibot.input_yn("Do you want to use that directory?", + default=False, automatic_quit=False): new_base = change_base_dir() if new_base: base_dir = new_base @@ -335,9 +335,10 @@ while True: if os.path.exists(os.path.join(base_dir, "user-config.py")): break - if pywikibot.inputChoice( + if pywikibot.input_yn( "Do you want to copy user files from an existing Pywikibot " - "installation?", ["yes", "no"], ["y", "n"]) == "y": + "installation?", + automatic_quit=False): oldpath = pywikibot.input("Path to existing user-config.py?") if not os.path.exists(oldpath): pywikibot.error("Not a valid path") @@ -361,16 +362,16 @@ else: break if not os.path.isfile(os.path.join(base_dir, "user-config.py")): - if pywikibot.inputChoice("Create user-config.py file? Required for " - "running bots.", - ["yes", "no"], ["y", "n"], "n") == "y": + if pywikibot.input_yn('Create user-config.py file? Required for ' + 'running bots.', + default=False, automatic_quit=False): create_user_config() elif not copied_config: pywikibot.output("user-config.py already exists in the directory") if not os.path.isfile(os.path.join(base_dir, "user-fixes.py")): - if pywikibot.inputChoice("Create user-fixes.py file? Optional and for " - "advanced users.", - ["yes", "no"], ["y", "n"], "n") == "y": + if pywikibot.input_yn('Create user-fixes.py file? Optional and for ' + 'advanced users.', + default=False, automatic_quit=False): create_user_fixes() elif not copied_fixes: pywikibot.output("user-fixes.py already exists in the directory") diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index ad0c475..a007c9a 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -29,7 +29,7 @@ from pywikibot import config2 as config from pywikibot.bot import ( output, warning, error, critical, debug, stdout, exception, - input, input_choice, inputChoice, handle_args, showHelp, ui, log, + input, input_choice, input_yn, inputChoice, handle_args, showHelp, ui, log, calledModuleName, Bot, WikidataBot, QuitKeyboardInterrupt, # the following are flagged as deprecated on usage handleArgs, @@ -68,7 +68,7 @@ 'ItemPage', 'PropertyPage', 'Claim', 'TimeStripper', 'html2unicode', 'url2unicode', 'unicode2html', 'stdout', 'output', 'warning', 'error', 'critical', 'debug', - 'exception', 'input_choice', 'input', 'inputChoice', + 'exception', 'input_choice', 'input', 'input_yn', 'inputChoice', 'handle_args', 'handleArgs', 'showHelp', 'ui', 'log', 'calledModuleName', 'Bot', 'WikidataBot', 'Error', 'InvalidTitle', 'BadTitle', 'NoPage', 'SectionError', @@ -699,11 +699,9 @@ try: _putthread.join(1) except KeyboardInterrupt: - answer = inputChoice(u"""\ -There are %i pages remaining in the queue. Estimated time remaining: %s -Really exit?""" % remaining(), - ['yes', 'no'], ['y', 'N'], 'N') - if answer == 'y': + if input_yn('There are %i pages remaining in the queue. ' + 'Estimated time remaining: %s\nReally exit?' + % remaining(), default=False, automatic_quit=False): return # only need one drop() call because all throttles use the same global pid diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 89ed75d..caafaca 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -516,6 +516,8 @@ """ Ask the user the question and return one of the valid answers. + @param question: The question asked without trailing spaces. + @type answers: basestring @param answers: The valid answers each containing a full length answer and a shortcut. Each value must be unique. @type answers: Iterable containing an iterable of length two @@ -527,7 +529,7 @@ returned. @type return_shortcut: bool @param automatic_quit: Adds the option 'Quit' ('q') and throw a - L{QuitKeyboardInterrupt} if selected (default). + L{QuitKeyboardInterrupt} if selected. @type automatic_quit: bool @return: The selected answer shortcut or index. Is -1 if the default is selected, it does not return the shortcut and the default is not a @@ -542,6 +544,34 @@ automatic_quit) +def input_yn(question, default=None, automatic_quit=True): + """ + Ask the user a yes/no question and returns the answer as a bool. + + @param question: The question asked without trailing spaces. + @type answers: basestring + @param default: The result if no answer was entered. It must be a bool or + 'y' or 'n' and can be disabled by setting it to None. + @type default: basestring or bool + @param automatic_quit: Adds the option 'Quit' ('q') and throw a + L{QuitKeyboardInterrupt} if selected. + @type automatic_quit: bool + @return: Return True if the user selected yes and False if the user + selected no. If the default is not None it'll return True if default + is True or 'y' and False if default is False or 'n'. + @rtype: bool + """ + if default not in ['y', 'Y', 'n', 'N']: + if default: + default = 'y' + elif default is not None: + default = 'n' + assert default in ['y', 'Y', 'n', 'N', None] + + return input_choice(question, [('Yes', 'y'), ('No', 'n')], default, + automatic_quit=automatic_quit) == 'y' + + @deprecated('input_choice') def inputChoice(question, answers, hotkeys, default=None): """Ask the user a question with several options, return the user's choice. diff --git a/pywikibot/diff.py b/pywikibot/diff.py index 346fcba..7ac30dc 100644 --- a/pywikibot/diff.py +++ b/pywikibot/diff.py @@ -245,8 +245,8 @@ ] question = 'Accept this hunk?' - answers = ['yes', 'no', 'stop', 'all', 'review', 'help'] - hotkeys = ['y', 'n', 's', 'a', 'r', 'h'] + answers = [('yes', 'y'), ('no', 'n'), ('stop', 's'), ('all', 'a'), + ('review', 'r'), ('help', 'h')] actions = {'y': Hunk.APPR, 'n': Hunk.NOT_APPR, 's': Hunk.NOT_APPR, @@ -261,7 +261,8 @@ hunk = pending.pop(0) pywikibot.output(hunk.header + hunk.diff_text) - choice = pywikibot.inputChoice(question, answers, hotkeys, default='r') + choice = pywikibot.input_choice(question, answers, default='r', + automatic_quit=False) if choice in actions.keys(): hunk.reviewed = actions[choice] diff --git a/pywikibot/page.py b/pywikibot/page.py index 2c3db36..e3d0755 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1476,12 +1476,11 @@ if self.site.username(sysop=True): answer = u'y' if prompt and not hasattr(self.site, '_noDeletePrompt'): - answer = pywikibot.inputChoice( + answer = pywikibot.input_choice( u'Do you want to delete %s?' % self.title( asLink=True, forceInterwiki=True), - ['Yes', 'No', 'All'], - ['y', 'n', 'a'], - 'n') + [('Yes', 'y'), ('No', 'n'), ('All', 'a')], + 'n', automatic_quit=False) if answer == 'a': answer = 'y' self.site._noDeletePrompt = True @@ -1491,13 +1490,12 @@ if mark or hasattr(self.site, '_noMarkDeletePrompt'): answer = 'y' else: - answer = pywikibot.inputChoice( + answer = pywikibot.input_choice( u"Can't delete %s; do you want to mark it " "for deletion instead?" % self.title(asLink=True, forceInterwiki=True), - ['Yes', 'No', 'All'], - ['y', 'n', 'a'], - 'n') + [('Yes', 'y'), ('No', 'n'), ('All', 'a')], + 'n', automatic_quit=False) if answer == 'a': answer = 'y' self.site._noMarkDeletePrompt = True @@ -1651,12 +1649,11 @@ pywikibot.bot.warning(u'"prompt" argument of protect() is ' 'deprecated') if prompt and not hasattr(self.site, '_noProtectPrompt'): - answer = pywikibot.inputChoice( + answer = pywikibot.input_choice( u'Do you want to change the protection level of %s?' % self.title(asLink=True, forceInterwiki=True), - ['Yes', 'No', 'All'], - ['y', 'N', 'a'], - 'N') + [('Yes', 'y'), ('No', 'n'), ('All', 'a')], + 'n', automatic_quit=False) if answer == 'a': answer = 'y' self.site._noProtectPrompt = True diff --git a/scripts/add_text.py b/scripts/add_text.py index 8979dba..d90e0cd 100644 --- a/scripts/add_text.py +++ b/scripts/add_text.py @@ -222,10 +222,10 @@ # text in the page if putText: if not always: - choice = pywikibot.inputChoice( + choice = pywikibot.input_choice( u'Do you want to accept these changes?', - ['Yes', 'No', 'All', 'open in Browser'], - ['y', 'n', 'a', 'b'], 'n') + [('Yes', 'y'), ('No', 'n'), ('All', 'a'), + ('open in Browser', 'b')], 'n', automatic_quit=False) if choice == 'a': always = True elif choice == 'n': diff --git a/scripts/basic.py b/scripts/basic.py index c1af240..9c315ea 100755 --- a/scripts/basic.py +++ b/scripts/basic.py @@ -111,10 +111,9 @@ pywikibot.showDiff(page.get(), text) pywikibot.output(u'Comment: %s' % comment) if not self.dry: - choice = pywikibot.inputChoice( - u'Do you want to accept these changes?', - ['Yes', 'No'], ['y', 'N'], 'N') - if choice == 'y': + if pywikibot.input_yn( + u'Do you want to accept these changes?', + default=False, automatic_quit=False): try: page.text = text # Save the page diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py index fd548af..52fd2fb 100755 --- a/scripts/blockpageschecker.py +++ b/scripts/blockpageschecker.py @@ -189,9 +189,10 @@ def showQuest(page): - quest = pywikibot.inputChoice(u'Do you want to open the page?', - ['with browser', 'with gui', 'no'], - ['b', 'g', 'n'], 'n') + quest = pywikibot.input_choice( + u'Do you want to open the page?', + [('with browser', 'b'), ('with gui', 'g'), ('no', 'n')], 'n', + automatic_quit=False) site = page.site url = '%s://%s%s?redirect=no' % (site.protocol(), site.hostname(), @@ -452,10 +453,10 @@ % page.title()) pywikibot.showDiff(oldtext, text) if not always: - choice = pywikibot.inputChoice(u'Do you want to accept these ' - u'changes?', - ['Yes', 'No', 'All'], - ['y', 'N', 'a'], 'N') + choice = pywikibot.input_choice(u'Do you want to accept these ' + u'changes?', + [('Yes', 'y'), ('No', 'n'), + ('All', 'a')], 'n') if choice == 'a': always = True if always or choice == 'y': diff --git a/scripts/blockreview.py b/scripts/blockreview.py index f3f9c98..9abbe12 100644 --- a/scripts/blockreview.py +++ b/scripts/blockreview.py @@ -279,10 +279,9 @@ pywikibot.showDiff(page.get(), text) pywikibot.output(u'Comment: %s' % comment) if not self.dry: - choice = pywikibot.inputChoice( - u'Do you want to accept these changes?', - ['Yes', 'No'], ['y', 'N'], 'N') - if choice == 'y': + if pywikibot.input_yn( + u'Do you want to accept these changes?', + default=False, automatic_quit=False): page.text = text try: # Save the page diff --git a/scripts/capitalize_redirects.py b/scripts/capitalize_redirects.py index d646b38..d74921c 100644 --- a/scripts/capitalize_redirects.py +++ b/scripts/capitalize_redirects.py @@ -66,13 +66,11 @@ pywikibot.output(u'%s doesn\'t exist' % page_cap.title(asLink=True)) if not self.getOption('always'): - choice = pywikibot.inputChoice( + choice = pywikibot.input_choice( u'Do you want to create a redirect?', - ['Yes', 'No', 'All', 'Quit'], ['y', 'N', 'a', 'q'], 'N') + [('Yes', 'y'), ('No', 'n'), ('All', 'a')], 'n') if choice == 'a': self.options['always'] = True - elif choice == 'q': - self.quit() if self.getOption('always') or choice == 'y': comment = i18n.twtranslate( page.site, diff --git a/scripts/casechecker.py b/scripts/casechecker.py index 7d0c4da..8bc2b23 100644 --- a/scripts/casechecker.py +++ b/scripts/casechecker.py @@ -380,10 +380,9 @@ if self.replace: if len(err[1]) == 1: newTitle = err[1][0] -## choice = pywikibot.inputChoice(u'Move %s to %s?' -## % (title, newTitle), -## ['Yes', 'No'], -## ['y', 'n']) +## choice = pywikibot.input_yn(u'Move %s to %s?' +## % (title, newTitle), +## automatic_quit=False) editSummary = i18n.twtranslate( self.site, "casechecker-rename") dst = self.Page(newTitle) @@ -680,12 +679,10 @@ msg = u'page exists' self.ColorCodeWord(u' %d: %s (%s)\n' % (count, t, msg), True) count += 1 - answers = [str(i) for i in xrange(0, count)] - choice = int(pywikibot.inputChoice( - u'Which link to choose? (0 to skip)', - answers, [a[0] for a in answers])) - if choice > 0: - return candidates[choice - 1] + answers = [('skip', 's')] + [(str(i), i) for i in range(1, count)] + choice = pywikibot.input_choice(u'Which link to choose?', answers) + if choice != 's': + return candidates[int(choice) - 1] def ColorCodeWord(self, word, toScreen=False): if not toScreen: diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py index e02e7ca..f0c892d 100755 --- a/scripts/cosmetic_changes.py +++ b/scripts/cosmetic_changes.py @@ -938,7 +938,6 @@ @param args: command line arguments @type args: list of unicode """ - answer = 'y' options = {} # Process global args and prepare generator args parser @@ -972,11 +971,9 @@ gen = genFactory.getCombinedGenerator() if gen: - if not options.get('always'): - answer = pywikibot.inputChoice( + if options.get('always') or pywikibot.input_yn( warning + '\nDo you really want to continue?', - ['yes', 'no'], ['y', 'n'], 'n') - if answer == 'y': + default=False, automatic_quit=False): site.login() preloadingGen = pagegenerators.PreloadingGenerator(gen) bot = CosmeticChangesBot(preloadingGen, **options) diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 61bc6b0..89a04a6 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -1058,12 +1058,13 @@ linkedPage.namespace(), preferredPage)) return True else: - choice = pywikibot.inputChoice( + choice = pywikibot.input_choice( u'WARNING: %s is in namespace %i, but %s is in namespace %i. Follow it anyway?' % (self.originPage, self.originPage.namespace(), linkedPage, linkedPage.namespace()), - ['Yes', 'No', 'Add an alternative', 'give up'], - ['y', 'n', 'a', 'g']) + [('Yes', 'y'), ('No', 'n'), + ('Add an alternative', 'a'), ('give up', 'g')], + automatic_quit=False) if choice != 'y': # Fill up foundIn, so that we will not ask again self.foundIn[linkedPage] = [linkingPage] @@ -1146,12 +1147,13 @@ % (page, self.originPage, disambig)) return (True, None) else: - choice = pywikibot.inputChoice( + choice = pywikibot.input_choice( u"WARNING: %s is a disambiguation page, but %s doesn't " u"seem to be one. Follow it anyway?" % (self.originPage, page), - ['Yes', 'No', 'Add an alternative', 'Give up'], - ['y', 'n', 'a', 'g']) + [('Yes', 'y'), ('No', 'n'), + ('Add an alternative', 'a'), ('give up', 'g')], + automatic_quit=False) elif not self.originPage.isDisambig() and page.isDisambig(): nondisambig = self.getFoundNonDisambig(page.site) if nondisambig: @@ -1161,12 +1163,13 @@ % (page, self.originPage, nondisambig)) return (True, None) else: - choice = pywikibot.inputChoice( + choice = pywikibot.input_choice( u'WARNING: %s doesn\'t seem to be a disambiguation ' u'page, but %s is one. Follow it anyway?' % (self.originPage, page), - ['Yes', 'No', 'Add an alternative', 'Give up'], - ['y', 'n', 'a', 'g']) + [('Yes', 'y'), ('No', 'n'), + ('Add an alternative', 'a'), ('give up', 'g')], + automatic_quit=False) if choice == 'n': return (True, None) elif choice == 'a': @@ -1581,7 +1584,11 @@ answer = 'a' else: # TODO: allow answer to repeat previous or go back after a mistake - answer = pywikibot.inputChoice(u'What should be done?', ['accept', 'reject', 'give up', 'accept all'], ['a', 'r', 'g', 'l'], 'a') + answer = pywikibot.input_choice( + u'What should be done?', + [('accept', 'a'), ('reject', 'r'), + ('give up', 'g'), ('accept all', 'l')], 'a', + automatic_quit=False) if answer == 'l': # accept all acceptall = True answer = 'a' @@ -1952,10 +1959,12 @@ # If we cannot ask, deny permission answer = 'n' else: - answer = pywikibot.inputChoice(u'Submit?', - ['Yes', 'No', 'open in Browser', - 'Give up', 'Always'], - ['y', 'n', 'b', 'g', 'a']) + answer = pywikibot.input_choice(u'Submit?', + [('Yes', 'y'), ('No', 'n'), + ('open in Browser', 'b'), + ('Give up', 'g'), + ('Always', 'a')], + automatic_quit=False) if answer == 'b': webbrowser.open("http://%s%s" % ( page.site.hostname(), diff --git a/scripts/maintenance/compat2core.py b/scripts/maintenance/compat2core.py index bc74cf3..90b318f 100644 --- a/scripts/maintenance/compat2core.py +++ b/scripts/maintenance/compat2core.py @@ -144,9 +144,9 @@ def get_dest(self): self.dest = u'%s-core.%s' % tuple(self.source.rsplit(u'.', 1)) - if not self.warnonly and pywikibot.inputChoice( + if not self.warnonly and not pywikibot.input_yn( u'Destination file is %s.' % self.dest, - ['Yes', 'No'], ['y', 'n'], 'y') == 'n': + default=True, automatic_quit=False): pywikibot.output('Quitting...') exit() diff --git a/scripts/movepages.py b/scripts/movepages.py index d5fc6ec..59edd26 100644 --- a/scripts/movepages.py +++ b/scripts/movepages.py @@ -104,16 +104,14 @@ newPageTitle = (u'%s%s' % (self.getOption('prefix'), pagetitle)) if self.getOption('prefix') or self.appendAll or self.regexAll: if not self.getOption('always'): - choice2 = pywikibot.inputChoice( + choice2 = pywikibot.input_choice( u'Change the page title to "%s"?' % newPageTitle, - ['yes', 'no', 'all', 'quit'], ['y', 'n', 'a', 'q']) + [('yes', 'y'), ('no', 'n'), ('all', 'a')]) if choice2 == 'y': self.moveOne(page, newPageTitle) elif choice2 == 'a': self.options['always'] = True self.moveOne(page, newPageTitle) - elif choice2 == 'q': - self.quit() elif choice2 == 'n': pass else: @@ -121,12 +119,11 @@ else: self.moveOne(page, newPageTitle) else: - choice = pywikibot.inputChoice(u'What do you want to do?', - ['change page name', - 'append to page name', - 'use a regular expression', - 'next page', 'quit'], - ['c', 'a', 'r', 'n', 'q']) + choice = pywikibot.input_choice(u'What do you want to do?', + [('change page name', 'c'), + ('append to page name', 'a'), + ('use a regular expression', 'r'), + ('next page', 'n')]) if choice == 'c': newPageTitle = pywikibot.input(u'New page name:') self.moveOne(page, newPageTitle) @@ -136,24 +133,20 @@ newPageTitle = (u'%s%s%s' % (self.pagestart, pagetitle, self.pageend)) if namesp: - choice2 = pywikibot.inputChoice( - u'Do you want to remove the namespace prefix "%s:"?' - % namesp, ['yes', 'no'], ['y', 'n']) - if choice2 == 'y': + if pywikibot.input_yn(u'Do you want to remove the ' + 'namespace prefix "%s:"?' % namesp, + automatic_quit=False): self.noNamespace = True else: newPageTitle = (u'%s:%s' % (namesp, newPageTitle)) - choice2 = pywikibot.inputChoice( + choice2 = pywikibot.input_choice( u'Change the page title to "%s"?' - % newPageTitle, ['yes', 'no', 'all', 'quit'], - ['y', 'n', 'a', 'q']) + % newPageTitle, [('yes', 'y'), ('no', 'n'), ('all', 'a')]) if choice2 == 'y': self.moveOne(page, newPageTitle) elif choice2 == 'a': self.appendAll = True self.moveOne(page, newPageTitle) - elif choice2 == 'q': - self.quit() elif choice2 == 'n': pass else: @@ -167,35 +160,29 @@ newPageTitle = self.regex.sub(self.replacePattern, page.title()) else: - choice2 = pywikibot.inputChoice( - u'Do you want to remove the namespace prefix "%s:"?' - % namesp, ['yes', 'no'], ['y', 'n']) - if choice2 == 'y': + if pywikibot.input_yn(u'Do you want to remove the ' + 'namespace prefix "%s:"?' % namesp, + automatic_quit=False): newPageTitle = self.regex.sub( self.replacePattern, page.title(withNamespace=False)) self.noNamespace = True else: newPageTitle = self.regex.sub(self.replacePattern, page.title()) - choice2 = pywikibot.inputChoice( + choice2 = pywikibot.input_choice( u'Change the page title to "%s"?' - % newPageTitle, ['yes', 'no', 'all', 'quit'], - ['y', 'n', 'a', 'q']) + % newPageTitle, [('yes', 'y'), ('no', 'n'), ('all', 'a')]) if choice2 == 'y': self.moveOne(page, newPageTitle) elif choice2 == 'a': self.regexAll = True self.moveOne(page, newPageTitle) - elif choice2 == 'q': - self.quit() elif choice2 == 'n': pass else: self.treat(page) elif choice == 'n': pass - elif choice == 'q': - self.quit() else: self.treat(page) diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py index b3494e4..7d27c71 100644 --- a/scripts/nowcommons.py +++ b/scripts/nowcommons.py @@ -246,14 +246,14 @@ webbrowser.open(url_local, 0, 1) webbrowser.open(url_commons, 0, 1) if image_local.split('Image:')[1] == image_commons: - choice = pywikibot.inputChoice( - u'The local and the commons images have the same name, continue?', - ['Yes', 'No'], ['y', 'N'], 'N') + choice = pywikibot.input_yn( + u'The local and the commons images have the same name, ' + 'continue?', default=False, automatic_quit=False) else: - choice = pywikibot.inputChoice( + choice = pywikibot.input_yn( u'Are the two images equal?', - ['Yes', 'No'], ['y', 'N'], 'N') - if choice == 'y': + default=False, automatic_quit=False) + if choice: yield [image_local, image_commons] else: continue @@ -413,11 +413,11 @@ u'\n\n>>>> Description on \03{lightpurple}%s\03{default} <<<<\n' % commonsImagePage.title()) pywikibot.output(commonsText) - choice = pywikibot.inputChoice(u'Does the description \ - on Commons contain all required source and license\n' - u'information?', - ['yes', 'no'], ['y', 'N'], 'N') - if choice == 'y': + if pywikibot.input_yn( + u'Does the description on Commons contain ' + 'all required source and license\n' + 'information?', + default=False, automatic_quit=False): localImagePage.delete( '%s [[:commons:Image:%s]]' % (comment, filenameOnCommons), prompt=False) diff --git a/scripts/protect.py b/scripts/protect.py index 0a4279f..09144fb 100644 --- a/scripts/protect.py +++ b/scripts/protect.py @@ -91,12 +91,11 @@ for page in self.generator: self.current_page = page if not self.getOption('always'): - choice = pywikibot.inputChoice( + choice = pywikibot.input_choice( u'Do you want to change the protection level of %s?' % page.title(asLink=True, forceInterwiki=True), - ['yes', 'No', 'all'], - ['y', 'N', 'a'], - 'n') + [('yes', 'y'), ('No', 'n'), ('all', 'a')], + 'n', automatic_quit=False) if choice == 'n': continue elif choice == 'a': @@ -128,9 +127,9 @@ num += 1 if level == default: default_char = first_char[-1] - choice = pywikibot.inputChoice('Choice a protection level to %s:' - % operation, levels, first_char, - default=default_char) + choice = pywikibot.input_choice('Choice a protection level to %s:' + % operation, zip(levels, first_char), + default=default_char) return levels[first_char.index(choice)] else: diff --git a/scripts/selflink.py b/scripts/selflink.py index cb21cc9..1687c97 100644 --- a/scripts/selflink.py +++ b/scripts/selflink.py @@ -55,7 +55,6 @@ r'(?P<section>#[^\]\|]*)?' '(\|(?P<label>[^\]]*))?\]\]' r'(?P<linktrail>' + linktrail + ')') - self.done = False def handleNextLink(self, page, match, context=100): """Process the next link on a page, offering the user choices. @@ -97,11 +96,10 @@ matchText = match.group(0) pywikibot.output( pre + '\03{lightred}' + matchText + '\03{default}' + post) - choice = pywikibot.inputChoice( + choice = pywikibot.input_choice( u'\nWhat shall be done with this selflink?\n', - ['unlink', 'make bold', 'skip', 'edit', 'more context', - 'unlink all', 'quit'], - ['U', 'b', 's', 'e', 'm', 'a', 'q'], 'u') + [('unlink', 'u'), ('make bold', 'b'), ('skip', 's'), + ('edit', 'e'), ('more context', 'm'), ('unlink all')], 'u') pywikibot.output(u'') if choice == 's': @@ -121,9 +119,6 @@ return self.handleNextLink(page, match, context=context + 100) elif choice == 'a': self.always = True - elif choice == 'q': - self.done = True - return False # choice was 'U', 'b', or 'a' new = match.group('label') or match.group('title') @@ -151,7 +146,7 @@ % page.title(asLink=True)) return curpos = 0 - while curpos < len(page.text) or self.done: + while curpos < len(page.text): match = self.linkR.search(page.text, pos=curpos) if not match: break @@ -176,12 +171,6 @@ % page.title(asLink=True)) except pywikibot.LockedPage: pywikibot.output(u"Page %s is locked." % page.title(asLink=True)) - - def run(self): - for page in self.generator: - if self.done: - break - self.treat(page) def main(*args): diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index e79eab8..c3edae1 100644 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -570,10 +570,9 @@ % (refPage.title(), disambPage.title())) if disambPage.isRedirectPage(): target = self.alternatives[0] - choice = pywikibot.inputChoice( - u'Do you want to make redirect %s point to %s?' - % (refPage.title(), target), ['yes', 'no'], ['y', 'N'], 'N') - if choice == 'y': + if pywikibot.input_yn(u'Do you want to make redirect %s point ' + 'to %s?' % (refPage.title(), target), + default=False, automatic_quit=False): redir_text = '#%s [[%s]]' \ % (self.mysite.redirect(default=True), target) try: @@ -581,10 +580,11 @@ except pywikibot.PageNotSaved as error: pywikibot.output(u'Page not saved: %s' % error.args) else: - choice = pywikibot.inputChoice( + choice = pywikibot.input_choice( u'Do you want to work on pages linking to %s?' - % refPage.title(), ['yes', 'no', 'change redirect'], - ['y', 'N', 'c'], 'N') + % refPage.title(), + [('yes', 'y'), ('no', 'n'), ('change redirect', 'c')], 'n', + automatic_quit=False) if choice == 'y': gen = ReferringPageGeneratorWithIgnore(refPage, self.primary) @@ -1065,10 +1065,10 @@ if page.exists(): alternatives.append(page.title()) else: - answer = pywikibot.inputChoice( - u'Possibility %s does not actually exist. Use it anyway?' - % page.title(), ['yes', 'no'], ['y', 'N'], 'N') - if answer == 'y': + if pywikibot.input_yn( + u'Possibility %s does not actually exist. Use it ' + 'anyway?' % page.title(), + default=False, automatic_quit=False): alternatives.append(page.title()) else: alternatives.append(arg[5:]) diff --git a/scripts/spamremove.py b/scripts/spamremove.py index 17cb25f..ec92df4 100755 --- a/scripts/spamremove.py +++ b/scripts/spamremove.py @@ -100,9 +100,10 @@ if always: answer = "y" else: - answer = pywikibot.inputChoice(u'\nDelete the red lines?', - ['yes', 'no', 'edit'], - ['y', 'N', 'e'], 'n') + answer = pywikibot.input_choice( + u'\nDelete the red lines?', + [('yes', 'y'), ('no', 'n'), ('edit', 'e')], + 'n', automatic_quit=False) if answer == "n": continue elif answer == "e": diff --git a/scripts/template.py b/scripts/template.py index b6389d8..5eaa837 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -277,10 +277,8 @@ template = pywikibot.Page(site, new, ns=10) if not template.exists(): pywikibot.warning(u'Template "%s" does not exist.' % new) - choice = pywikibot.inputChoice( - u'Do you want to proceed anyway?', - ['Yes', 'No'], ['y', 'N'], 'N') - if choice == 'n': + if not pywikibot.input_yn('Do you want to proceed anyway?', + default=False, automatic_quit=False): continue replacements.append((templateRegex, '{{%s\g<parameters>}}' % new)) diff --git a/scripts/templatecount.py b/scripts/templatecount.py index fd67c21..ab70b97 100644 --- a/scripts/templatecount.py +++ b/scripts/templatecount.py @@ -145,8 +145,10 @@ if 'reflist' in argsList: pywikibot.output( u'NOTE: it will take a long time to count "reflist".') - choice = pywikibot.inputChoice( - u'Proceed anyway?', ['yes', 'no', 'skip'], ['y', 'n', 's'], 'y') + choice = pywikibot.input_choice( + u'Proceed anyway?', + [('yes', 'y'), ('no', 'n'), ('skip', 's')], 'y', + automatic_quit=False) if choice == 's': argsList.remove('reflist') elif choice == 'n': diff --git a/scripts/unlink.py b/scripts/unlink.py index a94ff9f..ea24f7c 100755 --- a/scripts/unlink.py +++ b/scripts/unlink.py @@ -104,11 +104,10 @@ text[max(0, match.start() - context):match.start()] + '\03{lightred}' + text[match.start():match.end()] + '\03{default}' + text[match.end():match.end() + context]) - choice = pywikibot.inputChoice( + choice = pywikibot.input_choice( u'\nWhat shall be done with this link?\n', - ['unlink', 'skip', 'edit', 'more context', - 'unlink all', 'quit'], - ['U', 's', 'e', 'm', 'a', 'q'], 'u') + [('unlink', 'u'), ('skip', 's'), ('edit', 'e'), + ('more context', 'm'), ('unlink all', 'a')], 'u') pywikibot.output(u'') if choice == 's': @@ -128,8 +127,6 @@ context=context + 100) elif choice == 'a': self.options['always'] = True - elif choice == 'q': - self.quit() new = match.group('label') or match.group('title') new += match.group('linktrail') return text[:match.start()] + new + text[match.end():], False diff --git a/scripts/upload.py b/scripts/upload.py index 69127b0..90cb164 100755 --- a/scripts/upload.py +++ b/scripts/upload.py @@ -48,7 +48,6 @@ import pywikibot import pywikibot.data.api from pywikibot import config -from pywikibot.bot import QuitKeyboardInterrupt if sys.version_info[0] > 2: from urllib.parse import urlparse @@ -190,11 +189,10 @@ 'Invalid character(s): %s. Please try again' % c) continue if ext not in allowed_formats: - choice = pywikibot.inputChoice( - u"File format is not one of [%s], but %s. Continue?" - % (u' '.join(allowed_formats), ext), - ['yes', 'no'], ['y', 'N'], 'N') - if choice == 'n': + if not pywikibot.input_yn( + u"File format is not one of [%s], but %s. Continue?" + % (u' '.join(allowed_formats), ext), + default=False, automatic_quit=False): continue break if newfn != '': @@ -215,21 +213,16 @@ 'without a summary/description.\03{default}') # if no description, default is 'yes' - default = 'y' if not self.description else 'n' - choice = pywikibot.inputChoice( - u'Do you want to change this description?', - ['Yes', 'No', 'Quit'], ['y', 'n', 'q'], default) - if choice == 'y': + if pywikibot.input_yn( + u'Do you want to change this description?', + default=not self.description): from pywikibot import editor as editarticle editor = editarticle.TextEditor() newDescription = editor.edit(self.description) # if user saved / didn't press Cancel if newDescription: self.description = newDescription - if choice == 'q': - raise QuitKeyboardInterrupt - else: - self.verifyDescription = False + self.verifyDescription = False return filename @@ -272,12 +265,9 @@ except pywikibot.data.api.UploadWarning as warn: pywikibot.output( u'We got a warning message: {0}'.format(warn.message)) - if self.abort_on_warn(warn.code): - answer = "N" - else: - answer = pywikibot.inputChoice(u"Do you want to ignore?", - ['Yes', 'No'], ['y', 'N'], 'N') - if answer == "y": + if (not self.abort_on_warn(warn.code) and + pywikibot.input_yn(u"Do you want to ignore?", + default=False, automatic_quit=False)): self.ignoreWarning = True self.keepFilename = True return self.upload_image(debug) diff --git a/scripts/welcome.py b/scripts/welcome.py index 63a9764..c37a582 100644 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -563,10 +563,11 @@ #Queue process if name: if globalvar.confirm: - answer = pywikibot.inputChoice( + answer = pywikibot.input_choice( u'%s may have an unwanted username, do you want to report ' u'this user?' % name, - ['Yes', 'No', 'All'], ['y', 'N', 'a'], 'N') + [('Yes', 'y'), ('No', 'n'), ('All', 'a')], 'n', + automatic_quit=False) if answer in ['a', 'all']: answer = 'y' globalvar.confirm = False -- To view, visit https://gerrit.wikimedia.org/r/168225 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib68e66a60e5bc5a78602253123312a380109657d Gerrit-PatchSet: 7 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] page.py: fix docstring of getFileVersionHistory() - change (pywikibot/core)
by jenkins-bot (Code Review) 27 Oct '14

27 Oct '14

jenkins-bot has submitted this change and it was merged. Change subject: page.py: fix docstring of getFileVersionHistory() ...................................................................... page.py: fix docstring of getFileVersionHistory() getFileVersionHistory() returns a list of dicts, not tuples. Change-Id: I783ed237d691aedb44464a6e292d60ea778183b7 --- M pywikibot/page.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: XZise: Looks good to me, approved Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 5a4994c..54c3ff0 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1915,8 +1915,9 @@ def getFileVersionHistory(self): """Return the file's version history. - @return: An iterator yielding tuples containing (timestamp, - username, resolution, filesize, comment). + @return: A list of dictionaries with the following keys: + [comment, sha1, url, timestamp, metadata, + height, width, mime, user, descriptionurl, size] """ return self.site.loadimageinfo(self, history=True) -- To view, visit https://gerrit.wikimedia.org/r/168909 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I783ed237d691aedb44464a6e292d60ea778183b7 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [FIX] Fixed flake errors - change (pywikibot/core)
by jenkins-bot (Code Review) 27 Oct '14

27 Oct '14

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] Fixed flake errors ...................................................................... [FIX] Fixed flake errors Due to the outage of jenkins a few reviews have been merged manually which contained minor flake errors. Change-Id: Ibded765a863b36a185258acff3e32de75ff4a58d --- M pywikibot/exceptions.py M pywikibot/site.py 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index d735038..95d3111 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -260,6 +260,7 @@ PageNotSaved = PageSaveRelatedError + class NoCreateError(PageSaveRelatedError): """Parameter nocreate doesn't allow page creation.""" @@ -268,6 +269,7 @@ pass + class EditConflict(PageSaveRelatedError): """There has been an edit conflict while uploading the page""" diff --git a/pywikibot/site.py b/pywikibot/site.py index 86de719..642731c 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -37,7 +37,6 @@ from pywikibot.exceptions import ( Error, PageRelatedError, - PageSaveRelatedError, EditConflict, PageCreatedConflict, PageDeletedConflict, -- To view, visit https://gerrit.wikimedia.org/r/168916 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibded765a863b36a185258acff3e32de75ff4a58d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Bug 72527 - CircularRedirect exception throws another exception - change (pywikibot/core)
by John Vandenberg (Code Review) 27 Oct '14

27 Oct '14

John Vandenberg has submitted this change and it was merged. Change subject: Bug 72527 - CircularRedirect exception throws another exception ...................................................................... Bug 72527 - CircularRedirect exception throws another exception CircularRedirect needs a page as input param. Change-Id: I65cc58a1568b922336fcf5c85651cdc4172444d2 --- M pywikibot/site.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Verified XZise: Looks good to me, approved Mpaa: Looks good to me, approved diff --git a/pywikibot/site.py b/pywikibot/site.py index 17611ee..86de719 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2344,7 +2344,7 @@ target_title = u'%(title)s%(section)s' % redirmap[title] if target_title == title or "pages" not in result['query']: # no "pages" element indicates a circular redirect - raise pywikibot.CircularRedirect(target_title) + raise pywikibot.CircularRedirect(page) pagedata = list(result['query']['pages'].values())[0] # there should be only one value in 'pages', and it is the target if self.sametitle(pagedata['title'], target_title): -- To view, visit https://gerrit.wikimedia.org/r/168837 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I65cc58a1568b922336fcf5c85651cdc4172444d2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Fix page_tests testBasePageConstructor - change (pywikibot/core)
by John Vandenberg (Code Review) 26 Oct '14

26 Oct '14

John Vandenberg has submitted this change and it was merged. Change subject: Fix page_tests testBasePageConstructor ...................................................................... Fix page_tests testBasePageConstructor Empty string titles for BasePage raise InvalidTitle during Link.parse Change-Id: I6d4fb9ff02d472f2e71933084de71a7bc355c154 --- M tests/page_tests.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Nullzero: Verified; Looks good to me, approved diff --git a/tests/page_tests.py b/tests/page_tests.py index ab229ea..54355cf 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -10,6 +10,7 @@ import sys import pywikibot from pywikibot import config +from pywikibot import InvalidTitle import pywikibot.page from tests.aspects import unittest, TestCase, DefaultSiteTestCase @@ -279,9 +280,9 @@ # the site parameter, with the title parameter defaulted to # empty string page = pywikibot.page.BasePage(site) - self.assertEqual(page.title(), u'') + self.assertRaises(InvalidTitle, page.title) page = pywikibot.page.BasePage(site, title=u'') - self.assertEqual(page.title(), u'') + self.assertRaises(InvalidTitle, page.title) self.assertRaises(ValueError, pywikibot.page.BasePage, site, title=None) def testPageConstructor(self): -- To view, visit https://gerrit.wikimedia.org/r/168911 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d4fb9ff02d472f2e71933084de71a7bc355c154 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Nullzero <nullzero.free(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Add NoCreateError and fix a bug about issubclass - change (pywikibot/core)
by John Vandenberg (Code Review) 26 Oct '14

26 Oct '14

John Vandenberg has submitted this change and it was merged. Change subject: Add NoCreateError and fix a bug about issubclass ...................................................................... Add NoCreateError and fix a bug about issubclass With nocreate=True, if page doesn't exist, API will return missingtitle which is not recognized by PWB. This patch adds NoCreateError to match with this missingtitle in this case. This patch also fixes a bug when issubclass is used but the first parameter is not a class, leading to an error "TypeError: issubclass() arg 1 must be a class" Change-Id: I11f80783c9febce51538e868a0b1edb42cce4ec3 --- M pywikibot/__init__.py M pywikibot/exceptions.py M pywikibot/site.py 3 files changed, 15 insertions(+), 5 deletions(-) Approvals: John Vandenberg: Verified; Looks good to me, approved diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index ad0c475..14327d2 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -40,7 +40,7 @@ NoUsername, UserBlocked, PageRelatedError, IsRedirectPage, IsNotRedirectPage, PageSaveRelatedError, PageNotSaved, OtherPageSaveError, - LockedPage, CascadeLockedPage, LockedNoPage, + LockedPage, CascadeLockedPage, LockedNoPage, NoCreateError, EditConflict, PageDeletedConflict, PageCreatedConflict, ServerError, FatalServerError, Server504Error, CaptchaError, SpamfilterError, CircularRedirect, @@ -76,7 +76,7 @@ 'NoUsername', 'UserBlocked', 'PageRelatedError', 'IsRedirectPage', 'IsNotRedirectPage', 'PageSaveRelatedError', 'PageNotSaved', 'OtherPageSaveError', - 'LockedPage', 'CascadeLockedPage', 'LockedNoPage', + 'LockedPage', 'CascadeLockedPage', 'LockedNoPage', 'NoCreateError', 'EditConflict', 'PageDeletedConflict', 'PageCreatedConflict', 'UploadWarning', 'ServerError', 'FatalServerError', 'Server504Error', diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py index ad0c566..d735038 100644 --- a/pywikibot/exceptions.py +++ b/pywikibot/exceptions.py @@ -35,6 +35,7 @@ - PageDeletedConflict: Page was deleted since being retrieved - PageCreatedConflict: Page was created by another user - ArticleExistsConflict: Page article already exists + - NoCreateError: parameter nocreate not allow page creation ServerError: a problem with the server. - FatalServerError: A fatal/non-recoverable server error @@ -259,6 +260,13 @@ PageNotSaved = PageSaveRelatedError +class NoCreateError(PageSaveRelatedError): + + """Parameter nocreate doesn't allow page creation.""" + + message = u"Page %s could not be created due to parameter nocreate" + + pass class EditConflict(PageSaveRelatedError): diff --git a/pywikibot/site.py b/pywikibot/site.py index dffd696..17611ee 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -50,6 +50,7 @@ SiteDefinitionError, NoUsername, SpamfilterError, + NoCreateError, UserBlocked, ) @@ -3682,6 +3683,7 @@ "noedit-anon": """Bot is not logged in, and anon users are not authorized to edit on %(site)s wiki""", "noedit": "User %(user)s not authorized to edit pages on %(site)s wiki", + "missingtitle": NoCreateError, "editconflict": EditConflict, "articleexists": PageCreatedConflict, "pagedeleted": PageDeletedConflict, @@ -3775,9 +3777,7 @@ % err.code, _logger) if err.code in self._ep_errors: - if issubclass(self._ep_errors[err.code], PageSaveRelatedError): - raise self._ep_errors[err.code](page) - else: + if isinstance(self._ep_errors[err.code], basestring): errdata = { 'site': self, 'title': page.title(withSection=False), @@ -3785,6 +3785,8 @@ 'info': err.info } raise Error(self._ep_errors[err.code] % errdata) + else: + raise self._ep_errors[err.code](page) pywikibot.debug( u"editpage: Unexpected error code '%s' received." % err.code, -- To view, visit https://gerrit.wikimedia.org/r/168816 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I11f80783c9febce51538e868a0b1edb42cce4ec3 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Nullzero <nullzero.free(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

1 0

← Newer
1
2
3
4
5
6
7
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits October 2014