Skip to content
Snippets Groups Projects
Commit e23d86ca authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

SL-13792: Cannot mix print statement and print function.

'from __future__ import print_function' not only makes the print() function
available, it also makes the Python 2 print statement invalid syntax. Until we
merge with the Python 3 branch (soon!), don't import print_function: instead
revert to 'print >> sys.stderr' statements.
parent b7c4e27d
No related branches found
No related tags found
No related merge requests found
......@@ -26,8 +26,6 @@
Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
$/LicenseInfo$
"""
from __future__ import print_function
import errno
import glob
import itertools
......@@ -1317,9 +1315,9 @@ def package_finish(self):
]
for attempt in range(3):
if attempt: # second or subsequent iteration
print("codesign failed, waiting %d seconds before retrying" %
sign_retry_wait,
file=sys.stderr)
print >> sys.stderr, \
("codesign failed, waiting %d seconds before retrying" %
sign_retry_wait)
time.sleep(sign_retry_wait)
sign_retry_wait*=2
......@@ -1349,7 +1347,7 @@ def package_finish(self):
# 'err' goes out of scope
sign_failed = err
else:
print("Maximum codesign attempts exceeded; giving up", file=sys.stderr)
print >> sys.stderr, "Maximum codesign attempts exceeded; giving up"
raise sign_failed
self.run_command(['spctl', '-a', '-texec', '-vvvv', app_in_dmg])
self.run_command([self.src_path_of("installers/darwin/apple-notarize.sh"), app_in_dmg])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment