rename 'frozendict' to 'immutabledict', since 'frozen' implies hashability

like frozenset which isn't really the purpose of 'immutabledict' (could be someday,
in which case, we'd change the name back :) )

8 files changed, 17 insertions, 17 deletions

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 8de2e2a3a..ccce58b9c 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -1734,7 +1734,7 @@ class Engine(Connectable, log.Identified):
 
     """
 
-    _execution_options = util.frozendict()
+    _execution_options = util.immutabledict()
     Connection = Connection
 
     def __init__(self, pool, dialect, url, 
diff --git a/lib/sqlalchemy/ext/sqlsoup.py b/lib/sqlalchemy/ext/sqlsoup.py
index 9e6f63aca..ded8a35cd 100644
--- a/lib/sqlalchemy/ext/sqlsoup.py
+++ b/lib/sqlalchemy/ext/sqlsoup.py
@@ -620,7 +620,7 @@ class SqlSoup(object):
         self.session.expunge_all()
 
     def map_to(self, attrname, tablename=None, selectable=None, 
-                    schema=None, base=None, mapper_args=util.frozendict()):
+                    schema=None, base=None, mapper_args=util.immutabledict()):
         """Configure a mapping to the given attrname.
 
         This is the "master" method that can be used to create any 
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 596445918..42dd60a2f 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -93,10 +93,10 @@ class Query(object):
     _select_from_entity = None
     _filter_aliases = None
     _from_obj_alias = None
-    _joinpath = _joinpoint = util.frozendict()
-    _execution_options = util.frozendict()
-    _params = util.frozendict()
-    _attributes = util.frozendict()
+    _joinpath = _joinpoint = util.immutabledict()
+    _execution_options = util.immutabledict()
+    _params = util.immutabledict()
+    _attributes = util.immutabledict()
     _with_options = ()
     _with_hints = ()
     _enable_single_crit = True
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 26f607512..cf39d29ac 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -1940,7 +1940,7 @@ class MetaData(SchemaItem):
           ``MetaData``.
 
         """
-        self.tables = util.frozendict()
+        self.tables = util.immutabledict()
         self._schemas = set()
         self.bind = bind
         self.metadata = self
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 8a9d33d55..64274359b 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -2556,7 +2556,7 @@ class Executable(_Generative):
     """
 
     supports_execution = True
-    _execution_options = util.frozendict()
+    _execution_options = util.immutabledict()
 
     @_generative
     def execution_options(self, **kw):
@@ -4003,7 +4003,7 @@ class Select(_SelectBase):
     __visit_name__ = 'select'
 
     _prefixes = ()
-    _hints = util.frozendict()
+    _hints = util.immutabledict()
 
     def __init__(self, 
                 columns, 
@@ -4457,7 +4457,7 @@ class UpdateBase(Executable, ClauseElement):
 
     _execution_options = \
         Executable._execution_options.union({'autocommit': True})
-    kwargs = util.frozendict()
+    kwargs = util.immutabledict()
 
     def _process_colparams(self, parameters):
         if isinstance(parameters, (list, tuple)):
diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index a2ecafaa8..1dcf379a9 100644
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -703,7 +703,7 @@ class _DateAffinity(object):
     def _expression_adaptations(self):
         raise NotImplementedError()
 
-    _blank_dict = util.frozendict()
+    _blank_dict = util.immutabledict()
     def _adapt_expression(self, op, othertype):
         othertype = othertype._type_affinity
         return op, \
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index 6950aa8e6..f4861e5f4 100644
--- a/lib/sqlalchemy/util/__init__.py
+++ b/lib/sqlalchemy/util/__init__.py
@@ -8,7 +8,7 @@ from compat import callable, cmp, reduce, defaultdict, py25_dict, \
     threading, py3k, jython, win32, set_types, buffer, pickle, \
     update_wrapper, partial, md5_hex, decode_slice, dottedgetter
 
-from _collections import NamedTuple, ImmutableContainer, frozendict, \
+from _collections import NamedTuple, ImmutableContainer, immutabledict, \
     Properties, OrderedProperties, ImmutableProperties, OrderedDict, \
     OrderedSet, IdentitySet, OrderedIdentitySet, column_set, \
     column_dict, ordered_column_set, populate_column_dict, unique_list, \
diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index 269a3d539..3adbf9913 100644
--- a/lib/sqlalchemy/util/_collections.py
+++ b/lib/sqlalchemy/util/_collections.py
@@ -39,7 +39,7 @@ class ImmutableContainer(object):
 
     __delitem__ = __setitem__ = __setattr__ = _immutable
 
-class frozendict(ImmutableContainer, dict):
+class immutabledict(ImmutableContainer, dict):
 
     clear = pop = popitem = setdefault = \
         update = ImmutableContainer._immutable
@@ -53,18 +53,18 @@ class frozendict(ImmutableContainer, dict):
         pass
 
     def __reduce__(self):
-        return frozendict, (dict(self), )
+        return immutabledict, (dict(self), )
 
     def union(self, d):
         if not self:
-            return frozendict(d)
+            return immutabledict(d)
         else:
-            d2 = frozendict(self)
+            d2 = immutabledict(self)
             dict.update(d2, d)
             return d2
 
     def __repr__(self):
-        return "frozendict(%s)" % dict.__repr__(self)
+        return "immutabledict(%s)" % dict.__repr__(self)
 
 class Properties(object):
     """Provide a __getattr__/__setattr__ interface over a dict."""