- Removed 2.3 set emulations/enhancements.

  (sets.Set-based collections & DB-API returns still work.)

5 files changed, 28 insertions, 28 deletions

diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index f21badf21..044e5d5fe 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -23,7 +23,7 @@ from sqlalchemy import schema, engine, util, exc
 from sqlalchemy.sql import operators, functions
 from sqlalchemy.sql import expression as sql
 
-RESERVED_WORDS = util.Set([
+RESERVED_WORDS = set([
     'all', 'analyse', 'analyze', 'and', 'any', 'array',
     'as', 'asc', 'asymmetric', 'authorization', 'between',
     'binary', 'both', 'case', 'cast', 'check', 'collate',
@@ -491,7 +491,7 @@ class DefaultCompiler(engine.Compiled):
 
         froms = select._get_display_froms(existingfroms)
 
-        correlate_froms = util.Set(sql._from_objects(*froms))
+        correlate_froms = set(sql._from_objects(*froms))
 
         # TODO: might want to propigate existing froms for select(select(select))
         # where innermost select should correlate to outermost
@@ -610,7 +610,7 @@ class DefaultCompiler(engine.Compiled):
                  ', '.join(c[1] for c in colparams)))
 
     def visit_update(self, update_stmt):
-        self.stack.append({'from':util.Set([update_stmt.table])})
+        self.stack.append({'from': set([update_stmt.table])})
 
         self.isupdate = True
         colparams = self._get_colparams(update_stmt)
@@ -716,7 +716,7 @@ class DefaultCompiler(engine.Compiled):
         return values
 
     def visit_delete(self, delete_stmt):
-        self.stack.append({'from':util.Set([delete_stmt.table])})
+        self.stack.append({'from': set([delete_stmt.table])})
         self.isdelete = True
 
         text = "DELETE FROM " + self.preparer.format_table(delete_stmt.table)
@@ -770,7 +770,7 @@ class SchemaGenerator(DDLBase):
     def __init__(self, dialect, connection, checkfirst=False, tables=None, **kwargs):
         super(SchemaGenerator, self).__init__(connection, **kwargs)
         self.checkfirst = checkfirst
-        self.tables = tables and util.Set(tables) or None
+        self.tables = tables and set(tables) or None
         self.preparer = dialect.identifier_preparer
         self.dialect = dialect
 
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 223739101..fb989dee0 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -867,7 +867,7 @@ def _cloned_intersection(a, b):
     The returned set is in terms of the enties present within 'a'.
     
     """
-    all_overlap = util.Set(_expand_cloned(a)).intersection(_expand_cloned(b))
+    all_overlap = set(_expand_cloned(a)).intersection(_expand_cloned(b))
     return a.intersection(
         [
             elem for elem in a if all_overlap.intersection(elem._cloned_set)
@@ -1501,14 +1501,14 @@ class ColumnElement(ClauseElement, _CompareMixin):
     
     def base_columns(self):
         if not hasattr(self, '_base_columns'):
-            self._base_columns = util.Set(c for c in self.proxy_set
-                                          if not hasattr(c, 'proxies'))
+            self._base_columns = set(c for c in self.proxy_set
+                                     if not hasattr(c, 'proxies'))
         return self._base_columns
     base_columns = property(base_columns)
 
     def proxy_set(self):
         if not hasattr(self, '_proxy_set'):
-            s = util.Set([self])
+            s = set([self])
             if hasattr(self, 'proxies'):
                 for c in self.proxies:
                     s.update(c.proxy_set)
@@ -1637,7 +1637,7 @@ class ColumnCollection(util.OrderedProperties):
         # have to use a Set here, because it will compare the identity
         # of the column, not just using "==" for comparison which will always return a
         # "True" value (i.e. a BinaryClause...)
-        return col in util.Set(self)
+        return col in set(self)
 
 class ColumnSet(util.OrderedSet):
     def contains_column(self, col):
@@ -1712,7 +1712,7 @@ class FromClause(Selectable):
 
         An example would be an Alias of a Table is derived from that Table.
         """
-        return fromclause in util.Set(self._cloned_set)
+        return fromclause in set(self._cloned_set)
 
     def replace_selectable(self, old, alias):
         """replace all occurences of FromClause 'old' with the given Alias object, returning a copy of this ``FromClause``."""
@@ -1805,7 +1805,7 @@ class FromClause(Selectable):
             return
         self._columns = ColumnCollection()
         self._primary_key = ColumnSet()
-        self._foreign_keys = util.Set()
+        self._foreign_keys = set()
         self._oid_column = None
         self._populate_column_collection()
 
@@ -2422,7 +2422,7 @@ class Alias(FromClause):
     description = property(description)
 
     def is_derived_from(self, fromclause):
-        if fromclause in util.Set(self._cloned_set):
+        if fromclause in set(self._cloned_set):
             return True
         return self.element.is_derived_from(fromclause)
 
@@ -2681,7 +2681,7 @@ class TableClause(_Immutable, FromClause):
         self._oid_column = _ColumnClause('oid', self, _is_oid=True)
         self._columns = ColumnCollection()
         self._primary_key = ColumnSet()
-        self._foreign_keys = util.Set()
+        self._foreign_keys = set()
         for c in columns:
             self.append_column(c)
         
@@ -2963,7 +2963,7 @@ class Select(_SelectBaseMixin, FromClause):
         self._should_correlate = correlate
         self._distinct = distinct
 
-        self._correlate = util.Set()
+        self._correlate = set()
         self._froms = util.OrderedSet()
 
         if columns:
@@ -3059,7 +3059,7 @@ class Select(_SelectBaseMixin, FromClause):
     inner_columns = property(inner_columns)
 
     def is_derived_from(self, fromclause):
-        if self in util.Set(fromclause._cloned_set):
+        if self in set(fromclause._cloned_set):
             return True
         
         for f in self.locate_all_froms():
@@ -3071,8 +3071,8 @@ class Select(_SelectBaseMixin, FromClause):
         self._reset_exported()
         from_cloned = dict((f, clone(f))
                            for f in self._froms.union(self._correlate))
-        self._froms = util.Set(from_cloned[f] for f in self._froms)
-        self._correlate = util.Set(from_cloned[f] for f in self._correlate)
+        self._froms = set(from_cloned[f] for f in self._froms)
+        self._correlate = set(from_cloned[f] for f in self._correlate)
         self._raw_columns = [clone(c) for c in self._raw_columns]
         for attr in ('_whereclause', '_having', '_order_by_clause', '_group_by_clause'):
             if getattr(self, attr) is not None:
@@ -3168,7 +3168,7 @@ class Select(_SelectBaseMixin, FromClause):
         s = self._generate()
         s._should_correlate = False
         if fromclauses == (None,):
-            s._correlate = util.Set()
+            s._correlate = set()
         else:
             s._correlate = s._correlate.union(fromclauses)
         return s
diff --git a/lib/sqlalchemy/sql/operators.py b/lib/sqlalchemy/sql/operators.py
index 37070a451..cc96f2e64 100644
--- a/lib/sqlalchemy/sql/operators.py
+++ b/lib/sqlalchemy/sql/operators.py
@@ -5,7 +5,7 @@
 
 from operator import and_, or_, inv, add, mul, sub, div, mod, truediv, \
      lt, le, ne, gt, ge, eq
-from sqlalchemy.util import Set, symbol
+from sqlalchemy.util import symbol
 
 def from_():
     raise NotImplementedError()
@@ -76,7 +76,7 @@ def desc_op(a):
 def asc_op(a):
     return a.asc()
 
-_commutative = Set([eq, ne, add, mul])
+_commutative = set([eq, ne, add, mul])
 def is_commutative(op):
     return op in _commutative
 
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index d7a0d0502..c09744393 100644
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -64,7 +64,7 @@ def find_tables(clause, check_columns=False, include_aliases=False, include_join
 def find_columns(clause):
     """locate Column objects within the given expression."""
     
-    cols = util.Set()
+    cols = set()
     def visit_column(col):
         cols.add(col)
     visitors.traverse(clause, {}, {'column':visit_column})
@@ -82,7 +82,7 @@ def join_condition(a, b, ignore_nonexistent_tables=False):
     
     """
     crit = []
-    constraints = util.Set()
+    constraints = set()
     for fk in b.foreign_keys:
         try:
             col = fk.get_referent(a)
@@ -212,7 +212,7 @@ def reduce_columns(columns, *clauses):
 
     columns = util.OrderedSet(columns)
 
-    omit = util.Set()
+    omit = set()
     for col in columns:
         for fk in col.foreign_keys:
             for c in columns:
@@ -225,7 +225,7 @@ def reduce_columns(columns, *clauses):
     if clauses:
         def visit_binary(binary):
             if binary.operator == operators.eq:
-                cols = util.Set(chain(*[c.proxy_set for c in columns.difference(omit)]))
+                cols = set(chain(*[c.proxy_set for c in columns.difference(omit)]))
                 if binary.left in cols and binary.right in cols:
                     for c in columns:
                         if c.shares_lineage(binary.right):
@@ -279,7 +279,7 @@ def folded_equivalents(join, equivs=None):
 
     """
     if equivs is None:
-        equivs = util.Set()
+        equivs = set()
     def visit_binary(binary):
         if binary.operator == operators.eq and binary.left.name == binary.right.name:
             equivs.add(binary.right)
@@ -294,7 +294,7 @@ def folded_equivalents(join, equivs=None):
         right = folded_equivalents(join.right, equivs)
     else:
         right = list(join.right.columns)
-    used = util.Set()
+    used = set()
     for c in left + right:
         if c in equivs:
             if c.name not in used:
diff --git a/lib/sqlalchemy/sql/visitors.py b/lib/sqlalchemy/sql/visitors.py
index 738dae9c7..2106522d2 100644
--- a/lib/sqlalchemy/sql/visitors.py
+++ b/lib/sqlalchemy/sql/visitors.py
@@ -154,7 +154,7 @@ def cloned_traverse(obj, opts, visitors):
 
 def replacement_traverse(obj, opts, replace):
     cloned = {}
-    stop_on = util.Set(opts.get('stop_on', []))
+    stop_on = set(opts.get('stop_on', []))
 
     def clone(element):
         newelem = replace(element)