diff options
| author | Sławek Ehlert <slafs@op.pl> | 2015-01-27 22:04:38 +0100 |
|---|---|---|
| committer | Sławek Ehlert <slafs@op.pl> | 2015-01-27 22:04:38 +0100 |
| commit | 57b2bd5dcba6140b511c898c0f682234f13d5c51 (patch) | |
| tree | a0899b2a35d27e177001b163054c3c9a8f7f1c06 /lib/sqlalchemy/ext/declarative/base.py | |
| parent | 6a1f16d09958e549502a0991890d64964c71b357 (diff) | |
| parent | 8aaa8dd6bdfb85fa481efa3115b9080d935d344c (diff) | |
| download | sqlalchemy-pr/152.tar.gz | |
Merge branch 'master' into oracle-servicename-optionpr/152
Diffstat (limited to 'lib/sqlalchemy/ext/declarative/base.py')
| -rw-r--r-- | lib/sqlalchemy/ext/declarative/base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/declarative/base.py b/lib/sqlalchemy/ext/declarative/base.py index 291608b6c..6735abf4c 100644 --- a/lib/sqlalchemy/ext/declarative/base.py +++ b/lib/sqlalchemy/ext/declarative/base.py @@ -278,7 +278,7 @@ class _MapperConfig(object): elif not isinstance(value, (Column, MapperProperty)): # using @declared_attr for some object that # isn't Column/MapperProperty; remove from the dict_ - # and place the evaulated value onto the class. + # and place the evaluated value onto the class. if not k.startswith('__'): dict_.pop(k) setattr(cls, k, value) |