Reorganization of tank_vendor to support "vendor-less" shotgun-api3

hooks/process_folder_creation.py

@@ -17,7 +17,7 @@
 import os
 import sys
 import shutil
-from tank_vendor import six
+from tank_vendor.third_party import six
 from tank.util import is_windows
 
 

hooks/process_folder_name.py

@@ -26,7 +26,7 @@
 
 from tank import Hook
 import re
-from tank_vendor import six
+from tank_vendor.third_party import six
 
 
 class ProcessFolderName(Hook):

python/tank/api.py

@@ -26,8 +26,8 @@
 from . import pipelineconfig_utils
 from . import pipelineconfig_factory
 from . import LogManager
-from tank_vendor import six
-from tank_vendor.six.moves import zip
+from tank_vendor.third_party import six
+from tank_vendor.third_party.six.moves import zip
 
 log = LogManager.get_logger(__name__)
 

python/tank/authentication/console_authentication.py

@@ -28,14 +28,14 @@
     AuthenticationCancelled,
     ConsoleLoginNotSupportedError,
 )
-from tank_vendor.shotgun_api3 import MissingTwoFactorAuthenticationFault
+from tank_vendor.third_party.shotgun_api3 import MissingTwoFactorAuthenticationFault
 from . import site_info
 from . import unified_login_flow2
 from ..util.shotgun.connection import sanitize_url
 
 from getpass import getpass
 import webbrowser
-from tank_vendor.six.moves import input
+from tank_vendor.third_party.six.moves import input
 
 logger = LogManager.get_logger(__name__)
 

python/tank/authentication/login_dialog.py

@@ -19,8 +19,8 @@
 """
 import os
 import sys
-from tank_vendor import shotgun_api3
-from tank_vendor import six
+from tank_vendor.third_party import shotgun_api3
+from tank_vendor.third_party import six
 from .. import constants
 from .web_login_support import get_shotgun_authenticator_support_web_login
 from .ui import resources_rc  # noqa

python/tank/authentication/session_cache.py

@@ -22,13 +22,13 @@
 from __future__ import with_statement
 import os
 import socket
-from tank_vendor.shotgun_api3 import (
+from tank_vendor.third_party.shotgun_api3 import (
     Shotgun,
     AuthenticationFault,
     ProtocolError,
     MissingTwoFactorAuthenticationFault,
 )
-from tank_vendor.shotgun_api3.lib import httplib2
+from tank_vendor.third_party import httplib2
 from tank_vendor import yaml
 from . import constants
 from .errors import AuthenticationError

python/tank/authentication/shotgun_wrapper.py

@@ -15,10 +15,10 @@
 at any point.
 --------------------------------------------------------------------------------
 """
-from tank_vendor.six.moves import http_client
+from tank_vendor.third_party.six.moves import http_client
 
-from tank_vendor.shotgun_api3 import Shotgun, AuthenticationFault
-from tank_vendor.six.moves.xmlrpc_client import ProtocolError
+from tank_vendor.third_party.shotgun_api3 import Shotgun, AuthenticationFault
+from tank_vendor.third_party.six.moves.xmlrpc_client import ProtocolError
 from . import interactive_authentication, session_cache
 from .. import LogManager
 

python/tank/authentication/site_info.py

@@ -13,7 +13,7 @@
 
 from . import utils
 
-from tank_vendor import shotgun_api3
+from tank_vendor.third_party import shotgun_api3
 
 from .. import LogManager
 

python/tank/authentication/sso_saml2/core/sso_saml2_core.py

@@ -49,7 +49,7 @@
     # environment.
     UsernamePasswordDialog = None
 
-from tank_vendor.six.moves.urllib.parse import urlencode
+from tank_vendor.third_party.six.moves.urllib.parse import urlencode
 
 # Error messages for events.
 HTTP_CANT_CONNECT_TO_SHOTGUN = "Cannot Connect To SG site."

python/tank/authentication/unified_login_flow2.py

@@ -16,8 +16,8 @@
 import time
 
 import tank
-from tank_vendor import six
-from tank_vendor.six.moves import http_client, urllib
+from tank_vendor.third_party import six
+from tank_vendor.third_party.six.moves import http_client, urllib
 
 from . import errors
 from .. import platform as sgtk_platform

python/tank/authentication/user_impl.py

