From 15c8720f0fbea5c730fccc8609722f4175179025 Mon Sep 17 00:00:00 2001
From: David Baer <david.a.baer@gmail.com>
Date: Wed, 22 Jan 2020 20:25:08 -0500
Subject: [PATCH] Restore compatibility with zope.sqlalchemy 1.2

---
 .gitignore             | 3 +++
 dmarcreceiver/model.py | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7e842be..43d7ddf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,3 +107,6 @@ venv.bak/
 # mypy
 .mypy_cache/
 
+# data
+data.db
+dmarc-receive.conf
diff --git a/dmarcreceiver/model.py b/dmarcreceiver/model.py
index f74e801..8cee829 100644
--- a/dmarcreceiver/model.py
+++ b/dmarcreceiver/model.py
@@ -1,13 +1,13 @@
-from zope.sqlalchemy import ZopeTransactionExtension
+import zope.sqlalchemy as zsqla
 from sqlalchemy import Column, Integer, String, Unicode, Enum, CheckConstraint, ForeignKey, DateTime, create_engine
 from sqlalchemy.orm import scoped_session, sessionmaker, relationship
 import sqlalchemy.types as satypes
 import sqlalchemy.dialects.postgresql as dpg
 from sqlalchemy.ext.declarative import declarative_base
 
-maker = sessionmaker(autoflush=True, autocommit=False,
-                     extension=ZopeTransactionExtension())
+maker = sessionmaker(autoflush=True, autocommit=False)
 DBSession = scoped_session(maker)
+zsqla.register(DBSession)
 
 DeclarativeBase = declarative_base()
 metadata = DeclarativeBase.metadata