Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion social/storage/sqlalchemy_orm.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,11 @@ def allowed_to_disconnect(cls, user, backend_name, association_id=None):
@classmethod
def disconnect(cls, entry):
cls._session().delete(entry)
cls._session().commit()
try:
cls._session().commit()
except AssertionError:
import transaction
transaction.commit()

@classmethod
def user_query(cls):
Expand Down