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:59 UTC
[allura] 28/41: [#8349] python-modernize -n -w --no-diffs -f
metaclass .
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 423d003966285d1e830a9f898f1ec5741ae6753f
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Mon Feb 10 15:18:56 2020 -0500
[#8349] python-modernize -n -w --no-diffs -f metaclass .
---
Allura/allura/controllers/discuss.py | 12 ++++--------
Allura/allura/webhooks.py | 3 +--
ForgeImporters/forgeimporters/base.py | 7 +++----
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/Allura/allura/controllers/discuss.py b/Allura/allura/controllers/discuss.py
index f2ac57b..d6fa61e 100644
--- a/Allura/allura/controllers/discuss.py
+++ b/Allura/allura/controllers/discuss.py
@@ -149,8 +149,7 @@ class AppDiscussionController(DiscussionController):
app_config_id=c.app.config._id)
-class ThreadsController(BaseController):
- __metaclass__ = h.ProxiedAttrMeta
+class ThreadsController(six.with_metaclass(h.ProxiedAttrMeta, BaseController)):
M = h.attrproxy('_discussion_controller', 'M')
W = h.attrproxy('_discussion_controller', 'W')
ThreadController = h.attrproxy(
@@ -171,8 +170,7 @@ class ThreadsController(BaseController):
raise exc.HTTPNotFound()
-class ThreadController(BaseController, FeedController):
- __metaclass__ = h.ProxiedAttrMeta
+class ThreadController(six.with_metaclass(h.ProxiedAttrMeta, BaseController, FeedController)):
M = h.attrproxy('_discussion_controller', 'M')
W = h.attrproxy('_discussion_controller', 'W')
ThreadController = h.attrproxy(
@@ -280,8 +278,7 @@ def handle_post_or_reply(thread, edit_widget, rate_limit, kw, parent_post_id=Non
redirect(request.referer or '/')
-class PostController(BaseController):
- __metaclass__ = h.ProxiedAttrMeta
+class PostController(six.with_metaclass(h.ProxiedAttrMeta, BaseController)):
M = h.attrproxy('_discussion_controller', 'M')
W = h.attrproxy('_discussion_controller', 'W')
ThreadController = h.attrproxy(
@@ -472,8 +469,7 @@ class DiscussionAttachmentsController(AttachmentsController):
AttachmentControllerClass = DiscussionAttachmentController
-class ModerationController(BaseController):
- __metaclass__ = h.ProxiedAttrMeta
+class ModerationController(six.with_metaclass(h.ProxiedAttrMeta, BaseController)):
PostModel = M.Post
M = h.attrproxy('_discussion_controller', 'M')
W = h.attrproxy('_discussion_controller', 'W')
diff --git a/Allura/allura/webhooks.py b/Allura/allura/webhooks.py
index dfa6247..dafb5ce 100644
--- a/Allura/allura/webhooks.py
+++ b/Allura/allura/webhooks.py
@@ -102,8 +102,7 @@ class WebhookControllerMeta(type):
return type.__call__(cls, sender, app, *args, **kw)
-class WebhookController(BaseController, AdminControllerMixin):
- __metaclass__ = WebhookControllerMeta
+class WebhookController(six.with_metaclass(WebhookControllerMeta, BaseController, AdminControllerMixin)):
create_form = WebhookCreateForm
edit_form = WebhookEditForm
diff --git a/ForgeImporters/forgeimporters/base.py b/ForgeImporters/forgeimporters/base.py
index 4578d95..14ceeb1 100644
--- a/ForgeImporters/forgeimporters/base.py
+++ b/ForgeImporters/forgeimporters/base.py
@@ -28,6 +28,7 @@ from six.moves.urllib.parse import urlparse
from datetime import datetime
from io import open
from six.moves import filter
+import six
try:
from cStringIO import StringIO
except ImportError:
@@ -354,11 +355,10 @@ class ToolImportControllerMeta(type):
return type.__call__(cls, importer, *args, **kw)
-class ToolImportController(BaseController):
+class ToolImportController(six.with_metaclass(ToolImportControllerMeta, BaseController)):
""" Base class for ToolImporter controllers.
"""
- __metaclass__ = ToolImportControllerMeta
def __init__(self, importer):
"""
@@ -395,7 +395,7 @@ class ToolImporterMeta(type):
return type.__call__(cls, *args, **kw)
-class ToolImporter(object):
+class ToolImporter(six.with_metaclass(ToolImporterMeta, object)):
"""
Base class for tool importers.
@@ -431,7 +431,6 @@ class ToolImporter(object):
The controller for this importer, to handle single tool imports.
"""
- __metaclass__ = ToolImporterMeta
target_app = None # app or list of apps
source = None # string description of source, must match project importer