diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-11-30 12:46:45 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-11-30 12:46:45 -0500 |
| commit | d5fd26b836afb85ffbb2d4749660d4895090d620 (patch) | |
| tree | f13482971905adaf916696988f92e4de4450d2d9 /lib/sqlalchemy/ext | |
| parent | 2c5ba60269c835fba61ff7e8aadfbad1e3edd1b8 (diff) | |
| parent | 58f73d2278393d813c7f39736fc96c5086f18f6d (diff) | |
| download | sqlalchemy-d5fd26b836afb85ffbb2d4749660d4895090d620.tar.gz | |
Merge remote-tracking branch 'origin/pr/212'
Diffstat (limited to 'lib/sqlalchemy/ext')
| -rw-r--r-- | lib/sqlalchemy/ext/declarative/clsregistry.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/declarative/clsregistry.py b/lib/sqlalchemy/ext/declarative/clsregistry.py index c3887d6cf..050923980 100644 --- a/lib/sqlalchemy/ext/declarative/clsregistry.py +++ b/lib/sqlalchemy/ext/declarative/clsregistry.py @@ -321,7 +321,8 @@ def _deferred_relationship(cls, prop): key, kwargs = prop.backref for attr in ('primaryjoin', 'secondaryjoin', 'secondary', 'foreign_keys', 'remote_side', 'order_by'): - if attr in kwargs and isinstance(kwargs[attr], str): + if attr in kwargs and isinstance(kwargs[attr], + util.string_types): kwargs[attr] = resolve_arg(kwargs[attr]) return prop |