openstack/deb-python-sqlalchemy-utils
Code Issues Proposed changes

dont assume presence of colour package (fixes #104)

Browse Source
This commit is contained in:
Josh Friend
2014-12-13 11:06:24 -05:00
parent 6f3af3ee75
commit 9615390c51
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sqlalchemy_utils/types/color.py
View File

@@ -5,9 +5,9 @@ from .scalar_coercible import ScalarCoercible
colour = None colour = None
try: try:
import colour from colour import Colour as python_colour_type
except ImportError: except ImportError:
pass python_colour_type = None
class ColorType(types.TypeDecorator, ScalarCoercible): class ColorType(types.TypeDecorator, ScalarCoercible):
@@ -49,7 +49,7 @@ class ColorType(types.TypeDecorator, ScalarCoercible):
""" """
STORE_FORMAT = u'hex' STORE_FORMAT = u'hex'
impl = types.Unicode(20) impl = types.Unicode(20)
python_type = colour.Color python_type = python_colour_type
def __init__(self, max_length=20, *args, **kwargs): def __init__(self, max_length=20, *args, **kwargs):
# Fail if colour is not found. # Fail if colour is not found.