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:45 UTC
[allura] 14/41: [#8349] python-modernize -n -w --no-diffs -f
libmodernize.fixes.fix_open .
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 fb73880f0026e5ae96aa7eba46a883dfcd3f4b28
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Mon Feb 10 13:40:47 2020 -0500
[#8349] python-modernize -n -w --no-diffs -f libmodernize.fixes.fix_open .
---
Allura/allura/app.py | 1 +
Allura/allura/command/script.py | 1 +
Allura/allura/lib/multifactor.py | 1 +
Allura/allura/lib/spam/stopforumspamfilter.py | 1 +
Allura/allura/model/filesystem.py | 1 +
Allura/allura/model/repository.py | 1 +
Allura/allura/scripts/create_sitemap_files.py | 1 +
Allura/allura/scripts/trac_export.py | 1 +
Allura/allura/tasks/export_tasks.py | 1 +
Allura/allura/tests/functional/test_discuss.py | 1 +
Allura/allura/tests/model/test_filesystem.py | 1 +
Allura/allura/tests/test_globals.py | 1 +
Allura/allura/tests/test_helpers.py | 1 +
Allura/ldap-setup.py | 1 +
Allura/ldap-userconfig.py | 1 +
ForgeDiscussion/forgediscussion/tests/functional/test_forum.py | 1 +
ForgeGit/forgegit/model/git_repo.py | 1 +
ForgeGit/forgegit/tests/functional/test_controllers.py | 1 +
ForgeGit/forgegit/tests/model/test_repository.py | 1 +
ForgeImporters/forgeimporters/base.py | 1 +
ForgeImporters/forgeimporters/forge/tracker.py | 1 +
ForgeImporters/forgeimporters/trac/tests/test_tickets.py | 1 +
ForgeSVN/forgesvn/model/svn.py | 1 +
ForgeSVN/forgesvn/tests/model/test_repository.py | 1 +
ForgeWiki/forgewiki/tests/test_app.py | 1 +
fuse/accessfs.py | 1 +
scripts/perf/call_count.py | 1 +
scripts/project-import.py | 1 +
scripts/teamforge-import.py | 1 +
scripts/trac_export_wiki.py | 1 +
scripts/trac_import.py | 1 +
scripts/wiki-copy.py | 1 +
32 files changed, 32 insertions(+)
diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 62ebca6..ad7db0c 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -50,6 +50,7 @@ from allura.lib.utils import permanent_redirect, ConfigProxy
from allura import model as M
from allura.tasks import index_tasks
import six
+from io import open
log = logging.getLogger(__name__)
diff --git a/Allura/allura/command/script.py b/Allura/allura/command/script.py
index f9767e2..42f0136 100644
--- a/Allura/allura/command/script.py
+++ b/Allura/allura/command/script.py
@@ -31,6 +31,7 @@ from ming.orm import session
from allura.lib import helpers as h
from allura.lib import utils
from . import base
+from io import open
class ScriptCommand(base.Command):
diff --git a/Allura/allura/lib/multifactor.py b/Allura/allura/lib/multifactor.py
index b756930..29ea612 100644
--- a/Allura/allura/lib/multifactor.py
+++ b/Allura/allura/lib/multifactor.py
@@ -42,6 +42,7 @@ from ming.odm import session
from allura.model.multifactor import RecoveryCode
from allura.lib.utils import umask
import six
+from io import open
log = logging.getLogger(__name__)
diff --git a/Allura/allura/lib/spam/stopforumspamfilter.py b/Allura/allura/lib/spam/stopforumspamfilter.py
index 24d040f..8915ecb 100644
--- a/Allura/allura/lib/spam/stopforumspamfilter.py
+++ b/Allura/allura/lib/spam/stopforumspamfilter.py
@@ -27,6 +27,7 @@ from tg import request
from allura.lib import utils
from allura.lib.spam import SpamFilter
import six
+from io import open
log = logging.getLogger(__name__)
diff --git a/Allura/allura/model/filesystem.py b/Allura/allura/model/filesystem.py
index 4bc9bf2..7bd726c 100644
--- a/Allura/allura/model/filesystem.py
+++ b/Allura/allura/model/filesystem.py
@@ -31,6 +31,7 @@ from ming.orm.declarative import MappedClass
from .session import project_orm_session
from allura.lib import utils
+from io import open
log = logging.getLogger(__name__)
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 790690d..160be35 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -60,6 +60,7 @@ from .monq_model import MonQTask
from .project import AppConfig
from .session import main_doc_session
from .session import repository_orm_session
+from io import open
log = logging.getLogger(__name__)
diff --git a/Allura/allura/scripts/create_sitemap_files.py b/Allura/allura/scripts/create_sitemap_files.py
index 8ed580e..e2347bb 100644
--- a/Allura/allura/scripts/create_sitemap_files.py
+++ b/Allura/allura/scripts/create_sitemap_files.py
@@ -45,6 +45,7 @@ from tg import config
from allura import model as M
from allura.lib import security, utils
from allura.scripts import ScriptTask
+from io import open
MAX_SITEMAP_URLS = 50000
diff --git a/Allura/allura/scripts/trac_export.py b/Allura/allura/scripts/trac_export.py
index 4cb4347..c9b411b 100644
--- a/Allura/allura/scripts/trac_export.py
+++ b/Allura/allura/scripts/trac_export.py
@@ -35,6 +35,7 @@ from bs4 import BeautifulSoup, NavigableString
import dateutil.parser
import pytz
import six
+from io import open
try:
from forgeimporters.base import ProjectExtractor
diff --git a/Allura/allura/tasks/export_tasks.py b/Allura/allura/tasks/export_tasks.py
index 9614e28..dfc4d61 100644
--- a/Allura/allura/tasks/export_tasks.py
+++ b/Allura/allura/tasks/export_tasks.py
@@ -29,6 +29,7 @@ from allura.tasks import mail_tasks
from allura.lib.decorators import task
from allura.lib import helpers as h
from allura.model.repository import zipdir
+from io import open
log = logging.getLogger(__name__)
diff --git a/Allura/allura/tests/functional/test_discuss.py b/Allura/allura/tests/functional/test_discuss.py
index 51f84a1..97d0a90 100644
--- a/Allura/allura/tests/functional/test_discuss.py
+++ b/Allura/allura/tests/functional/test_discuss.py
@@ -27,6 +27,7 @@ from allura.tests import TestController
from allura import model as M
from allura.lib import helpers as h
from tg import config
+from io import open
diff --git a/Allura/allura/tests/model/test_filesystem.py b/Allura/allura/tests/model/test_filesystem.py
index 545945f..8d4eff9 100644
--- a/Allura/allura/tests/model/test_filesystem.py
+++ b/Allura/allura/tests/model/test_filesystem.py
@@ -32,6 +32,7 @@ from webob import Request, Response
from allura import model as M
from alluratest.controller import setup_unit_test
+from io import open
class File(M.File):
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index 70acceb..2c278db 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -49,6 +49,7 @@ from allura.tests import decorators as td
from forgewiki import model as WM
from forgeblog import model as BM
+from io import open
def squish_spaces(text):
diff --git a/Allura/allura/tests/test_helpers.py b/Allura/allura/tests/test_helpers.py
index 92a9011..b49be5f 100644
--- a/Allura/allura/tests/test_helpers.py
+++ b/Allura/allura/tests/test_helpers.py
@@ -44,6 +44,7 @@ from allura.lib.security import Credentials
from allura.tests import decorators as td
from alluratest.controller import setup_basic_test
import six
+from io import open
def setUp(self):
diff --git a/Allura/ldap-setup.py b/Allura/ldap-setup.py
index fcd79ce..07dbe29 100644
--- a/Allura/ldap-setup.py
+++ b/Allura/ldap-setup.py
@@ -26,6 +26,7 @@ import logging
from contextlib import contextmanager
from tempfile import mkstemp
from six.moves.configparser import ConfigParser, NoOptionError
+from io import open
logging.basicConfig(level=logging.DEBUG)
log = logging.getLogger('ldap-setup')
diff --git a/Allura/ldap-userconfig.py b/Allura/ldap-userconfig.py
index 63334b5..c0f2330 100644
--- a/Allura/ldap-userconfig.py
+++ b/Allura/ldap-userconfig.py
@@ -23,6 +23,7 @@ import os
import sys
import pwd
import grp
+from io import open
def main():
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index 4a6f38b..a7d80e8 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -44,6 +44,7 @@ from allura.lib import helpers as h
from allura.tests import decorators as td
from forgediscussion import model as FM
+from io import open
log = logging.getLogger(__name__)
diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py
index cf829f4..2c01380 100644
--- a/ForgeGit/forgegit/model/git_repo.py
+++ b/ForgeGit/forgegit/model/git_repo.py
@@ -40,6 +40,7 @@ from ming.utils import LazyProperty
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
log = logging.getLogger(__name__)
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 40ddef2..e25a961 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -45,6 +45,7 @@ from allura.tests.test_globals import squish_spaces
from forgegit.tests import with_git
from forgegit import model as GM
import six
+from io import open
class _TestCase(TestController):
diff --git a/ForgeGit/forgegit/tests/model/test_repository.py b/ForgeGit/forgegit/tests/model/test_repository.py
index a89624f..30672f3 100644
--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -48,6 +48,7 @@ from allura.webhooks import RepoPushWebhookSender
from forgegit import model as GM
from forgegit.tests import with_git
from forgewiki import model as WM
+from io import open
class TestNewGit(unittest.TestCase):
diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index deb96ed..edf6aac 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -26,6 +26,7 @@ from collections import defaultdict
import traceback
from six.moves.urllib.parse import urlparse
from datetime import datetime
+from io import open
try:
from cStringIO import StringIO
except ImportError:
diff --git a/ForgeImporters/forgeimporters/forge/tracker.py b/ForgeImporters/forgeimporters/forge/tracker.py
index 19638b1..b5825ab 100644
--- a/ForgeImporters/forgeimporters/forge/tracker.py
+++ b/ForgeImporters/forgeimporters/forge/tracker.py
@@ -50,6 +50,7 @@ from forgeimporters.base import (
get_importer_upload_path,
save_importer_upload,
)
+from io import open
class ForgeTrackerImportForm(ToolImportForm):
diff --git a/ForgeImporters/forgeimporters/trac/tests/test_tickets.py b/ForgeImporters/forgeimporters/trac/tests/test_tickets.py
index bf3be44..b58e122 100644
--- a/ForgeImporters/forgeimporters/trac/tests/test_tickets.py
+++ b/ForgeImporters/forgeimporters/trac/tests/test_tickets.py
@@ -38,6 +38,7 @@ from forgeimporters.trac.tickets import (
TracTicketImportController,
TracImportSupport,
)
+from io import open
class TestTracTicketImporter(TestCase):
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index d413ee8..7bf084b 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -47,6 +47,7 @@ from allura.lib import helpers as h
from allura.model.auth import User
from allura.model.repository import zipdir
from allura.model import repository as RM
+from io import open
log = logging.getLogger(__name__)
diff --git a/ForgeSVN/forgesvn/tests/model/test_repository.py b/ForgeSVN/forgesvn/tests/model/test_repository.py
index 59c3bfb..76e97ec 100644
--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -51,6 +51,7 @@ from forgesvn.model.svn import svn_path_exists
from forgesvn.tests import with_svn
from allura.tests.decorators import with_tool
import six
+from io import open
class TestNewRepo(unittest.TestCase):
diff --git a/ForgeWiki/forgewiki/tests/test_app.py b/ForgeWiki/forgewiki/tests/test_app.py
index 6bfb224..bd58982 100644
--- a/ForgeWiki/forgewiki/tests/test_app.py
+++ b/ForgeWiki/forgewiki/tests/test_app.py
@@ -32,6 +32,7 @@ from allura import model as M
from allura.tests import decorators as td
from alluratest.controller import setup_basic_test, setup_global_objects
from forgewiki import model as WM
+from io import open
class TestBulkExport(object):
diff --git a/fuse/accessfs.py b/fuse/accessfs.py
index ee19ba1..2a2a7f8 100644
--- a/fuse/accessfs.py
+++ b/fuse/accessfs.py
@@ -36,6 +36,7 @@ from collections import deque
import fuse
import six
+from io import open
log = logging.getLogger(__name__)
diff --git a/scripts/perf/call_count.py b/scripts/perf/call_count.py
index 2b3e1ce..baf7d95 100755
--- a/scripts/perf/call_count.py
+++ b/scripts/perf/call_count.py
@@ -38,6 +38,7 @@ from allura.tests import TestController
from allura.tests.decorators import patch_middleware_config
from forgewiki import model as WM
+from io import open
def parse_args():
diff --git a/scripts/project-import.py b/scripts/project-import.py
index 2ca0f23..a83ed48 100644
--- a/scripts/project-import.py
+++ b/scripts/project-import.py
@@ -34,6 +34,7 @@ from allura import model as M
from allura.lib import helpers as h
from allura.lib.plugin import ProjectRegistrationProvider
import six
+from io import open
log = logging.getLogger(__name__)
diff --git a/scripts/teamforge-import.py b/scripts/teamforge-import.py
index 8c2ba90..5789179 100644
--- a/scripts/teamforge-import.py
+++ b/scripts/teamforge-import.py
@@ -45,6 +45,7 @@ from allura import model as M
from allura.lib import helpers as h
from allura.lib import utils
import six
+from io import open
log = logging.getLogger('teamforge-import')
diff --git a/scripts/trac_export_wiki.py b/scripts/trac_export_wiki.py
index 321e4ed..d698c04 100755
--- a/scripts/trac_export_wiki.py
+++ b/scripts/trac_export_wiki.py
@@ -23,6 +23,7 @@ import sys
from optparse import OptionParser
from tracwikiimporter.scripts.wiki_from_trac.extractors import WikiExporter
+from io import open
def parse_options():
diff --git a/scripts/trac_import.py b/scripts/trac_import.py
index 10db3cf..ef4806d 100644
--- a/scripts/trac_import.py
+++ b/scripts/trac_import.py
@@ -24,6 +24,7 @@ from optparse import OptionParser
from allura.lib.import_api import AlluraImportApiClient
from tracwikiimporter.scripts.wiki_from_trac.loaders import import_wiki
import six
+from io import open
def main():
diff --git a/scripts/wiki-copy.py b/scripts/wiki-copy.py
index 6182d68..383f0e7 100644
--- a/scripts/wiki-copy.py
+++ b/scripts/wiki-copy.py
@@ -30,6 +30,7 @@ import json
from six.moves.configparser import ConfigParser, NoOptionError
import webbrowser
import oauth2 as oauth
+from io import open
def main():