some cleanup

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 7255b9e660e64f98bb0a8863c149196ea9f1dc02..b12ee4e84cfc7dc07c3edf91f9fbee2fa3f4ddb6 100644 (file)
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -225,13 +225,6 @@ class Session(object):
         return (class_, tuple([row[column] for column in primary_key]), entity_name)
     get_row_key = staticmethod(get_row_key)
     
-    def begin(self, *obj):
-        """deprecated"""
-        raise exceptions.InvalidRequestError("Session.begin() is deprecated.  use install_mod('legacy_session') to enable the old behavior")    
-    def commit(self, *obj):
-        """deprecated"""
-        raise exceptions.InvalidRequestError("Session.commit() is deprecated.  use install_mod('legacy_session') to enable the old behavior")    
-
     def flush(self, objects=None):
         """flush all the object modifications present in this session to the database.  
         

diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py
index 68dfc3fbbb1ddabafa35ec274551e4105be48dd1..2750b34d1c680f2345be39b96db7a59ec8fdda88 100644 (file)
--- a/lib/sqlalchemy/orm/unitofwork.py
+++ b/lib/sqlalchemy/orm/unitofwork.py
@@ -207,7 +207,6 @@ class UOWTransaction(object):
         self.__is_executing = False
         self.logger = logging.instance_logger(self)
     
-    # TODO: shouldnt be able to register stuff here that is not in the enclosing Session
     def register_object(self, obj, isdelete = False, listonly = False, postupdate=False, post_update_cols=None, **kwargs):
         """adds an object to this UOWTransaction to be updated in the database.
 
@@ -862,9 +861,6 @@ class UOWTask(object):
 class DependencySorter(topological.QueueDependencySorter):
     pass
 
-def mapper(*args, **params):
-    return sqlalchemy.mapper(*args, **params)
-
 def object_mapper(obj):
     return sqlalchemy.object_mapper(obj)