From edfe2deffb7a3ab637e5ee7ab3379911483380fa Mon Sep 17 00:00:00 2001 From: Julien Castets Date: Mon, 16 Mar 2015 11:45:06 +0100 Subject: Accept unicode in CascadeOptions --- lib/sqlalchemy/orm/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/sqlalchemy/orm') diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py index 9787b0fb4..ad071376d 100644 --- a/lib/sqlalchemy/orm/util.py +++ b/lib/sqlalchemy/orm/util.py @@ -35,7 +35,7 @@ class CascadeOptions(frozenset): 'expunge', 'delete_orphan') def __new__(cls, value_list): - if isinstance(value_list, str) or value_list is None: + if isinstance(value_list, util.string_types) or value_list is None: return cls.from_string(value_list) values = set(value_list) if values.difference(cls._allowed_cascades): -- cgit v1.2.1