raise Exception, "text" --> raise Exception("text")

To have the code work in python3, we need to convert all occurences of

raise Exception, "text" to be proper functions. This style also adheres to PEP8.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
Sebastian Spaeth 2012-02-05 11:51:02 +01:00
parent 9df7f34d4c
commit c5468ae599
3 changed files with 7 additions and 5 deletions

View File

@ -328,7 +328,9 @@ class IMAPFolder(BaseFolder):
self.ui.debug('imap', 'savemessage_searchforheader: matchinguids now ' + \ self.ui.debug('imap', 'savemessage_searchforheader: matchinguids now ' + \
repr(matchinguids)) repr(matchinguids))
if len(matchinguids) != 1 or matchinguids[0] == None: if len(matchinguids) != 1 or matchinguids[0] == None:
raise ValueError, "While attempting to find UID for message with header %s, got wrong-sized matchinguids of %s" % (headername, str(matchinguids)) raise ValueError("While attempting to find UID for message with "
"header %s, got wrong-sized matchinguids of %s" %\
(headername, str(matchinguids)))
matchinguids.sort() matchinguids.sort()
return long(matchinguids[0]) return long(matchinguids[0])

View File

@ -58,7 +58,7 @@ def flagsplit(string):
['FLAGS,'(\\Seen Old)','UID', '4807'] ['FLAGS,'(\\Seen Old)','UID', '4807']
""" """
if string[0] != '(' or string[-1] != ')': if string[0] != '(' or string[-1] != ')':
raise ValueError, "Passed string '%s' is not a flag list" % string raise ValueError("Passed string '%s' is not a flag list" % string)
return imapsplit(string[1:-1]) return imapsplit(string[1:-1])
def options2hash(list): def options2hash(list):

View File

@ -47,15 +47,15 @@ class Repository(object):
return LocalStatusRepository(name, account) return LocalStatusRepository(name, account)
else: else:
raise ValueError, "Request type %s not supported" % reqtype raise ValueError("Request type %s not supported" % reqtype)
config = account.getconfig() config = account.getconfig()
repostype = config.get('Repository ' + name, 'type').strip() repostype = config.get('Repository ' + name, 'type').strip()
try: try:
repo = typemap[repostype] repo = typemap[repostype]
except KeyError: except KeyError:
raise Exception, "'%s' repository not supported for %s repositories."%\ raise ValueError("'%s' repository not supported for %s repositories"
(repostype, reqtype) "." % (repostype, reqtype))
return repo(name, account) return repo(name, account)