Merge "Remove code deprecated before version 1.1"

1 files changed, 0 insertions, 18 deletions

diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index 83edb0ff5..d08b35a2e 100644
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -16,7 +16,6 @@ documentation for an overview of how this module is used.
 from . import exc  # noqa
 from . import mapper as mapperlib  # noqa
 from . import strategy_options
-from .descriptor_props import ComparableProperty  # noqa
 from .descriptor_props import CompositeProperty  # noqa
 from .descriptor_props import SynonymProperty  # noqa
 from .interfaces import EXT_CONTINUE  # noqa
@@ -194,23 +193,6 @@ mapper = public_factory(Mapper, ".orm.mapper")
 
 synonym = public_factory(SynonymProperty, ".orm.synonym")
 
-comparable_property = public_factory(
-    ComparableProperty, ".orm.comparable_property"
-)
-
-
-@_sa_util.deprecated(
-    "0.7",
-    message=":func:`.compile_mappers` is deprecated and will be removed "
-    "in a future release.  Please use :func:`.configure_mappers`",
-)
-def compile_mappers():
-    """Initialize the inter-mapper relationships of all mappers that have
-    been defined.
-
-    """
-    configure_mappers()
-
 
 def clear_mappers():
     """Remove all mappers from all classes.