Skip to content
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

SG-37774 Remove Python 2 traces #133

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

SG-37774 Remove Python 2 traces #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40d400e
Remove Python 2 traces
carlos-villavicencio-adsk Jan 7, 2025
adf925c
Reverts some stuff
carlos-villavicencio-adsk Jan 7, 2025
795d488
Revert some stuff
carlos-villavicencio-adsk Jan 7, 2025
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
2 changes: 1 addition & 1 deletion python/shotgun_desktop/errors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def __init__(self, reason, toolkit_path):

class EngineNotCompatibleWithDesktop16(ShotgunDesktopError):
def __init__(self, app_version):
super(EngineNotCompatibleWithDesktop16, self).__init__(
super().__init__(
"Your version of tk-desktop is not compatible with this PTR desktop app {}.\n"
"\n"
"Please upgrade your site configuration's tk-desktop to v2.5.9+ or "
Expand Down
2 changes: 1 addition & 1 deletion python/shotgun_desktop/paths.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import os
import sys
from tank_vendor.six.moves.urllib import parse
from urllib import parse
import pprint
import sgtk

Expand Down
13 changes: 0 additions & 13 deletions python/shotgun_desktop/startup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
# agreement to the Shotgun Pipeline Toolkit Source Code License. All rights
# not expressly granted therein are reserved by Shotgun Software Inc.

from __future__ import absolute_import

import os
import sys
import time
Expand Down Expand Up @@ -552,17 +550,6 @@ def __start_engine_in_zero_config(app, app_bootstrap, splash, user):

mgr = sgtk.bootstrap.ToolkitManager(user)

# If 'SHOTGUN_PYTHON_VERSION' environment variable has been set, but at this point
# we are running in Python 3 we should warn the user that this will have no
# effect as there is no Python 2 version available.
if str(os.environ.get("SHOTGUN_PYTHON_VERSION")) == "2" and sys.version_info[0] > 2:
DesktopMessageBox.critical(
"Flow Production Tracking Warning",
"{constant} will have no effect because there's not Python 2 available version.\n".format(
constant="SHOTGUN_PYTHON_VERSION"
),
)

julien-lang marked this conversation as resolved.
Show resolved Hide resolved
# Allows to take over the site config to use with Desktop without impacting the projects
# configurations.
mgr.base_configuration = os.environ.get(
Expand Down