summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/util.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-02-11 20:33:56 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2012-02-11 20:33:56 -0500
commitd934ea23e24880a5c784c9e5edf9ead5bc965a83 (patch)
tree788952f0c7e2ce44b2403ad3ab545257b6e94b77 /lib/sqlalchemy/sql/util.py
parent0634ea79b1a23a8b88c886a8a3f434ed300691e2 (diff)
downloadsqlalchemy-d934ea23e24880a5c784c9e5edf9ead5bc965a83.tar.gz
- figured out again why deannotate must clone()
- got everything working. just need to update error strings
Diffstat (limited to 'lib/sqlalchemy/sql/util.py')
-rw-r--r--lib/sqlalchemy/sql/util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index e4e2c00e1..2862e9af9 100644
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -424,7 +424,7 @@ class Annotated(object):
clone._annotations = values
return clone
- def _deannotate(self, values=None):
+ def _deannotate(self, values=None, clone=True):
if values is None:
return self.__element
else:
@@ -498,7 +498,7 @@ def _deep_deannotate(element, values=None):
"""Deep copy the given element, removing annotations."""
def clone(elem):
- elem = elem._deannotate(values=values)
+ elem = elem._deannotate(values=values, clone=True)
elem._copy_internals(clone=clone)
return elem