[allura] 01/14: [#8354] fix six cookie import

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch db/8354
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 5b371e0933214b5c35abc24d16102d0b68be0d43
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Fri Mar 6 12:29:23 2020 -0500

    [#8354] fix six cookie import
---
 Allura/allura/lib/decorators.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Allura/allura/lib/decorators.py b/Allura/allura/lib/decorators.py
index 6a33304..a4b9bd2 100644
--- a/Allura/allura/lib/decorators.py
+++ b/Allura/allura/lib/decorators.py
@@ -21,7 +21,11 @@ import inspect
 import sys
 import json
 import logging
-from six.moves.http_cookies import Cookie
+import six
+if six.PY3:
+    from http.cookies import SimpleCookie as Cookie
+else:
+    from Cookie import Cookie
 from collections import defaultdict
 from six.moves.urllib.parse import unquote
 from datetime import datetime