From bcf8bf17a521fb8b0643fbc786317bec192bfefb Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 22 Oct 2019 14:02:49 +0200 Subject: [PATCH] session instance validation also checks for process session and raises exception if does not match ftrack_api session --- pype/ftrack/lib/ftrack_base_handler.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pype/ftrack/lib/ftrack_base_handler.py b/pype/ftrack/lib/ftrack_base_handler.py index 9821bfd81f..05c84eea84 100644 --- a/pype/ftrack/lib/ftrack_base_handler.py +++ b/pype/ftrack/lib/ftrack_base_handler.py @@ -32,18 +32,18 @@ class BaseHandler(object): def __init__(self, session, plugins_presets={}): '''Expects a ftrack_api.Session instance''' self.log = Logger().get_logger(self.__class__.__name__) - if not isinstance(session, ftrack_api.session.Session): - self.log.warning(( + if not( + isinstance(session, ftrack_api.session.Session) or + isinstance(session, ProcessSession) + ): + raise Exception(( "Session object entered with args is instance of \"{}\"" - " but expected instance is \"{}\"." + " but expected instances are \"{}\" and \"{}\"" ).format( str(type(session)), - str(ftrack_api.session.Session.__qualname__) + str(ftrack_api.session.Session), + str(ProcessSession) )) - self.register = self.register_without_session - self._session = None - - return self._session = session