Merge "Performance fixes for new result set"

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py
index 695985a91..6a0b065ee 100644
--- a/lib/sqlalchemy/util/__init__.py
+++ b/lib/sqlalchemy/util/__init__.py
@@ -148,5 +148,4 @@ from .langhelpers import warn_limited  # noqa
 from .langhelpers import wrap_callable  # noqa
 
 
-# things that used to be not always available,
-# but are now as of current support Python versions
+SQLALCHEMY_WARN_20 = False
diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index 10d80fc98..0990acb83 100644
--- a/lib/sqlalchemy/util/_collections.py
+++ b/lib/sqlalchemy/util/_collections.py
@@ -52,6 +52,14 @@ class immutabledict(ImmutableContainer, dict):
         dict.update(new, d)
         return new
 
+    def merge_with(self, *dicts):
+        new = dict.__new__(self.__class__)
+        dict.__init__(new, self)
+        for d in dicts:
+            if d:
+                dict.update(new, d)
+        return new
+
     def __repr__(self):
         return "immutabledict(%s)" % dict.__repr__(self)