Expected dictionary got response error, fixes talkpython#8

mikeckennedy · mikeckennedy · commit 68bf1f3f0ff8 · 2019-10-10T13:48:30.000-07:00
diff --git a/app/ch05_jinja_templates/final/pypi_org/infrastructure/view_modifiers.py b/app/ch05_jinja_templates/final/pypi_org/infrastructure/view_modifiers.py
@@ -1,6 +1,8 @@
 from functools import wraps
 
 import flask
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -11,9 +13,9 @@ def response_inner(f):
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
 
-            if isinstance(response_val, werkzeug.wrappers.response.Response):
+            if isinstance(response_val, werkzeug.wrappers.Response):
                 return response_val
-            
+
             if isinstance(response_val, flask.Response):
                 return response_val
 
diff --git a/app/ch06_routing/final/pypi_org/infrastructure/view_modifiers.py b/app/ch06_routing/final/pypi_org/infrastructure/view_modifiers.py
@@ -1,6 +1,8 @@
 from functools import wraps
 
 import flask
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -10,6 +12,10 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
+                return response_val
+
             if isinstance(response_val, flask.Response):
                 return response_val
 
diff --git a/app/ch06_routing/starter/pypi_org/infrastructure/view_modifiers.py b/app/ch06_routing/starter/pypi_org/infrastructure/view_modifiers.py
@@ -1,6 +1,8 @@
 from functools import wraps
 
 import flask
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -10,6 +12,10 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
+                return response_val
+
             if isinstance(response_val, flask.Response):
                 return response_val
 
diff --git a/app/ch08_adding_our_design/final/pypi_org/infrastructure/view_modifiers.py b/app/ch08_adding_our_design/final/pypi_org/infrastructure/view_modifiers.py
@@ -1,6 +1,8 @@
 from functools import wraps
 
 import flask
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -10,6 +12,10 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
+                return response_val
+
             if isinstance(response_val, flask.Response):
                 return response_val
 
diff --git a/app/ch08_adding_our_design/starter/pypi_org/infrastructure/view_modifiers.py b/app/ch08_adding_our_design/starter/pypi_org/infrastructure/view_modifiers.py
@@ -1,6 +1,8 @@
 from functools import wraps
 
 import flask
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -10,6 +12,10 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
+                return response_val
+
             if isinstance(response_val, flask.Response):
                 return response_val
 
diff --git a/app/ch09_sqlalchemy/final/pypi_org/infrastructure/view_modifiers.py b/app/ch09_sqlalchemy/final/pypi_org/infrastructure/view_modifiers.py
@@ -1,6 +1,8 @@
 from functools import wraps
 
 import flask
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -10,6 +12,10 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
+                return response_val
+
             if isinstance(response_val, flask.Response):
                 return response_val
 
diff --git a/app/ch09_sqlalchemy/starter/pypi_org/infrastructure/view_modifiers.py b/app/ch09_sqlalchemy/starter/pypi_org/infrastructure/view_modifiers.py
@@ -1,6 +1,8 @@
 from functools import wraps
 
 import flask
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -10,6 +12,10 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
+                return response_val
+
             if isinstance(response_val, flask.Response):
                 return response_val
 
diff --git a/app/ch10_using_sqlachemy/final/pypi_org/infrastructure/view_modifiers.py b/app/ch10_using_sqlachemy/final/pypi_org/infrastructure/view_modifiers.py
@@ -1,6 +1,8 @@
 from functools import wraps
 
 import flask
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -10,6 +12,10 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
+                return response_val
+
             if isinstance(response_val, flask.Response):
                 return response_val
 
diff --git a/app/ch10_using_sqlachemy/starter/pypi_org/infrastructure/view_modifiers.py b/app/ch10_using_sqlachemy/starter/pypi_org/infrastructure/view_modifiers.py
@@ -1,6 +1,8 @@
 from functools import wraps
 
 import flask
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -10,6 +12,10 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
+                return response_val
+
             if isinstance(response_val, flask.Response):
                 return response_val
 
diff --git a/app/ch11_migrations/final/pypi_org/infrastructure/view_modifiers.py b/app/ch11_migrations/final/pypi_org/infrastructure/view_modifiers.py
@@ -1,6 +1,8 @@
 from functools import wraps
 
 import flask
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -10,6 +12,10 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
+                return response_val
+
             if isinstance(response_val, flask.Response):
                 return response_val
 
@@ -36,6 +42,7 @@ def view_method(*args, **kwargs):
 
     return response_inner
 
+
 #
 # def template(template_file: str = None):
 #     def template_inner(f):
diff --git a/app/ch11_migrations/starter/pypi_org/infrastructure/view_modifiers.py b/app/ch11_migrations/starter/pypi_org/infrastructure/view_modifiers.py
@@ -1,6 +1,8 @@
 from functools import wraps
 
 import flask
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -10,6 +12,10 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
+                return response_val
+
             if isinstance(response_val, flask.Response):
                 return response_val
 
