Changes related to ATOM-15021, this allows maya on py2.7 to work with .o3de\boostrap changes

main
gallowj 5 years ago
parent dda6fee227
commit d5916630b8

@ -69,10 +69,16 @@ proj.launch-config = {loc('../../SDK/Atom/Scripts/Python/DCC_Materials/maya_mate
loc('../../azpy/__init__.py'): ('custom',
(u'',
'launch-oobMrvXFf1SwtYBg')),
loc('../../azpy/constants.py'): ('custom',
(u'',
'launch-GeaM41WYMGA1sEfm')),
loc('../../azpy/env_base.py'): ('project',
(u'',
'launch-GeaM41WYMGA1sEfm')),
loc('../../azpy/maya/callbacks/node_message_callback_handler.py'): ('c'\
'ustom',
(u'',
'launch-GeaM41WYMGA1sEfm')),
loc('../../config.py'): ('custom',
(u'',
'launch-GeaM41WYMGA1sEfm'))}

@ -165,12 +165,14 @@ def get_current_project():
bootstrap_box = None
try:
bootstrap_box = Box.from_json(filename=PATH_USER_O3DE_BOOTSTRAP,
bootstrap_box = Box.from_json(filename=str(Path(PATH_USER_O3DE_BOOTSTRAP).resolve()),
encoding="utf-8",
errors="strict",
object_pairs_hook=OrderedDict)
except FileExistsError as e:
_LOGGER.error('File does not exist: {}'.format(PATH_USER_O3DE_BOOTSTRAP))
except Exception as e:
# this file runs in py2.7 for Maya 2020, FileExistsError is not defined
_LOGGER.error('FileExistsError: {}'.format(PATH_USER_O3DE_BOOTSTRAP))
_LOGGER.error('exception is: {}'.format(e))
if bootstrap_box:
# this seems fairly hard coded - what if the data changes?

@ -226,7 +226,18 @@ TAG_DEFAULT_PY = str('Launch_pyBASE.bat')
FILENAME_DEFAULT_CONFIG = str('DCCSI_config.json')
# new o3de related paths
PATH_USER_O3DE = str('{home}\\{o3de}').format(home=expanduser("~"),
# os.path.expanduser("~") returns different values in py2.7 vs 3
PATH_USER_HOME = expanduser("~")
_LOGGER.debug('user home: {}'.format(PATH_USER_HOME))
# special case, make sure didn't return <user>\documents
parts = os.path.split(PATH_USER_HOME)
if str(parts[1].lower()) == 'documents':
PATH_USER_HOME = parts[0]
_LOGGER.debug('user home CORRECTED: {}'.format(PATH_USER_HOME))
PATH_USER_O3DE = str('{home}\\{o3de}').format(home=PATH_USER_HOME,
o3de=TAG_O3DE_FOLDER)
PATH_USER_O3DE_REGISTRY = str('{0}\\Registry').format(PATH_USER_O3DE)
PATH_USER_O3DE_BOOTSTRAP = str('{reg}\\{file}').format(reg=PATH_USER_O3DE_REGISTRY,

Loading…
Cancel
Save