@@ -20,9 +20,13 @@
 """
 
 from .shotgun_wrapper import ShotgunWrapper
-from tank_vendor.shotgun_api3 import Shotgun, AuthenticationFault, ProtocolError
-from tank_vendor import six
-from tank_vendor.six.moves import http_client
+from tank_vendor.third_party.shotgun_api3 import (
+    Shotgun,
+    AuthenticationFault,
+    ProtocolError,
+)
+from tank_vendor.third_party import six
+from tank_vendor.third_party.six.moves import http_client
 
 from . import session_cache
 from .errors import IncompleteCredentials, UnresolvableHumanUser, UnresolvableScriptUser

python/tank/commands/core_localize.py

@@ -22,8 +22,8 @@
 from .action_base import Action
 from .. import pipelineconfig_utils
 from .. import pipelineconfig_factory
-from tank_vendor import six
-from tank_vendor.shotgun_api3.lib import sgsix
+from tank_vendor.third_party import six
+from tank_vendor import sgsix
 
 # these are the items that need to be copied across
 # when a configuration is upgraded to contain a core API

python/tank/commands/dump_config.py

@@ -11,7 +11,7 @@
 from __future__ import print_function
 
 import os
-from tank_vendor.six import StringIO
+from tank_vendor.third_party.six import StringIO
 
 from ..errors import TankError
 from .action_base import Action

python/tank/commands/get_entity_commands.py

@@ -16,7 +16,7 @@
 import itertools
 import operator
 import os
-from tank_vendor.shotgun_api3.lib import sgsix
+from tank_vendor import sgsix
 
 
 def execute_tank_command(pipeline_config_path, args):

python/tank/commands/interaction.py

@@ -14,7 +14,7 @@
 
 from __future__ import print_function
 from .. import LogManager
-from tank_vendor.six.moves import input
+from tank_vendor.third_party.six.moves import input
 
 
 log = LogManager.get_logger(__name__)

python/tank/commands/move_pc.py

@@ -15,8 +15,8 @@
 
 import os
 import shutil
-from tank_vendor.shotgun_api3.lib import sgsix
-from tank_vendor.six.moves import input
+from tank_vendor import sgsix
+from tank_vendor.third_party.six.moves import input
 
 
 class MovePCAction(Action):

python/tank/commands/path_cache.py

@@ -17,7 +17,7 @@
 from .. import folder
 
 from .action_base import Action
-from tank_vendor.six.moves import input
+from tank_vendor.third_party.six.moves import input
 
 
 class SynchronizePathCache(Action):

python/tank/commands/push_pc.py

@@ -22,7 +22,7 @@
 import os
 import datetime
 import shutil
-from tank_vendor.six.moves import input
+from tank_vendor.third_party.six.moves import input
 
 # Core configuration files which are associated with the core API installation and not
 # the pipeline configuration.

python/tank/commands/setup_project.py

@@ -27,8 +27,8 @@
 from .setup_project_core import run_project_setup
 from .setup_project_params import ProjectSetupParameters
 from .interaction import YesToEverythingInteraction
-from tank_vendor.shotgun_api3.lib import sgsix
-from tank_vendor.six.moves import input
+from tank_vendor import sgsix
+from tank_vendor.third_party.six.moves import input
 
 
 class SetupProjectAction(Action):

python/tank/commands/setup_project_core.py

@@ -19,7 +19,7 @@
 from ..api import sgtk_from_path
 
 from tank_vendor import yaml
-from tank_vendor.shotgun_api3.lib import sgsix
+from tank_vendor import sgsix
 
 
 @filesystem.with_cleared_umask

python/tank/commands/setup_project_params.py

@@ -30,7 +30,7 @@
 from tank_vendor import yaml
 
 from ..util import ShotgunPath
-from tank_vendor.shotgun_api3.lib import sgsix
+from tank_vendor import sgsix
 
 
 class ProjectSetupParameters(object):

python/tank/commands/setup_project_wizard.py

@@ -22,7 +22,7 @@
 from .setup_project_core import run_project_setup
 from .setup_project_params import ProjectSetupParameters
 from .interaction import YesToEverythingInteraction
-from tank_vendor.shotgun_api3.lib import sgsix
+from tank_vendor import sgsix
 
 
 class SetupProjectFactoryAction(Action):

python/tank/commands/unregister_folders.py

@@ -16,7 +16,7 @@
 from .. import path_cache
 from .action_base import Action
 from ..util.login import get_current_user
-from tank_vendor.six.moves import input, zip
+from tank_vendor.third_party.six.moves import input, zip
 
 
 class UnregisterFoldersAction(Action):

python/tank/descriptor/io_descriptor/appstore.py

@@ -13,10 +13,10 @@
 """
 
 import os
-from tank_vendor.six.moves import urllib
+from tank_vendor.third_party.six.moves import urllib
 import fnmatch
-from tank_vendor.six.moves import http_client
-from tank_vendor.shotgun_api3.lib import httplib2
+from tank_vendor.third_party.six.moves import http_client
+from tank_vendor.third_party import httplib2
 
 from ...util import shotgun
 from ...util import pickle
@@ -35,8 +35,8 @@
 from ...constants import SUPPORT_URL
 
 # use api json to cover py 2.5
-from tank_vendor import shotgun_api3
-from tank_vendor import six
+from tank_vendor.third_party import shotgun_api3
+from tank_vendor.third_party import six
 
 json = shotgun_api3.shotgun.json
 

python/tank/descriptor/io_descriptor/base.py

@@ -18,7 +18,7 @@
 from ..errors import TankDescriptorError, TankMissingManifestError
 
 from tank_vendor import yaml
-from tank_vendor.six.moves import map, urllib
+from tank_vendor.third_party.six.moves import map, urllib
 
 log = LogManager.get_logger(__name__)
 

python/tank/descriptor/io_descriptor/factory.py

@@ -14,7 +14,7 @@
 from .base import IODescriptorBase
 
 from ... import LogManager
-from tank_vendor import six
+from tank_vendor.third_party import six
 
 log = LogManager.get_logger(__name__)