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

6 files changed, 21 insertions, 59 deletions

diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index 1750bc9f8..75e3684c0 100644
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -736,7 +736,6 @@ def column_property(*cols, **kw):
         descriptor placed on the class. 
         **Deprecated.** Please see :class:`.AttributeEvents`.
 
-
     """
 
     return ColumnProperty(*cols, **kw)
@@ -880,9 +879,6 @@ def mapper(class_, local_table=None, *args, **params):
            flag is highly discouraged; as an alternative, see the method
            :meth:`.Query.populate_existing`.
 
-        :param allow_null_pks: This flag is deprecated - this is stated as
-           allow_partial_pks which defaults to True.
-
         :param allow_partial_pks: Defaults to True.  Indicates that a
            composite primary key with some NULL values should be considered as
            possibly existing within the database. This affects whether a
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 789f29c73..044c52d5c 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -86,7 +86,6 @@ class Mapper(object):
                  polymorphic_identity=None,
                  concrete=False,
                  with_polymorphic=None,
-                 allow_null_pks=None,
                  allow_partial_pks=True,
                  batch=True,
                  column_prefix=None,
@@ -142,13 +141,6 @@ class Mapper(object):
         self._reconstructor = None
         self._deprecated_extensions = util.to_list(extension or [])
 
-        if allow_null_pks:
-            util.warn_deprecated(
-                    "the allow_null_pks option to Mapper() is "
-                    "deprecated.  It is now allow_partial_pks=False|True, "
-                    "defaults to True.")
-            allow_partial_pks = allow_null_pks
-
         self.allow_partial_pks = allow_partial_pks
 
         self._set_with_polymorphic(with_polymorphic)
@@ -595,8 +587,9 @@ class Mapper(object):
 
         if self.inherits:
             self.dispatch._update(self.inherits.dispatch)
-            super_extensions = set(chain(*[m._deprecated_extensions 
-                                    for m in self.inherits.iterate_to_root()]))
+            super_extensions = set(
+                        chain(*[m._deprecated_extensions 
+                        for m in self.inherits.iterate_to_root()]))
         else:
             super_extensions = set()
 
@@ -606,8 +599,9 @@ class Mapper(object):
 
     def _configure_listeners(self):
         if self.inherits:
-            super_extensions = set(chain(*[m._deprecated_extensions 
-                                    for m in self.inherits.iterate_to_root()]))
+            super_extensions = set(
+                        chain(*[m._deprecated_extensions 
+                        for m in self.inherits.iterate_to_root()]))
         else:
             super_extensions = set()
 
@@ -1261,12 +1255,6 @@ class Mapper(object):
             raise sa_exc.InvalidRequestError(
                     "Mapper '%s' has no property '%s'" % (self, key))
 
-    @util.deprecated('0.6.4',
-                     'Call to deprecated function mapper._get_col_to_pr'
-                     'op(). Use mapper.get_property_by_column()')
-    def _get_col_to_prop(self, col):
-        return self._columntoproperty[col]
-
     def get_property_by_column(self, column):
         """Given a :class:`.Column` object, return the
         :class:`.MapperProperty` which maps this column."""
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 = {}
 
diff --git a/lib/sqlalchemy/orm/shard.py b/lib/sqlalchemy/orm/shard.py
deleted file mode 100644
index 73e56310a..000000000
--- a/lib/sqlalchemy/orm/shard.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# orm/shard.py
-# Copyright (C) 2005-2012 the SQLAlchemy authors and contributors <see AUTHORS file>
-#
-# This module is part of SQLAlchemy and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
-from sqlalchemy import util
-
-util.warn_deprecated(
-    "Horizontal sharding is now importable via "
-    "'import sqlalchemy.ext.horizontal_shard"
-)
-
-from sqlalchemy.ext.horizontal_shard import *
-
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py
index 131ced0c9..1bf736dd9 100644
--- a/lib/sqlalchemy/orm/strategies.py
+++ b/lib/sqlalchemy/orm/strategies.py
@@ -1290,9 +1290,6 @@ class JoinedLoader(AbstractRelationshipLoader):
                 load_scalar_from_joined_existing_row, \
                 None, load_scalar_from_joined_exec
 
-EagerLoader = JoinedLoader
-"""Deprecated, use JoinedLoader"""
-
 log.class_logger(JoinedLoader)
 
 class EagerLazyOption(StrategizedOption):
diff --git a/lib/sqlalchemy/orm/sync.py b/lib/sqlalchemy/orm/sync.py
index a20e871e4..c1eaab234 100644
--- a/lib/sqlalchemy/orm/sync.py
+++ b/lib/sqlalchemy/orm/sync.py
@@ -90,19 +90,19 @@ def source_modified(uowcommit, source, source_mapper, synchronize_pairs):
     else:
         return False
 
-def _raise_col_to_prop(isdest, source_mapper, source_column, dest_mapper, dest_column):
+def _raise_col_to_prop(isdest, source_mapper, source_column,
+                       dest_mapper, dest_column):
     if isdest:
-        raise exc.UnmappedColumnError(
-                                "Can't execute sync rule for destination column '%s'; "
-                                "mapper '%s' does not map this column.  Try using an explicit"
-                                " `foreign_keys` collection which does not include this column "
-                                "(or use a viewonly=True relation)." % (dest_column, dest_mapper)
-                                )
+        raise exc.UnmappedColumnError("Can't execute sync rule for "
+                "destination column '%s'; mapper '%s' does not map "
+                "this column.  Try using an explicit `foreign_keys` "
+                "collection which does not include this column (or use "
+                "a viewonly=True relation)." % (dest_column,
+                dest_mapper))
     else:
-        raise exc.UnmappedColumnError(
-                                "Can't execute sync rule for source column '%s'; mapper '%s' "
-                                "does not map this column.  Try using an explicit `foreign_keys`"
-                                " collection which does not include destination column '%s' (or "
-                                "use a viewonly=True relation)." % 
-                                (source_column, source_mapper, dest_column)
-                                )
+        raise exc.UnmappedColumnError("Can't execute sync rule for "
+                "source column '%s'; mapper '%s' does not map this "
+                "column.  Try using an explicit `foreign_keys` "
+                "collection which does not include destination column "
+                "'%s' (or use a viewonly=True relation)."
+                % (source_column, source_mapper, dest_column))