From 754025271c447cb596cf4e29a302bfc13d3ac527 Mon Sep 17 00:00:00 2001 From: NateScarlet Date: Wed, 7 Mar 2018 14:42:03 +0800 Subject: [PATCH 1/2] Bugfix about unicode label. --- pyblish_lite/model.py | 8 +++++--- tests/test_model.py | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pyblish_lite/model.py b/pyblish_lite/model.py index d819f60..09d1a57 100644 --- a/pyblish_lite/model.py +++ b/pyblish_lite/model.py @@ -27,6 +27,7 @@ from . import settings from .awesome import tags as awesome from .vendor.Qt import QtCore, __binding__ +from .vendor.six import text_type # GENERAL @@ -467,7 +468,7 @@ def setData(self, index, value, role): def update_with_result(self, result): for record in result["records"]: self.append({ - "label": str(record.msg), + "label": text_type(record.msg), "type": "record", # Native @@ -485,7 +486,7 @@ def update_with_result(self, result): if error is not None: fname, line_no, func, exc = error.traceback self.append({ - "label": str(error), + "label": text_type(error), "type": "error", "fname": fname, "line_number": line_no, @@ -642,7 +643,8 @@ def filterAcceptsRow(self, source_row, source_parent): # --- Check if any family assigned to the plugin is in allowed families for role, values in self.includes.items(): - includes_list = [([x] if isinstance(x, (list, tuple)) else x) for x in getattr(item, role, None)] + includes_list = [([x] if isinstance(x, (list, tuple)) else x) + for x in getattr(item, role, None)] return any(include in values for include in includes_list) for role, values in self.excludes.items(): diff --git a/tests/test_model.py b/tests/test_model.py index 5827f67..4686551 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1,3 +1,4 @@ +# -*- coding=UTF-8 -*- import logging from pyblish_lite import model @@ -16,6 +17,7 @@ def test_label_nonstring(): {"a": "dict"}, list(), 1.0, + u'测试', ) ], "error": None From 8832c25f00b4d7c09c6a4ffd5eff13d2ab042847 Mon Sep 17 00:00:00 2001 From: Marcus Ottosson Date: Wed, 7 Mar 2018 07:28:41 +0000 Subject: [PATCH 2/2] Version bump --- pyblish_lite/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyblish_lite/version.py b/pyblish_lite/version.py index 1004c19..18ad251 100644 --- a/pyblish_lite/version.py +++ b/pyblish_lite/version.py @@ -1,7 +1,7 @@ VERSION_MAJOR = 0 VERSION_MINOR = 7 -VERSION_PATCH = 4 +VERSION_PATCH = 5 version_info = (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)