diff --git a/app/ch12-forms/final/pypi_org/infrastructure/view_modifiers.py b/app/ch12-forms/final/pypi_org/infrastructure/view_modifiers.py
@@ -1,6 +1,7 @@
 from functools import wraps
 
 import flask
+import werkzeug
 import werkzeug.wrappers
 
 
@@ -11,11 +12,13 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
-            if isinstance(response_val, flask.Response):
-                return response_val
+
             if isinstance(response_val, werkzeug.wrappers.Response):
                 return response_val
 
+            if isinstance(response_val, flask.Response):
+                return response_val
+
             if isinstance(response_val, dict):
                 model = dict(response_val)
             else:
diff --git a/app/ch12-forms/starter/pypi_org/infrastructure/view_modifiers.py b/app/ch12-forms/starter/pypi_org/infrastructure/view_modifiers.py
@@ -1,6 +1,8 @@
 from functools import wraps
 
 import flask
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -10,6 +12,10 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
+                return response_val
+
             if isinstance(response_val, flask.Response):
                 return response_val
 
diff --git a/app/ch13-validation/final/pypi_org/infrastructure/view_modifiers.py b/app/ch13-validation/final/pypi_org/infrastructure/view_modifiers.py
@@ -1,7 +1,8 @@
 from functools import wraps
 
 import flask
-import werkzeug.wrappers.response
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -11,9 +12,11 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
-            if isinstance(response_val, flask.Response):
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
                 return response_val
-            if isinstance(response_val, werkzeug.wrappers.response.Response):
+
+            if isinstance(response_val, flask.Response):
                 return response_val
 
             if isinstance(response_val, dict):
diff --git a/app/ch13-validation/starter/pypi_org/infrastructure/view_modifiers.py b/app/ch13-validation/starter/pypi_org/infrastructure/view_modifiers.py
@@ -1,7 +1,8 @@
 from functools import wraps
 
 import flask
-import werkzeug.wrappers.response
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -11,9 +12,11 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
-            if isinstance(response_val, flask.Response):
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
                 return response_val
-            if isinstance(response_val, werkzeug.wrappers.response.Response):
+
+            if isinstance(response_val, flask.Response):
                 return response_val
 
             if isinstance(response_val, dict):
diff --git a/app/ch14_testing/final/pypi_org/infrastructure/view_modifiers.py b/app/ch14_testing/final/pypi_org/infrastructure/view_modifiers.py
@@ -1,7 +1,8 @@
 from functools import wraps
 
 import flask
-import werkzeug.wrappers.response
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -11,9 +12,11 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
-            if isinstance(response_val, flask.Response):
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
                 return response_val
-            if isinstance(response_val, werkzeug.wrappers.response.Response):
+
+            if isinstance(response_val, flask.Response):
                 return response_val
 
             if isinstance(response_val, dict):
diff --git a/app/ch14_testing/starter/pypi_org/infrastructure/view_modifiers.py b/app/ch14_testing/starter/pypi_org/infrastructure/view_modifiers.py
@@ -1,7 +1,8 @@
 from functools import wraps
 
 import flask
-import werkzeug.wrappers.response
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -11,9 +12,11 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
-            if isinstance(response_val, flask.Response):
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
                 return response_val
-            if isinstance(response_val, werkzeug.wrappers.response.Response):
+
+            if isinstance(response_val, flask.Response):
                 return response_val
 
             if isinstance(response_val, dict):
diff --git a/app/ch15_deploy/final/pypi_org/infrastructure/view_modifiers.py b/app/ch15_deploy/final/pypi_org/infrastructure/view_modifiers.py
@@ -1,7 +1,8 @@
 from functools import wraps
 
 import flask
-import werkzeug.wrappers.response
+import werkzeug
+import werkzeug.wrappers
 
 
 def response(*, mimetype: str = None, template_file: str = None):
@@ -11,9 +12,11 @@ def response_inner(f):
         @wraps(f)
         def view_method(*args, **kwargs):
             response_val = f(*args, **kwargs)
-            if isinstance(response_val, flask.Response):
+
+            if isinstance(response_val, werkzeug.wrappers.Response):
                 return response_val
-            if isinstance(response_val, werkzeug.wrappers.response.Response):
+
+            if isinstance(response_val, flask.Response):
                 return response_val
 
             if isinstance(response_val, dict):
diff --git a/app/ch15_deploy/final/requirements.txt b/app/ch15_deploy/final/requirements.txt
diff --git a/app/ch15_deploy/starter/pypi_org/infrastructure/view_modifiers.py b/app/ch15_deploy/starter/pypi_org/infrastructure/view_modifiers.py
diff --git a/app/ch16_mongodb/final/pypi_org/infrastructure/view_modifiers.py b/app/ch16_mongodb/final/pypi_org/infrastructure/view_modifiers.py
diff --git a/app/ch16_mongodb/starter/pypi_org/infrastructure/view_modifiers.py b/app/ch16_mongodb/starter/pypi_org/infrastructure/view_modifiers.py
