tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

except Ex, e: --> except Ex as e:

Browse Source 
Nudge us towards python3 compatability by converting deprecated python2 syntax.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
Sebastian Spaeth
2012-02-05 10:14:23 +01:00
parent 7f22d89872
commit 0844d27f9f
12 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
offlineimap/repository/Base.py
View File

@ -165,7 +165,7 @@ class BaseRepository(object, CustomConfig.ConfigHelperMixin):
try:
dst_repo.makefolder(src_name)
dst_haschanged = True # Need to refresh list
except OfflineImapError, e:
except OfflineImapError as e:
self.ui.error(e, exc_info()[2],
"Creating folder %s on repository %s" %\
(src_name, dst_repo))
@ -212,7 +212,7 @@ class BaseRepository(object, CustomConfig.ConfigHelperMixin):
try:
src_repo.makefolder(newsrc_name)
src_haschanged = True # Need to refresh list
except OfflineImapError, e:
except OfflineImapError as e:
self.ui.error(e, exc_info()[2], "Creating folder %s on "
"repository %s" % (newsrc_name, src_repo))
raise

12
offlineimap/repository/IMAP.py
View File

@ -95,7 +95,7 @@ class IMAPRepository(BaseRepository):
host = self.getconf('remotehosteval')
try:
host = self.localeval.eval(host)
except Exception, e:
except Exception as e:
raise OfflineImapError("remotehosteval option for repository "\
"'%s' failed:\n%s" % (self, e),
OfflineImapError.ERROR.REPO)
@ -128,7 +128,7 @@ class IMAPRepository(BaseRepository):
try:
netrcentry = netrc.netrc().authenticators(self.gethost())
except IOError, inst:
except IOError as inst:
if inst.errno != errno.ENOENT:
raise
else:
@ -137,7 +137,7 @@ class IMAPRepository(BaseRepository):
try:
netrcentry = netrc.netrc('/etc/netrc').authenticators(self.gethost())
except IOError, inst:
except IOError as inst:
if inst.errno not in (errno.ENOENT, errno.EACCES):
raise
else:
@ -223,7 +223,7 @@ class IMAPRepository(BaseRepository):
# 4. read password from ~/.netrc
try:
netrcentry = netrc.netrc().authenticators(self.gethost())
except IOError, inst:
except IOError as inst:
if inst.errno != errno.ENOENT:
raise
else:
@ -234,7 +234,7 @@ class IMAPRepository(BaseRepository):
# 5. read password from /etc/netrc
try:
netrcentry = netrc.netrc('/etc/netrc').authenticators(self.gethost())
except IOError, inst:
except IOError as inst:
if inst.errno not in (errno.ENOENT, errno.EACCES):
raise
else:
@ -297,7 +297,7 @@ class IMAPRepository(BaseRepository):
for foldername in self.folderincludes:
try:
imapobj.select(foldername, readonly = True)
except OfflineImapError, e:
except OfflineImapError as e:
# couldn't select this folderinclude, so ignore folder.
if e.severity > OfflineImapError.ERROR.FOLDER:
raise

4
offlineimap/repository/Maildir.py
View File

@ -98,7 +98,7 @@ class MaildirRepository(BaseRepository):
self.debug("makefolder: calling makedirs '%s'" % full_path)
try:
os.makedirs(full_path, 0700)
except OSError, e:
except OSError as e:
if e.errno == 17 and os.path.isdir(full_path):
self.debug("makefolder: '%s' already a directory" % foldername)
else:
@ -106,7 +106,7 @@ class MaildirRepository(BaseRepository):
for subdir in ['cur', 'new', 'tmp']:
try:
os.mkdir(os.path.join(full_path, subdir), 0700)
except OSError, e:
except OSError as e:
if e.errno == 17 and os.path.isdir(full_path):
self.debug("makefolder: '%s' already has subdir %s" %
(foldername, subdir))