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 :) )

2 files changed, 6 insertions, 6 deletions

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."""