diff options
| author | Julien Castets <jcastets@ocs.online.net> | 2015-03-16 11:45:06 +0100 |
|---|---|---|
| committer | Julien Castets <jcastets@ocs.online.net> | 2015-03-16 16:23:14 +0100 |
| commit | edfe2deffb7a3ab637e5ee7ab3379911483380fa (patch) | |
| tree | 40636b89fd30161303b3afaa93763d62495fe7d8 /lib/sqlalchemy/orm | |
| parent | 3f23e65dabab7ef4c7cf305a9e07e6cb05aba801 (diff) | |
| download | sqlalchemy-pr/160.tar.gz | |
Accept unicode in CascadeOptionspr/160
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/util.py | 2 |
1 files changed, 1 insertions, 1 deletions
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): |