From 4dcc11c3db1f6e26b732dfa0769297149e528d2b Mon Sep 17 00:00:00 2001 From: Ryan Leckey Date: Wed, 29 Oct 2014 19:08:59 -0700 Subject: [PATCH] Add support for 'python_type' to 'ColorType' --- sqlalchemy_utils/types/color.py | 1 + sqlalchemy_utils/types/encrypted.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sqlalchemy_utils/types/color.py b/sqlalchemy_utils/types/color.py index 1d4624b..0064243 100644 --- a/sqlalchemy_utils/types/color.py +++ b/sqlalchemy_utils/types/color.py @@ -49,6 +49,7 @@ class ColorType(types.TypeDecorator, ScalarCoercible): """ STORE_FORMAT = u'hex' impl = types.Unicode(20) + python_type = colour.Color def __init__(self, max_length=20, *args, **kwargs): # Fail if colour is not found. diff --git a/sqlalchemy_utils/types/encrypted.py b/sqlalchemy_utils/types/encrypted.py index 6b9579a..aa1506f 100644 --- a/sqlalchemy_utils/types/encrypted.py +++ b/sqlalchemy_utils/types/encrypted.py @@ -23,7 +23,7 @@ class EncryptionDecryptionBaseEngine(object): This class must be sub-classed in order to create new engines. """ - + def _update_key(self, key): if isinstance(key, six.string_types): key = six.b(key) @@ -208,7 +208,7 @@ class EncryptedType(TypeDecorator): self._key = value def _update_key(self): - key = self._key() if callable(self._key) else self._key + key = self._key() if callable(self._key) else self._key self.engine._update_key(key) def process_bind_param(self, value, dialect):