=== modified file 'ibid/core.py' --- ibid/core.py 2011-01-24 21:31:11 +0000 +++ ibid/core.py 2011-02-13 20:19:42 +0000 @@ -13,7 +13,7 @@ from twisted.python.modules import getModule from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker, scoped_session -from sqlalchemy.exceptions import IntegrityError +from sqlalchemy.exc import IntegrityError import ibid from ibid.event import Event === modified file 'ibid/db/__init__.py' --- ibid/db/__init__.py 2011-01-24 11:38:54 +0000 +++ ibid/db/__init__.py 2011-02-13 20:19:42 +0000 @@ -11,7 +11,7 @@ from sqlalchemy.sql import func from sqlalchemy.ext.declarative import declarative_base as _declarative_base -from sqlalchemy.exceptions import IntegrityError, SADeprecationWarning +from sqlalchemy.exc import IntegrityError, SADeprecationWarning metadata = _MetaData() Base = _declarative_base(metadata=metadata) === modified file 'ibid/db/versioned_schema.py' --- ibid/db/versioned_schema.py 2010-06-22 00:04:13 +0000 +++ ibid/db/versioned_schema.py 2011-02-13 20:19:42 +0000 @@ -6,7 +6,7 @@ from sqlalchemy import Column, Index, UniqueConstraint, MetaData, \ __version__ as _sqlalchemy_version -from sqlalchemy.exceptions import InvalidRequestError, OperationalError, \ +from sqlalchemy.exc import InvalidRequestError, OperationalError, \ ProgrammingError, InternalError if _sqlalchemy_version < '0.5': NoResultFound = InvalidRequestError === modified file 'scripts/ibid-plugin' --- scripts/ibid-plugin 2010-09-26 15:38:02 +0000 +++ scripts/ibid-plugin 2011-02-13 20:19:42 +0000 @@ -17,7 +17,7 @@ except ImportError: pass -from sqlalchemy.exceptions import IntegrityError +from sqlalchemy.exc import IntegrityError sys.path.insert(0, '.')