From bce3ffc3412737eae51cfe2ba231c6d1366a7d16 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 23 Sep 2012 13:09:43 -0400 Subject: - use our new Cls.memoized_name._reset(self) method in place of all those __dict__.pop(), remove reset_memoized --- lib/sqlalchemy/sql/expression.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/sqlalchemy/sql/expression.py') 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 -- cgit v1.2.1