[allura] 09/16: [#8354] misc other import-time weird fixes

[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 a720ee8d9f2596732ee828cd76503ea203626473
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Fri Mar 6 17:11:43 2020 -0500

    [#8354] misc other import-time weird fixes
---
 Allura/allura/app.py               | 4 ++--
 Allura/allura/model/multifactor.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 056c776..24ea6ff 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -19,7 +19,7 @@ from __future__ import unicode_literals
 from __future__ import absolute_import
 import os
 import logging
-from urllib import basejoin
+from six.moves.urllib_parse import urljoin
 from io import BytesIO
 from collections import defaultdict
 from xml.etree import ElementTree as ET
@@ -169,7 +169,7 @@ class SitemapEntry(object):
         if callable(lbl):
             lbl = lbl(app)
         if url is not None:
-            url = basejoin(app.url, url)
+            url = urljoin(app.url, url)
         return SitemapEntry(lbl, url,
                             [ch.bind_app(app) for ch in self.children],
                             className=self.className,
diff --git a/Allura/allura/model/multifactor.py b/Allura/allura/model/multifactor.py
index 433c246..1486a8e 100644
--- a/Allura/allura/model/multifactor.py
+++ b/Allura/allura/model/multifactor.py
@@ -40,7 +40,7 @@ class TotpKey(MappedClass):
 
     _id = FieldProperty(S.ObjectId)
     user_id = FieldProperty(S.ObjectId, required=True)
-    key = FieldProperty(bytes, required=True)
+    key = FieldProperty(str, required=True)
 
 
 class RecoveryCode(MappedClass):