You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2020/02/10 22:44:53 UTC
[allura] 22/41: [#8349] python-modernize -n -w --no-diffs -f zip .
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch db/8349
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 0b42e8d21acadb19eb16b9e44222707575f74a3f
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Mon Feb 10 14:40:29 2020 -0500
[#8349] python-modernize -n -w --no-diffs -f zip .
---
Allura/allura/controllers/auth.py | 1 +
Allura/allura/lib/utils.py | 1 +
Allura/allura/tests/functional/test_home.py | 1 +
ForgeGit/forgegit/model/git_repo.py | 1 +
ForgeImporters/forgeimporters/tests/github/test_extractor.py | 7 ++++---
fuse/accessfs.py | 1 +
6 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 145eeab..132fdd3 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -58,6 +58,7 @@ from allura.lib import utils
from allura.controllers import BaseController
from allura.tasks.mail_tasks import send_system_mail_to_user
import six
+from six.moves import zip
log = logging.getLogger(__name__)
diff --git a/Allura/allura/lib/utils.py b/Allura/allura/lib/utils.py
index 5485966..49151ef 100644
--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -61,6 +61,7 @@ from ming.odm.odmsession import ODMCursor
from ming.odm import session
import six
from six.moves import range
+from six.moves import zip
MARKDOWN_EXTENSIONS = ['.markdown', '.mdown', '.mkdn', '.mkd', '.md']
diff --git a/Allura/allura/tests/functional/test_home.py b/Allura/allura/tests/functional/test_home.py
index 71b3c7e..dc523c2 100644
--- a/Allura/allura/tests/functional/test_home.py
+++ b/Allura/allura/tests/functional/test_home.py
@@ -30,6 +30,7 @@ from allura.tests import TestController
from allura.tests import decorators as td
from allura import model as M
from six.moves import range
+from six.moves import zip
class TestProjectHome(TestController):
diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py
index 513b0cc..c49fbad 100644
--- a/ForgeGit/forgegit/model/git_repo.py
+++ b/ForgeGit/forgegit/model/git_repo.py
@@ -41,6 +41,7 @@ from allura.lib import helpers as h
from allura.model.repository import topological_sort, prefix_paths_union
from allura import model as M
from io import open
+from six.moves import zip
log = logging.getLogger(__name__)
diff --git a/ForgeImporters/forgeimporters/tests/github/test_extractor.py b/ForgeImporters/forgeimporters/tests/github/test_extractor.py
index 52167c3..617e56b 100644
--- a/ForgeImporters/forgeimporters/tests/github/test_extractor.py
+++ b/ForgeImporters/forgeimporters/tests/github/test_extractor.py
@@ -28,6 +28,7 @@ from ... import github
# Can't use cStringIO here, because we cannot set attributes or subclass it,
# and this is needed in mocked_urlopen below
from StringIO import StringIO
+from six.moves import zip
class TestGitHubProjectExtractor(TestCase):
@@ -112,9 +113,9 @@ class TestGitHubProjectExtractor(TestCase):
def test_iter_issues(self):
issues = list(self.extractor.iter_issues())
- all_issues = zip((1, 2), self.CLOSED_ISSUES_LIST)
- all_issues += zip((3, 4, 5), self.OPENED_ISSUES_LIST)
- all_issues += zip((6, 7, 8), self.OPENED_ISSUES_LIST_PAGE2)
+ all_issues = list(zip((1, 2), self.CLOSED_ISSUES_LIST))
+ all_issues += list(zip((3, 4, 5), self.OPENED_ISSUES_LIST))
+ all_issues += list(zip((6, 7, 8), self.OPENED_ISSUES_LIST_PAGE2))
self.assertEqual(issues, all_issues)
def test_iter_comments(self):
diff --git a/fuse/accessfs.py b/fuse/accessfs.py
index 2a2a7f8..698693e 100644
--- a/fuse/accessfs.py
+++ b/fuse/accessfs.py
@@ -37,6 +37,7 @@ from collections import deque
import fuse
import six
from io import open
+from six.moves import zip
log = logging.getLogger(__name__)