From 9c1ca6c2f44319e1c64772688b45c034a18fb633 Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Sun, 19 Nov 2017 21:38:29 -0800
Subject: [PATCH] refactor: move MAX_EXPIRY out of __init__

to avoid potential conflicts when merging changes to __version__
---
 autopush/__init__.py | 3 ---
 autopush/db.py       | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/autopush/__init__.py b/autopush/__init__.py
index b893a1d7..0c7a68a3 100644
--- a/autopush/__init__.py
+++ b/autopush/__init__.py
@@ -1,4 +1 @@
 __version__ = '1.39.0'  # pragma: nocover
-
-# Max DynamoDB record lifespan (~ 30 days)
-MAX_EXPIRY = 2592000  # pragma: nocover
diff --git a/autopush/db.py b/autopush/db.py
index bae7eaea..7fee98cd 100644
--- a/autopush/db.py
+++ b/autopush/db.py
@@ -73,7 +73,6 @@
 from twisted.internet.threads import deferToThread
 
 import autopush.metrics
-from autopush import MAX_EXPIRY
 from autopush.exceptions import AutopushException
 from autopush.metrics import IMetrics  # noqa
 from autopush.types import ItemLike  # noqa
@@ -87,6 +86,9 @@
     from autopush.config import AutopushConfig, DDBTableConfig  # noqa
 
 
+# Max DynamoDB record lifespan (~ 30 days)
+MAX_EXPIRY = 2592000  # pragma: nocover
+
 # Typing
 T = TypeVar('T')  # noqa