diff options
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/util.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index f00926e4d..63b1a4037 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -1604,8 +1604,8 @@ class ClauseElement(Visitable): """ c = self.__class__.__new__(self.__class__) c.__dict__ = self.__dict__.copy() - c.__dict__.pop('_cloned_set', None) - c.__dict__.pop('comparator', None) + ClauseElement._cloned_set._reset(c) + ColumnElement.comparator._reset(c) # this is a marker that helps to "equate" clauses to each other # when a Select returns its list of FROM clauses. the cloning @@ -2410,7 +2410,7 @@ class ColumnCollection(util.OrderedProperties): # pop out memoized proxy_set as this # operation may very well be occurring # in a _make_proxy operation - value.__dict__.pop('proxy_set', None) + ColumnElement.proxy_set._reset(value) self._all_cols.add(value) self._data[key] = value @@ -3432,7 +3432,7 @@ class FunctionElement(Executable, ColumnElement, FromClause): def _copy_internals(self, clone=_clone, **kw): self.clause_expr = clone(self.clause_expr, **kw) self._reset_exported() - util.reset_memoized(self, 'clauses') + FunctionElement.clauses._reset(self) def select(self): """Produce a :func:`~.expression.select` construct diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index 35761def1..70ea4c751 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -420,7 +420,7 @@ class Annotated(object): element.c self.__dict__ = element.__dict__.copy() - self.__dict__.pop('comparator', None) + expression.ColumnElement.comparator._reset(self) self.__element = element self._annotations = values @@ -432,7 +432,7 @@ class Annotated(object): def _with_annotations(self, values): clone = self.__class__.__new__(self.__class__) clone.__dict__ = self.__dict__.copy() - clone.__dict__.pop('comparator', None) + expression.ColumnElement.comparator._reset(self) clone._annotations = values return clone |