- [removed] Deprecated identifiers removed:

* allow_null_pks mapper() argument
(use allow_partial_pks)

* _get_col_to_prop() mapper method
(use get_property_by_column())

* dont_load argument to Session.merge()
(use load=True)

* sqlalchemy.orm.shard module
(use sqlalchemy.ext.horizontal_shard)

1 files changed, 1 insertions, 5 deletions

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 037e930c9..13d407aae 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -1315,7 +1315,7 @@ class Session(object):
         for o, m, st_, dct_ in cascade_states:
             self._delete_impl(st_)
 
-    def merge(self, instance, load=True, **kw):
+    def merge(self, instance, load=True):
         """Copy the state an instance onto the persistent instance with the
         same identifier.
 
@@ -1331,10 +1331,6 @@ class Session(object):
         See :ref:`unitofwork_merging` for a detailed discussion of merging.
 
         """
-        if 'dont_load' in kw:
-            load = not kw['dont_load']
-            util.warn_deprecated('dont_load=True has been renamed to '
-                                 'load=False.')
 
         _recursive = {}