From feb8891dd0cba60acfae16404c6bd99d0ce43075 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 14 Jul 2015 10:50:04 +0200 Subject: Remove tuple unpacking from except clause ipa-client/ipaclient/ipachangeconf.py Python 3 doesn't support tuple unpacking in except clauses. All implicit tuple unpackings have been replaced with explicit unpacking of e.args. https://fedorahosted.org/freeipa/ticket/5120 Reviewed-By: Tomas Babej Reviewed-By: Alexander Bokovoy --- ipa-client/ipaclient/ipachangeconf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ipa-client/ipaclient/ipachangeconf.py b/ipa-client/ipaclient/ipachangeconf.py index 15d41274f..edf34f5ae 100644 --- a/ipa-client/ipaclient/ipachangeconf.py +++ b/ipa-client/ipaclient/ipachangeconf.py @@ -31,13 +31,13 @@ def openLocked(filename, perms): fd = os.open(filename, os.O_RDWR | os.O_CREAT, perms) fcntl.lockf(fd, fcntl.LOCK_EX) - except OSError, (errno, strerr): + except OSError as e: if fd != -1: try: os.close(fd) except OSError: pass - raise IOError(errno, strerr) + raise IOError(e.errno, e.strerror) return os.fdopen(fd, "r+") -- cgit