From e2e03bd5e2ae69c97ae9bbf854632c194124cb9d Mon Sep 17 00:00:00 2001 From: Josh Friend Date: Sat, 13 Dec 2014 13:23:16 -0500 Subject: [PATCH] fix import of colour package --- sqlalchemy_utils/types/color.py | 3 ++- tests/types/test_color.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sqlalchemy_utils/types/color.py b/sqlalchemy_utils/types/color.py index 21f9c2a..dbe743f 100644 --- a/sqlalchemy_utils/types/color.py +++ b/sqlalchemy_utils/types/color.py @@ -5,7 +5,8 @@ from .scalar_coercible import ScalarCoercible colour = None try: - from colour import Colour as python_colour_type + import colour + python_colour_type = colour.Color except ImportError: python_colour_type = None diff --git a/tests/types/test_color.py b/tests/types/test_color.py index 5d970b1..5af476b 100644 --- a/tests/types/test_color.py +++ b/tests/types/test_color.py @@ -6,7 +6,7 @@ from sqlalchemy_utils.types import color from tests import TestCase -@mark.skipif('color.colour is None') +@mark.skipif('color.python_colour_type is None') class TestColorType(TestCase): def create_models(self): class Document(self.Base):