From 53e80301869b920019c1429878ce3fde3c3d3f25 Mon Sep 17 00:00:00 2001
From: Ethan Dalool <git@voussoir.net>
Date: Fri, 4 Jun 2021 21:00:22 -0700
Subject: [PATCH] Move REQUEST_TYPES, RESPONSE_TYPES to voussoirkit.flasktools.

---
 frontends/etiquette_flask/backend/common.py   | 2 +-
 frontends/etiquette_flask/backend/sessions.py | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontends/etiquette_flask/backend/common.py b/frontends/etiquette_flask/backend/common.py
index 03e253b..c712fe6 100644
--- a/frontends/etiquette_flask/backend/common.py
+++ b/frontends/etiquette_flask/backend/common.py
@@ -174,7 +174,7 @@ def render_template(request, template_name, **kwargs):
         **kwargs,
     )
 
-    if not isinstance(response, sessions.RESPONSE_TYPES):
+    if not isinstance(response, flasktools.RESPONSE_TYPES):
         response = flask.Response(response)
 
     if new_theme is None:
diff --git a/frontends/etiquette_flask/backend/sessions.py b/frontends/etiquette_flask/backend/sessions.py
index 5dc5669..be0e1cb 100644
--- a/frontends/etiquette_flask/backend/sessions.py
+++ b/frontends/etiquette_flask/backend/sessions.py
@@ -1,22 +1,20 @@
 import flask; from flask import request
 import functools
-import werkzeug.wrappers
 import werkzeug.datastructures
 
 from voussoirkit import cacheclass
+from voussoirkit import flasktools
 from voussoirkit import passwordy
 
 import etiquette
 
 SESSION_MAX_AGE = 86400
-REQUEST_TYPES = (flask.Request, werkzeug.wrappers.Request, werkzeug.local.LocalProxy)
-RESPONSE_TYPES = (flask.Response, werkzeug.wrappers.Response)
 
 def _generate_token(length=32):
     return passwordy.random_hex(length=length)
 
 def _normalize_token(token):
-    if isinstance(token, REQUEST_TYPES):
+    if isinstance(token, flasktools.REQUEST_TYPES):
         request = token
         token = request.cookies.get('etiquette_session', None)
         if token is None:
@@ -81,7 +79,7 @@ class SessionManager:
                 session.maintain()
 
             response = function(*args, **kwargs)
-            if not isinstance(response, RESPONSE_TYPES):
+            if not isinstance(response, flasktools.RESPONSE_TYPES):
                 response = flask.Response(response)
 
             # Send the token back to the client