Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T61332: Python3 syntax errors

Browse Source
This commit is contained in:
Jacques Lucke
2019-02-09 13:07:34 +11:00
committed by Campbell Barton
parent 191b8951f7
commit 7262ac6202
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build_files/package_spec/build_archive.py
View File

@@ -29,7 +29,7 @@ try:
os.remove(package_archive) os.remove(package_archive)
if os.path.exists(package_dir): if os.path.exists(package_dir):
shutil.rmtree(package_dir) shutil.rmtree(package_dir)
except Exception, ex: except Exception as ex:
sys.stderr.write('Failed to clean up old package files: ' + str(ex) + '\n') sys.stderr.write('Failed to clean up old package files: ' + str(ex) + '\n')
sys.exit(1) sys.exit(1)
@@ -40,7 +40,7 @@ try:
for f in os.listdir(package_dir): for f in os.listdir(package_dir):
if f.startswith('makes'): if f.startswith('makes'):
os.remove(os.path.join(package_dir, f)) os.remove(os.path.join(package_dir, f))
except Exception, ex: except Exception as ex:
sys.stderr.write('Failed to copy install directory: ' + str(ex) + '\n') sys.stderr.write('Failed to copy install directory: ' + str(ex) + '\n')
sys.exit(1) sys.exit(1)
@@ -58,13 +58,13 @@ try:
sys.exit(-1) sys.exit(-1)
subprocess.call(archive_cmd) subprocess.call(archive_cmd)
except Exception, ex: except Exception as ex:
sys.stderr.write('Failed to create package archive: ' + str(ex) + '\n') sys.stderr.write('Failed to create package archive: ' + str(ex) + '\n')
sys.exit(1) sys.exit(1)
# empty temporary package dir # empty temporary package dir
try: try:
shutil.rmtree(package_dir) shutil.rmtree(package_dir)
except Exception, ex: except Exception as ex:
sys.stderr.write('Failed to clean up package directory: ' + str(ex) + '\n') sys.stderr.write('Failed to clean up package directory: ' + str(ex) + '\n')
sys.exit(1) sys.exit(1)

6
source/blender/python/simple_enum_gen.py
View File

@@ -39,8 +39,8 @@ defs = """
SPACEICONMAX SPACEICONMAX
""" """
print '\tmod = PyModule_New("dummy");' print('\tmod = PyModule_New("dummy");')
print '\tPyModule_AddObject(submodule, "key", mod);' print('\tPyModule_AddObject(submodule, "key", mod);')
for d in defs.split('\n'): for d in defs.split('\n'):
@@ -60,4 +60,4 @@ for d in defs.split('\n'):
val = w[0] val = w[0]
py_val = w[0] py_val = w[0]
print '\tPyModule_AddObject(mod, "%s", PyLong_FromSize_t(%s));' % (val, py_val) print('\tPyModule_AddObject(mod, "%s", PyLong_FromSize_t(%s));' % (val, py_val))