mirror of
https://github.com/munki/munki.git
synced 2026-01-06 06:29:56 -06:00
Align except clauses with PEP 3110 (#933)
This should work for Python 2.6+, including 3. https://www.python.org/dev/peps/pep-3110/#compatibility-issues
This commit is contained in:
committed by
Greg Neagle
parent
270f23611e
commit
2ad27ff411
@@ -87,7 +87,7 @@ def PtyExec(argv):
|
||||
if pid == 0: # child
|
||||
try:
|
||||
os.execv(argv[0], argv)
|
||||
except OSError, e:
|
||||
except OSError as e:
|
||||
print >>sys.stderr, str(e)
|
||||
sys.exit(1)
|
||||
elif pid > 0: # parent
|
||||
@@ -96,7 +96,7 @@ def PtyExec(argv):
|
||||
while 1:
|
||||
try:
|
||||
(rl, wl, xl) = select.select([f], [], [], 5.0)
|
||||
except select.error, e:
|
||||
except select.error as e:
|
||||
rl = []
|
||||
|
||||
if f in rl:
|
||||
|
||||
Reference in New Issue
Block a user