Merge branch 'develop' into enhancement/OP-2930_New-publisher-Develop-docs

This commit is contained in:
Jakub Trllo 2022-03-24 14:35:46 +01:00
commit 1cc2a7db16
3 changed files with 8 additions and 6 deletions

View file

@ -210,6 +210,9 @@ class IntegrateSlackAPI(pyblish.api.InstancePlugin):
# You will get a SlackApiError if "ok" is False
error_str = self._enrich_error(str(e.response["error"]), channel)
self.log.warning("Error happened {}".format(error_str))
except Exception as e:
error_str = self._enrich_error(str(e), channel)
self.log.warning("Not SlackAPI error", exc_info=True)
return None, []

View file

@ -115,10 +115,8 @@ def discover_inventory_actions():
filtered_actions = []
for action in actions:
if action is not InventoryAction:
print("DISCOVERED", action)
filtered_actions.append(action)
else:
print("GOT SOURCE")
return filtered_actions

View file

@ -4,11 +4,12 @@ from Qt import QtWidgets, QtCore
import qtawesome
from bson.objectid import ObjectId
from avalon import io, pipeline
from openpype.pipeline import (
from avalon import io
from openpype.pipeline.load import (
discover_loader_plugins,
switch_container,
get_repres_contexts,
loaders_from_repre_context,
)
from .widgets import (
@ -370,7 +371,7 @@ class SwitchAssetDialog(QtWidgets.QDialog):
loaders = None
for repre_context in repre_contexts.values():
_loaders = set(pipeline.loaders_from_repre_context(
_loaders = set(loaders_from_repre_context(
available_loaders, repre_context
))
if loaders is None: