[allura] 49/50: [#7935] Ran python-modernize

[br...@apache.org]

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

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

commit 54f0e3f3669b04e03b9aeada9f725200fbb901a3
Author: Korkmatik <fa...@protonmail.ch>
AuthorDate: Sat Apr 11 00:16:47 2020 +0200

    [#7935] Ran python-modernize
---
 ForgeImporters/forgeimporters/base.py                        | 2 +-
 ForgeImporters/forgeimporters/forge/alluraImporter.py        | 1 +
 ForgeImporters/forgeimporters/forge/discussion.py            | 5 +++--
 ForgeImporters/forgeimporters/tests/forge/test_discussion.py | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index e394212..7e87cc1 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -27,7 +27,7 @@ import six.moves.urllib.request, six.moves.urllib.error, six.moves.urllib.parse
 from collections import defaultdict
 import traceback
 from six.moves.urllib.parse import urlparse
-from urllib import unquote
+from six.moves.urllib.parse import unquote
 from datetime import datetime
 import codecs
 from six.moves import filter
diff --git a/ForgeImporters/forgeimporters/forge/alluraImporter.py b/ForgeImporters/forgeimporters/forge/alluraImporter.py
index d3a8c9b..fea422c 100644
--- a/ForgeImporters/forgeimporters/forge/alluraImporter.py
+++ b/ForgeImporters/forgeimporters/forge/alluraImporter.py
@@ -15,6 +15,7 @@
 #       specific language governing permissions and limitations
 #       under the License.
 
+from __future__ import absolute_import
 import os
 import json
 
diff --git a/ForgeImporters/forgeimporters/forge/discussion.py b/ForgeImporters/forgeimporters/forge/discussion.py
index 5167648..7dc7b1c 100644
--- a/ForgeImporters/forgeimporters/forge/discussion.py
+++ b/ForgeImporters/forgeimporters/forge/discussion.py
@@ -15,6 +15,7 @@
 #       specific language governing permissions and limitations
 #       under the License.
 
+from __future__ import absolute_import
 import json
 from dateutil.parser import parse
 
@@ -138,7 +139,7 @@ class ForgeDiscussionImporter(AlluraImporter):
 
                     forum = utils.create_forum(app, new_forum=new_forum)
                     
-                    if "import_id" in forum_json.keys():
+                    if "import_id" in list(forum_json.keys()):
                         forum.import_id = forum_json["import_id"]
 
                     for thread_json in forum_json["threads"]:
@@ -197,7 +198,7 @@ class ForgeDiscussionImporter(AlluraImporter):
                 # For nested posts
                 parent_id = None
                 slug = ''
-                if "slug" in post_json.keys():
+                if "slug" in list(post_json.keys()):
                     slug = post_json["slug"]
 
                     if slug.count('/') >= 1:
diff --git a/ForgeImporters/forgeimporters/tests/forge/test_discussion.py b/ForgeImporters/forgeimporters/tests/forge/test_discussion.py
index 2cbc5c7..694601a 100644
--- a/ForgeImporters/forgeimporters/tests/forge/test_discussion.py
+++ b/ForgeImporters/forgeimporters/tests/forge/test_discussion.py
@@ -15,6 +15,8 @@
 #       specific language governing permissions and limitations
 #       under the License.
 
+from __future__ import absolute_import
+from __future__ import print_function
 from unittest import TestCase
 import mock