Skip to content

Use appropriate reload method for Py2 or Py3 in tank_api_proxy #855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jlucas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use appropriate reload method for Py2 or Py3 in tank_api_proxy #855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions setup/tank_api_proxy/sgtk/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,15 @@
pipeline_config = os.path.abspath(pipeline_config)
os.environ["TANK_CURRENT_PC"] = pipeline_config

# From: https://stackoverflow.com/a/40119302
try:
reload # Python 2.7
except NameError:
try:
from importlib import reload # Python 3.4+
except ImportError:
from imp import reload # Python 3.0 - 3.3

# ok we got the parent location
# prepend this to the python path and reload the module
# this way we will load the 'real' tank!
Expand Down
9 changes: 9 additions & 0 deletions setup/tank_api_proxy/tank/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@
pipeline_config = os.path.abspath(pipeline_config)
os.environ["TANK_CURRENT_PC"] = pipeline_config

# From: https://stackoverflow.com/a/40119302
try:
reload # Python 2.7
except NameError:
try:
from importlib import reload # Python 3.4+
except ImportError:
from imp import reload # Python 3.0 - 3.3

# ok we got the parent location
# prepend this to the python path and reload the module
# this way we will load the 'real' tank!
Expand Down