From b8aca1b58aba905de2c0288a028e1766d910dbd0 Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Thu, 14 Sep 2017 17:47:45 +0200 Subject: [PATCH] isort everything --- chat/indico_chat/__init__.py | 1 + chat/indico_chat/blueprint.py | 9 +++++---- chat/indico_chat/controllers/logs.py | 7 +++---- chat/indico_chat/controllers/management.py | 12 ++++++------ .../20170630_1551_3888761f35f7_create_tables.py | 4 ++-- chat/indico_chat/models/chatrooms.py | 2 +- chat/indico_chat/plugin.py | 2 +- chat/indico_chat/util.py | 1 + chat/indico_chat/xmpp.py | 5 +++-- importer/indico_importer/__init__.py | 3 ++- importer/indico_importer/base.py | 1 + importer/indico_importer/controllers.py | 2 +- importer/indico_importer/converter.py | 1 + importer/indico_importer/plugin.py | 4 ++-- .../indico_importer_invenio/__init__.py | 1 + .../indico_importer_invenio/connector.py | 16 ++++++++-------- .../indico_importer_invenio/converters.py | 3 ++- livesync/indico_livesync/__init__.py | 10 +++++----- livesync/indico_livesync/blueprint.py | 3 ++- livesync/indico_livesync/controllers.py | 4 ++-- livesync/indico_livesync/handler.py | 4 ++-- livesync/indico_livesync/marcxml.py | 3 +-- .../20170630_1557_aa0dbc6c14aa_create_tables.py | 1 + livesync/indico_livesync/models/agents.py | 2 +- livesync/indico_livesync/models/queue.py | 4 ++-- livesync/indico_livesync/plugin.py | 2 +- livesync/indico_livesync/simplify.py | 4 ++-- livesync/indico_livesync/uploader.py | 1 + livesync/indico_livesync/util.py | 2 +- livesync/tests/agent_test.py | 2 +- livesync/tests/queue_test.py | 2 +- livesync/tests/simplify_test.py | 7 ++++--- livesync/tests/uploader_test.py | 5 ++--- livesync/tests/util_test.py | 2 +- livesync_debug/indico_livesync_debug/backend.py | 2 +- livesync_debug/indico_livesync_debug/plugin.py | 1 - .../indico_livesync_invenio/__init__.py | 1 + .../indico_livesync_invenio/backend.py | 4 ++-- .../indico_livesync_invenio/connector.py | 16 ++++++++-------- .../indico_livesync_invenio/plugin.py | 1 - payment_paypal/indico_payment_paypal/__init__.py | 1 + .../indico_payment_paypal/blueprint.py | 3 ++- .../indico_payment_paypal/controllers.py | 6 +++--- payment_paypal/indico_payment_paypal/plugin.py | 4 ++-- piwik/indico_piwik/__init__.py | 1 + piwik/indico_piwik/controllers.py | 2 +- piwik/indico_piwik/piwik.py | 2 +- piwik/indico_piwik/plugin.py | 6 +++--- previewer_code/indico_previewer_code/__init__.py | 1 + previewer_code/indico_previewer_code/plugin.py | 2 +- .../indico_previewer_jupyter/__init__.py | 1 + .../indico_previewer_jupyter/blueprint.py | 1 + .../indico_previewer_jupyter/controllers.py | 5 ++--- .../indico_previewer_jupyter/cpp_highlighter.py | 1 + search/indico_search/__init__.py | 5 +++-- search/indico_search/forms.py | 2 +- search/indico_search/util.py | 2 +- search/indico_search/views.py | 2 +- search_invenio/indico_search_invenio/__init__.py | 1 + search_invenio/indico_search_invenio/engine.py | 10 +++++----- search_invenio/indico_search_invenio/forms.py | 1 - search_invenio/indico_search_invenio/plugin.py | 4 ++-- vc_dummy/indico_vc_dummy/plugin.py | 4 ++-- vc_vidyo/indico_vc_vidyo/__init__.py | 1 + vc_vidyo/indico_vc_vidyo/api/__init__.py | 3 ++- vc_vidyo/indico_vc_vidyo/api/cache.py | 2 ++ vc_vidyo/indico_vc_vidyo/api/client.py | 1 + vc_vidyo/indico_vc_vidyo/blueprint.py | 1 + vc_vidyo/indico_vc_vidyo/forms.py | 7 ++++--- .../20170630_1611_6019621fea50_create_tables.py | 1 - vc_vidyo/indico_vc_vidyo/plugin.py | 12 ++++++------ vc_vidyo/indico_vc_vidyo/task.py | 3 ++- vc_vidyo/tests/task_test.py | 2 +- 73 files changed, 140 insertions(+), 117 deletions(-) diff --git a/chat/indico_chat/__init__.py b/chat/indico_chat/__init__.py index d9d8c7f..2bb69bb 100644 --- a/chat/indico_chat/__init__.py +++ b/chat/indico_chat/__init__.py @@ -18,4 +18,5 @@ from __future__ import unicode_literals from indico.util.i18n import make_bound_gettext + _ = make_bound_gettext('chat') diff --git a/chat/indico_chat/blueprint.py b/chat/indico_chat/blueprint.py index 5243550..19866b3 100644 --- a/chat/indico_chat/blueprint.py +++ b/chat/indico_chat/blueprint.py @@ -19,10 +19,11 @@ from __future__ import unicode_literals from indico.core.plugins import IndicoPluginBlueprint from indico_chat.controllers.event import RHChatEventPage -from indico_chat.controllers.logs import RHChatManageEventLogs, RHChatManageEventShowLogs, RHChatManageEventAttachLogs -from indico_chat.controllers.management import (RHChatManageEvent, RHChatManageEventModify, RHChatManageEventRefresh, - RHChatManageEventRemove, RHChatManageEventCreate, - RHChatManageEventAttach) +from indico_chat.controllers.logs import RHChatManageEventAttachLogs, RHChatManageEventLogs, RHChatManageEventShowLogs +from indico_chat.controllers.management import (RHChatManageEvent, RHChatManageEventAttach, RHChatManageEventCreate, + RHChatManageEventModify, RHChatManageEventRefresh, + RHChatManageEventRemove) + blueprint = IndicoPluginBlueprint('chat', 'indico_chat', url_prefix='/event/') diff --git a/chat/indico_chat/controllers/logs.py b/chat/indico_chat/controllers/logs.py index 1d54a03..6a079fb 100644 --- a/chat/indico_chat/controllers/logs.py +++ b/chat/indico_chat/controllers/logs.py @@ -18,8 +18,7 @@ from __future__ import unicode_literals from datetime import datetime -from flask import request, flash, redirect, jsonify, session - +from flask import flash, jsonify, redirect, request, session from indico.core import signals from indico.core.db import db @@ -27,12 +26,12 @@ from indico.core.db.sqlalchemy.protection import ProtectionMode from indico.core.plugins import url_for_plugin from indico.modules.attachments.models.attachments import Attachment, AttachmentFile, AttachmentType from indico.modules.attachments.models.folders import AttachmentFolder -from indico.modules.events.logs import EventLogRealm, EventLogKind +from indico.modules.events.logs import EventLogKind, EventLogRealm from indico.util.date_time import format_date from indico.util.fs import secure_filename from indico_chat import _ -from indico_chat.controllers.base import RHEventChatroomMixin, RHChatManageEventBase +from indico_chat.controllers.base import RHChatManageEventBase, RHEventChatroomMixin from indico_chat.views import WPChatEventMgmt from indico_chat.xmpp import retrieve_logs diff --git a/chat/indico_chat/controllers/management.py b/chat/indico_chat/controllers/management.py index c3459b2..0169642 100644 --- a/chat/indico_chat/controllers/management.py +++ b/chat/indico_chat/controllers/management.py @@ -16,14 +16,14 @@ from __future__ import unicode_literals -from flask import session, flash, redirect, jsonify +from flask import flash, jsonify, redirect, session from flask_pluginengine import current_plugin, render_plugin_template from indico.core.db import db from indico.core.db.sqlalchemy.util.models import attrs_changed from indico.core.errors import IndicoError from indico.core.plugins import url_for_plugin -from indico.modules.events.logs import EventLogRealm, EventLogKind +from indico.modules.events.logs import EventLogKind, EventLogRealm from indico.util.date_time import now_utc from indico.util.string import to_unicode from indico.web.forms.base import FormDefaults @@ -31,11 +31,11 @@ from indico.web.util import jsonify_data, jsonify_template from indico_chat import _ from indico_chat.controllers.base import RHChatManageEventBase, RHEventChatroomMixin -from indico_chat.forms import AddChatroomForm, EditChatroomForm, AttachChatroomForm -from indico_chat.models.chatrooms import ChatroomEventAssociation, Chatroom -from indico_chat.notifications import notify_created, notify_attached, notify_modified, notify_deleted +from indico_chat.forms import AddChatroomForm, AttachChatroomForm, EditChatroomForm +from indico_chat.models.chatrooms import Chatroom, ChatroomEventAssociation +from indico_chat.notifications import notify_attached, notify_created, notify_deleted, notify_modified from indico_chat.views import WPChatEventMgmt -from indico_chat.xmpp import create_room, update_room, get_room_config, room_exists +from indico_chat.xmpp import create_room, get_room_config, room_exists, update_room class AttachChatroomMixin: diff --git a/chat/indico_chat/migrations/20170630_1551_3888761f35f7_create_tables.py b/chat/indico_chat/migrations/20170630_1551_3888761f35f7_create_tables.py index 3ab5477..446381f 100644 --- a/chat/indico_chat/migrations/20170630_1551_3888761f35f7_create_tables.py +++ b/chat/indico_chat/migrations/20170630_1551_3888761f35f7_create_tables.py @@ -7,10 +7,10 @@ Create Date: 2017-06-30 15:51:54.477207 import sqlalchemy as sa from alembic import op -from indico.core.db.sqlalchemy import UTCDateTime - from sqlalchemy.sql.ddl import CreateSchema, DropSchema +from indico.core.db.sqlalchemy import UTCDateTime + # revision identifiers, used by Alembic. revision = '3888761f35f7' diff --git a/chat/indico_chat/models/chatrooms.py b/chat/indico_chat/models/chatrooms.py index 851a4d6..205bda5 100644 --- a/chat/indico_chat/models/chatrooms.py +++ b/chat/indico_chat/models/chatrooms.py @@ -16,7 +16,7 @@ from __future__ import unicode_literals -from indico.core.db.sqlalchemy import db, UTCDateTime +from indico.core.db.sqlalchemy import UTCDateTime, db from indico.util.date_time import now_utc from indico.util.string import return_ascii diff --git a/chat/indico_chat/plugin.py b/chat/indico_chat/plugin.py index 152c010..c9dfda9 100644 --- a/chat/indico_chat/plugin.py +++ b/chat/indico_chat/plugin.py @@ -29,7 +29,7 @@ from indico.core.plugins import IndicoPlugin, url_for_plugin from indico.modules.events.cloning import EventCloner from indico.modules.events.layout.util import MenuEntryData from indico.web.forms.base import IndicoForm -from indico.web.forms.fields import PrincipalListField, MultipleItemsField, EmailListField, IndicoPasswordField +from indico.web.forms.fields import EmailListField, IndicoPasswordField, MultipleItemsField, PrincipalListField from indico.web.forms.widgets import CKEditorWidget from indico.web.menu import SideMenuItem diff --git a/chat/indico_chat/util.py b/chat/indico_chat/util.py index aac422b..7e892db 100644 --- a/chat/indico_chat/util.py +++ b/chat/indico_chat/util.py @@ -15,6 +15,7 @@ # along with Indico; if not, see . from __future__ import unicode_literals + from indico.core.errors import IndicoError from indico_chat import _ diff --git a/chat/indico_chat/xmpp.py b/chat/indico_chat/xmpp.py index 6b6196b..07a43b1 100644 --- a/chat/indico_chat/xmpp.py +++ b/chat/indico_chat/xmpp.py @@ -26,13 +26,14 @@ from flask_pluginengine import current_plugin from requests.exceptions import RequestException from indico.util.string import unicode_to_ascii + from indico_chat.util import check_config # XXX: SleekXMPP sets the default encoding to UTF8. We don't want that! sys.setdefaultencoding = lambda x: None -from sleekxmpp import ClientXMPP -from sleekxmpp.exceptions import IqError +from sleekxmpp import ClientXMPP # isort:skip +from sleekxmpp.exceptions import IqError # isort:skip del sys.setdefaultencoding diff --git a/importer/indico_importer/__init__.py b/importer/indico_importer/__init__.py index f4c0da3..56f3c9e 100644 --- a/importer/indico_importer/__init__.py +++ b/importer/indico_importer/__init__.py @@ -18,8 +18,9 @@ from __future__ import unicode_literals from indico.util.i18n import make_bound_gettext + _ = make_bound_gettext('importer') __all__ = ('ImporterSourcePluginBase', 'ImporterEngineBase') -from .base import ImporterSourcePluginBase, ImporterEngineBase +from .base import ImporterSourcePluginBase, ImporterEngineBase # isort:skip diff --git a/importer/indico_importer/base.py b/importer/indico_importer/base.py index 4b797d4..5c044c4 100644 --- a/importer/indico_importer/base.py +++ b/importer/indico_importer/base.py @@ -19,6 +19,7 @@ from __future__ import unicode_literals from flask_pluginengine import depends from indico.core.plugins import IndicoPlugin, PluginCategory + from indico_importer.plugin import ImporterPlugin diff --git a/importer/indico_importer/controllers.py b/importer/indico_importer/controllers.py index f7d3b1a..121b6fb 100644 --- a/importer/indico_importer/controllers.py +++ b/importer/indico_importer/controllers.py @@ -25,9 +25,9 @@ from pytz import timezone, utc from werkzeug.exceptions import NotFound from indico.core.db import db +from indico.legacy.webinterface.rh.base import RHProtected from indico.modules.events.timetable.controllers import RHManageTimetableBase from indico.modules.events.timetable.models.entries import TimetableEntry, TimetableEntryType -from indico.legacy.webinterface.rh.base import RHProtected class RHGetImporters(RHProtected): diff --git a/importer/indico_importer/converter.py b/importer/indico_importer/converter.py index 8f64490..b0550a9 100644 --- a/importer/indico_importer/converter.py +++ b/importer/indico_importer/converter.py @@ -16,6 +16,7 @@ from __future__ import unicode_literals + APPEND = object() diff --git a/importer/indico_importer/plugin.py b/importer/indico_importer/plugin.py index 566f7b2..d5e3da5 100644 --- a/importer/indico_importer/plugin.py +++ b/importer/indico_importer/plugin.py @@ -17,12 +17,12 @@ from __future__ import unicode_literals from indico.core import signals -from indico.core.plugins import IndicoPlugin, IndicoPluginBlueprint, plugin_url_rule_to_js, PluginCategory +from indico.core.plugins import IndicoPlugin, IndicoPluginBlueprint, PluginCategory, plugin_url_rule_to_js from indico.modules.events.timetable.views import WPManageTimetable from indico.web.flask.util import url_rule_to_js from indico_importer import _ -from indico_importer.controllers import RHGetImporters, RHImportData, RHDayEndTime, RHBlockEndTime +from indico_importer.controllers import RHBlockEndTime, RHDayEndTime, RHGetImporters, RHImportData class ImporterPlugin(IndicoPlugin): diff --git a/importer_invenio/indico_importer_invenio/__init__.py b/importer_invenio/indico_importer_invenio/__init__.py index 81d953a..b169b5c 100644 --- a/importer_invenio/indico_importer_invenio/__init__.py +++ b/importer_invenio/indico_importer_invenio/__init__.py @@ -18,4 +18,5 @@ from __future__ import unicode_literals from indico.util.i18n import make_bound_gettext + _ = make_bound_gettext('importer_invenio') diff --git a/importer_invenio/indico_importer_invenio/connector.py b/importer_invenio/indico_importer_invenio/connector.py index 400f7e9..09e1edf 100644 --- a/importer_invenio/indico_importer_invenio/connector.py +++ b/importer_invenio/indico_importer_invenio/connector.py @@ -45,18 +45,18 @@ FIXME: from __future__ import print_function +import os +import re +import sys +import tempfile +import time import urllib import urllib2 -import requests import xml.sax -import re -import tempfile -import os -import time -import sys -from requests.exceptions import (ConnectionError, InvalidSchema, InvalidURL, - MissingSchema, RequestException) +import requests +from requests.exceptions import ConnectionError, InvalidSchema, InvalidURL, MissingSchema, RequestException + MECHANIZE_CLIENTFORM_VERSION_CHANGE = (0, 2, 0) try: diff --git a/importer_invenio/indico_importer_invenio/converters.py b/importer_invenio/indico_importer_invenio/converters.py index a4c7d13..5acaecf 100644 --- a/importer_invenio/indico_importer_invenio/converters.py +++ b/importer_invenio/indico_importer_invenio/converters.py @@ -14,9 +14,10 @@ # You should have received a copy of the GNU General Public License # along with Indico; if not, see . +from indico.legacy.webinterface.common.tools import strip_ml_tags + from indico_importer.converter import APPEND, RecordConverter from indico_importer.util import convert_dt_tuple -from indico.legacy.webinterface.common.tools import strip_ml_tags class InvenioRecordConverterBase(RecordConverter): diff --git a/livesync/indico_livesync/__init__.py b/livesync/indico_livesync/__init__.py index 08709f0..6d76073 100644 --- a/livesync/indico_livesync/__init__.py +++ b/livesync/indico_livesync/__init__.py @@ -24,11 +24,11 @@ _ = make_bound_gettext('livesync') __all__ = ('LiveSyncPluginBase', 'LiveSyncBackendBase', 'AgentForm', 'SimpleChange', 'process_records', 'MARCXMLGenerator', 'Uploader', 'MARCXMLUploader') -from .base import LiveSyncPluginBase, LiveSyncBackendBase -from .forms import AgentForm -from .simplify import SimpleChange, process_records -from .marcxml import MARCXMLGenerator -from .uploader import Uploader, MARCXMLUploader +from .base import LiveSyncPluginBase, LiveSyncBackendBase # isort:skip +from .forms import AgentForm # isort:skip +from .simplify import SimpleChange, process_records # isort:skip +from .marcxml import MARCXMLGenerator # isort:skip +from .uploader import Uploader, MARCXMLUploader # isort:skip @signals.import_tasks.connect diff --git a/livesync/indico_livesync/blueprint.py b/livesync/indico_livesync/blueprint.py index 891ccac..8526110 100644 --- a/livesync/indico_livesync/blueprint.py +++ b/livesync/indico_livesync/blueprint.py @@ -18,7 +18,8 @@ from __future__ import unicode_literals from indico.core.plugins import IndicoPluginBlueprint -from indico_livesync.controllers import RHAddAgent, RHEditAgent, RHDeleteAgent +from indico_livesync.controllers import RHAddAgent, RHDeleteAgent, RHEditAgent + blueprint = IndicoPluginBlueprint('livesync', 'indico_livesync', url_prefix='/admin/plugins/livesync') diff --git a/livesync/indico_livesync/controllers.py b/livesync/indico_livesync/controllers.py index db2802c..f297d13 100644 --- a/livesync/indico_livesync/controllers.py +++ b/livesync/indico_livesync/controllers.py @@ -16,8 +16,8 @@ from __future__ import unicode_literals -from flask import request, redirect, flash -from flask_pluginengine import render_plugin_template, current_plugin +from flask import flash, redirect, request +from flask_pluginengine import current_plugin, render_plugin_template from werkzeug.exceptions import NotFound from indico.core.db import db diff --git a/livesync/indico_livesync/handler.py b/livesync/indico_livesync/handler.py index ec0fe31..27c377d 100644 --- a/livesync/indico_livesync/handler.py +++ b/livesync/indico_livesync/handler.py @@ -30,8 +30,8 @@ from indico.modules.events.contributions.models.subcontributions import SubContr from indico.modules.events.sessions import Session from indico.util.event import unify_event_args -from indico_livesync.models.queue import LiveSyncQueueEntry, ChangeType -from indico_livesync.util import obj_ref, get_excluded_categories +from indico_livesync.models.queue import ChangeType, LiveSyncQueueEntry +from indico_livesync.util import get_excluded_categories, obj_ref def connect_signals(plugin): diff --git a/livesync/indico_livesync/marcxml.py b/livesync/indico_livesync/marcxml.py index 2f8bd55..0c4f7f5 100644 --- a/livesync/indico_livesync/marcxml.py +++ b/livesync/indico_livesync/marcxml.py @@ -18,15 +18,14 @@ from __future__ import unicode_literals from flask_pluginengine import current_plugin -from indico.modules.users import User from indico.legacy.accessControl import AccessWrapper from indico.legacy.common.output import outputGenerator from indico.legacy.common.xmlGen import XMLGen - from indico.modules.categories.models.categories import Category from indico.modules.events.contributions.models.contributions import Contribution from indico.modules.events.contributions.models.subcontributions import SubContribution from indico.modules.events.models.events import Event +from indico.modules.users import User from indico_livesync import SimpleChange from indico_livesync.util import compound_id, obj_ref diff --git a/livesync/indico_livesync/migrations/20170630_1557_aa0dbc6c14aa_create_tables.py b/livesync/indico_livesync/migrations/20170630_1557_aa0dbc6c14aa_create_tables.py index 03e071c..c3571cc 100644 --- a/livesync/indico_livesync/migrations/20170630_1557_aa0dbc6c14aa_create_tables.py +++ b/livesync/indico_livesync/migrations/20170630_1557_aa0dbc6c14aa_create_tables.py @@ -11,6 +11,7 @@ from sqlalchemy.dialects import postgresql from sqlalchemy.sql.ddl import CreateSchema, DropSchema from indico.core.db.sqlalchemy import PyIntEnum, UTCDateTime + from indico_livesync.models.queue import ChangeType, EntryType diff --git a/livesync/indico_livesync/models/agents.py b/livesync/indico_livesync/models/agents.py index 0671507..589bfd7 100644 --- a/livesync/indico_livesync/models/agents.py +++ b/livesync/indico_livesync/models/agents.py @@ -18,7 +18,7 @@ from __future__ import unicode_literals from sqlalchemy.dialects.postgresql import JSON -from indico.core.db.sqlalchemy import db, UTCDateTime +from indico.core.db.sqlalchemy import UTCDateTime, db from indico.util.date_time import now_utc from indico.util.string import return_ascii diff --git a/livesync/indico_livesync/models/queue.py b/livesync/indico_livesync/models/queue.py index 126d35a..bf1b84e 100644 --- a/livesync/indico_livesync/models/queue.py +++ b/livesync/indico_livesync/models/queue.py @@ -18,11 +18,11 @@ from __future__ import unicode_literals from werkzeug.datastructures import ImmutableDict -from indico.core.db.sqlalchemy import db, UTCDateTime, PyIntEnum +from indico.core.db.sqlalchemy import PyIntEnum, UTCDateTime, db from indico.modules.categories.models.categories import Category from indico.modules.events.models.events import Event from indico.util.date_time import now_utc -from indico.util.string import return_ascii, format_repr +from indico.util.string import format_repr, return_ascii from indico.util.struct.enum import IndicoEnum from indico_livesync.models.agents import LiveSyncAgent diff --git a/livesync/indico_livesync/plugin.py b/livesync/indico_livesync/plugin.py index ee05d41..12bbd24 100644 --- a/livesync/indico_livesync/plugin.py +++ b/livesync/indico_livesync/plugin.py @@ -16,8 +16,8 @@ from __future__ import unicode_literals -from wtforms.validators import NumberRange from wtforms.fields.html5 import IntegerField +from wtforms.validators import NumberRange from indico.core import signals from indico.core.plugins import IndicoPlugin, PluginCategory diff --git a/livesync/indico_livesync/simplify.py b/livesync/indico_livesync/simplify.py index bb6d712..5108476 100644 --- a/livesync/indico_livesync/simplify.py +++ b/livesync/indico_livesync/simplify.py @@ -23,11 +23,11 @@ from sqlalchemy.orm import joinedload from indico.core.db import db from indico.modules.categories.models.categories import Category -from indico.modules.events.models.events import Event from indico.modules.events.contributions.models.contributions import Contribution from indico.modules.events.contributions.models.subcontributions import SubContribution - +from indico.modules.events.models.events import Event from indico.util.struct.enum import IndicoEnum + from indico_livesync.models.queue import ChangeType, EntryType diff --git a/livesync/indico_livesync/uploader.py b/livesync/indico_livesync/uploader.py index 70eac20..faa9d02 100644 --- a/livesync/indico_livesync/uploader.py +++ b/livesync/indico_livesync/uploader.py @@ -18,6 +18,7 @@ from __future__ import unicode_literals from indico.core.db import db from indico.util.struct.iterables import grouper + from indico_livesync import MARCXMLGenerator, process_records diff --git a/livesync/indico_livesync/util.py b/livesync/indico_livesync/util.py index 111f0bc..603af64 100644 --- a/livesync/indico_livesync/util.py +++ b/livesync/indico_livesync/util.py @@ -23,8 +23,8 @@ from werkzeug.datastructures import ImmutableDict from indico.modules.categories.models.categories import Category from indico.modules.events import Event from indico.modules.events.contributions.models.contributions import Contribution -from indico.modules.events.sessions.models.sessions import Session from indico.modules.events.contributions.models.subcontributions import SubContribution +from indico.modules.events.sessions.models.sessions import Session from indico.util.caching import memoize_request from indico.util.date_time import now_utc diff --git a/livesync/tests/agent_test.py b/livesync/tests/agent_test.py index 157fb51..669a074 100644 --- a/livesync/tests/agent_test.py +++ b/livesync/tests/agent_test.py @@ -17,7 +17,7 @@ from mock import MagicMock from indico_livesync.base import LiveSyncBackendBase -from indico_livesync.models.queue import LiveSyncQueueEntry, ChangeType, EntryType +from indico_livesync.models.queue import ChangeType, EntryType, LiveSyncQueueEntry class DummyBackend(LiveSyncBackendBase): diff --git a/livesync/tests/queue_test.py b/livesync/tests/queue_test.py index 76e3c1d..9499b77 100644 --- a/livesync/tests/queue_test.py +++ b/livesync/tests/queue_test.py @@ -18,8 +18,8 @@ import pytest from indico.modules.categories import Category +from indico_livesync.models.queue import ChangeType, LiveSyncQueueEntry from indico_livesync.util import get_excluded_categories, obj_ref -from indico_livesync.models.queue import LiveSyncQueueEntry, ChangeType CATEGORY_PARENTS = { diff --git a/livesync/tests/simplify_test.py b/livesync/tests/simplify_test.py index 8f2defc..f4dba1f 100644 --- a/livesync/tests/simplify_test.py +++ b/livesync/tests/simplify_test.py @@ -13,12 +13,13 @@ # # You should have received a copy of the GNU General Public License # along with Indico; if not, see . -from indico.testing.util import bool_matrix import pytest -from indico_livesync import process_records, SimpleChange -from indico_livesync.models.queue import LiveSyncQueueEntry, ChangeType, EntryType +from indico.testing.util import bool_matrix + +from indico_livesync import SimpleChange, process_records +from indico_livesync.models.queue import ChangeType, EntryType, LiveSyncQueueEntry class Dummy(object): diff --git a/livesync/tests/uploader_test.py b/livesync/tests/uploader_test.py index b35d03f..921bb05 100644 --- a/livesync/tests/uploader_test.py +++ b/livesync/tests/uploader_test.py @@ -19,9 +19,8 @@ from mock import MagicMock, Mock from indico.modules.events.legacy import LegacyConference from indico_livesync import SimpleChange -from indico_livesync.models.queue import LiveSyncQueueEntry, ChangeType, EntryType -from indico_livesync.uploader import Uploader, MARCXMLUploader - +from indico_livesync.models.queue import ChangeType, EntryType, LiveSyncQueueEntry +from indico_livesync.uploader import MARCXMLUploader, Uploader class RecordingUploader(Uploader): diff --git a/livesync/tests/util_test.py b/livesync/tests/util_test.py index b6f8269..ff83c9c 100644 --- a/livesync/tests/util_test.py +++ b/livesync/tests/util_test.py @@ -18,7 +18,7 @@ from datetime import timedelta from indico.util.date_time import now_utc -from indico_livesync.models.queue import LiveSyncQueueEntry, ChangeType, EntryType +from indico_livesync.models.queue import ChangeType, EntryType, LiveSyncQueueEntry from indico_livesync.plugin import LiveSyncPlugin from indico_livesync.util import clean_old_entries diff --git a/livesync_debug/indico_livesync_debug/backend.py b/livesync_debug/indico_livesync_debug/backend.py index 67c3f0f..f7e8cfd 100644 --- a/livesync_debug/indico_livesync_debug/backend.py +++ b/livesync_debug/indico_livesync_debug/backend.py @@ -19,7 +19,7 @@ from __future__ import unicode_literals from indico.util.console import cformat from indico.util.struct.iterables import grouper -from indico_livesync import LiveSyncBackendBase, SimpleChange, MARCXMLGenerator, process_records, Uploader +from indico_livesync import LiveSyncBackendBase, MARCXMLGenerator, SimpleChange, Uploader, process_records def _change_str(change): diff --git a/livesync_debug/indico_livesync_debug/plugin.py b/livesync_debug/indico_livesync_debug/plugin.py index 867002b..6a7aaae 100644 --- a/livesync_debug/indico_livesync_debug/plugin.py +++ b/livesync_debug/indico_livesync_debug/plugin.py @@ -17,7 +17,6 @@ from __future__ import unicode_literals from indico_livesync import LiveSyncPluginBase - from indico_livesync_debug.backend import LiveSyncDebugBackend diff --git a/livesync_invenio/indico_livesync_invenio/__init__.py b/livesync_invenio/indico_livesync_invenio/__init__.py index f5fd219..558d93d 100644 --- a/livesync_invenio/indico_livesync_invenio/__init__.py +++ b/livesync_invenio/indico_livesync_invenio/__init__.py @@ -18,4 +18,5 @@ from __future__ import unicode_literals from indico.util.i18n import make_bound_gettext + _ = make_bound_gettext('livesync_invenio') diff --git a/livesync_invenio/indico_livesync_invenio/backend.py b/livesync_invenio/indico_livesync_invenio/backend.py index 5fdc271..ee91ff4 100644 --- a/livesync_invenio/indico_livesync_invenio/backend.py +++ b/livesync_invenio/indico_livesync_invenio/backend.py @@ -17,9 +17,9 @@ from __future__ import unicode_literals from wtforms.fields.html5 import URLField -from wtforms.validators import DataRequired, URL +from wtforms.validators import URL, DataRequired -from indico_livesync import LiveSyncBackendBase, MARCXMLUploader, AgentForm +from indico_livesync import AgentForm, LiveSyncBackendBase, MARCXMLUploader from indico_livesync_invenio import _ from indico_livesync_invenio.connector import InvenioConnector diff --git a/livesync_invenio/indico_livesync_invenio/connector.py b/livesync_invenio/indico_livesync_invenio/connector.py index 400f7e9..09e1edf 100644 --- a/livesync_invenio/indico_livesync_invenio/connector.py +++ b/livesync_invenio/indico_livesync_invenio/connector.py @@ -45,18 +45,18 @@ FIXME: from __future__ import print_function +import os +import re +import sys +import tempfile +import time import urllib import urllib2 -import requests import xml.sax -import re -import tempfile -import os -import time -import sys -from requests.exceptions import (ConnectionError, InvalidSchema, InvalidURL, - MissingSchema, RequestException) +import requests +from requests.exceptions import ConnectionError, InvalidSchema, InvalidURL, MissingSchema, RequestException + MECHANIZE_CLIENTFORM_VERSION_CHANGE = (0, 2, 0) try: diff --git a/livesync_invenio/indico_livesync_invenio/plugin.py b/livesync_invenio/indico_livesync_invenio/plugin.py index 02e8854..e731ecd 100644 --- a/livesync_invenio/indico_livesync_invenio/plugin.py +++ b/livesync_invenio/indico_livesync_invenio/plugin.py @@ -17,7 +17,6 @@ from __future__ import unicode_literals from indico_livesync import LiveSyncPluginBase - from indico_livesync_invenio.backend import InvenioLiveSyncBackend diff --git a/payment_paypal/indico_payment_paypal/__init__.py b/payment_paypal/indico_payment_paypal/__init__.py index cb5a09b..17e8ff8 100644 --- a/payment_paypal/indico_payment_paypal/__init__.py +++ b/payment_paypal/indico_payment_paypal/__init__.py @@ -18,4 +18,5 @@ from __future__ import unicode_literals from indico.util.i18n import make_bound_gettext + _ = make_bound_gettext('payment_paypal') diff --git a/payment_paypal/indico_payment_paypal/blueprint.py b/payment_paypal/indico_payment_paypal/blueprint.py index 1cdb37d..1c351d9 100644 --- a/payment_paypal/indico_payment_paypal/blueprint.py +++ b/payment_paypal/indico_payment_paypal/blueprint.py @@ -17,7 +17,8 @@ from __future__ import unicode_literals from indico.core.plugins import IndicoPluginBlueprint -from indico_payment_paypal.controllers import RHPaypalIPN, RHPaypalCancel, RHPaypalSuccess + +from indico_payment_paypal.controllers import RHPaypalCancel, RHPaypalIPN, RHPaypalSuccess blueprint = IndicoPluginBlueprint('payment_paypal', __name__, diff --git a/payment_paypal/indico_payment_paypal/controllers.py b/payment_paypal/indico_payment_paypal/controllers.py index 69fe4ed..c2148be 100644 --- a/payment_paypal/indico_payment_paypal/controllers.py +++ b/payment_paypal/indico_payment_paypal/controllers.py @@ -19,16 +19,16 @@ from __future__ import unicode_literals from itertools import chain import requests -from flask import request, flash, redirect +from flask import flash, redirect, request from flask_pluginengine import current_plugin from werkzeug.exceptions import BadRequest -from indico.modules.events.registration.models.registrations import Registration +from indico.legacy.webinterface.rh.base import RH from indico.modules.events.payment.models.transactions import TransactionAction from indico.modules.events.payment.notifications import notify_amount_inconsistency from indico.modules.events.payment.util import register_transaction +from indico.modules.events.registration.models.registrations import Registration from indico.web.flask.util import url_for -from indico.legacy.webinterface.rh.base import RH from indico_payment_paypal import _ diff --git a/payment_paypal/indico_payment_paypal/plugin.py b/payment_paypal/indico_payment_paypal/plugin.py index d290632..510d4f4 100644 --- a/payment_paypal/indico_payment_paypal/plugin.py +++ b/payment_paypal/indico_payment_paypal/plugin.py @@ -21,8 +21,8 @@ from wtforms.fields.html5 import URLField from wtforms.validators import DataRequired, Optional from indico.core.plugins import IndicoPlugin, url_for_plugin -from indico.modules.events.payment import (PaymentPluginMixin, PaymentPluginSettingsFormBase, - PaymentEventSettingsFormBase) +from indico.modules.events.payment import (PaymentEventSettingsFormBase, PaymentPluginMixin, + PaymentPluginSettingsFormBase) from indico.util.string import remove_accents from indico.web.forms.validators import UsedIf diff --git a/piwik/indico_piwik/__init__.py b/piwik/indico_piwik/__init__.py index 435fc93..9259c79 100644 --- a/piwik/indico_piwik/__init__.py +++ b/piwik/indico_piwik/__init__.py @@ -18,4 +18,5 @@ from __future__ import unicode_literals from indico.util.i18n import make_bound_gettext + _ = make_bound_gettext('piwik') diff --git a/piwik/indico_piwik/controllers.py b/piwik/indico_piwik/controllers.py index a509ac3..8b65f6d 100644 --- a/piwik/indico_piwik/controllers.py +++ b/piwik/indico_piwik/controllers.py @@ -19,9 +19,9 @@ from flask import jsonify from indico.core.config import Config from indico.modules.events.management.controllers import RHManageEventBase -from indico_piwik.views import WPStatistics from indico_piwik.reports import (ReportCountries, ReportDevices, ReportDownloads, ReportGeneral, ReportMaterial, ReportVisitsPerDay) +from indico_piwik.views import WPStatistics class RHStatistics(RHManageEventBase): diff --git a/piwik/indico_piwik/piwik.py b/piwik/indico_piwik/piwik.py index f59f8f7..cdfff98 100644 --- a/piwik/indico_piwik/piwik.py +++ b/piwik/indico_piwik/piwik.py @@ -17,8 +17,8 @@ import socket from urllib2 import urlparse -from flask_pluginengine import current_plugin import requests +from flask_pluginengine import current_plugin class PiwikRequest(object): diff --git a/piwik/indico_piwik/plugin.py b/piwik/indico_piwik/plugin.py index eb901d2..8d7c86e 100644 --- a/piwik/indico_piwik/plugin.py +++ b/piwik/indico_piwik/plugin.py @@ -20,14 +20,14 @@ from flask import request, session from flask_pluginengine import render_plugin_template from indico.core import signals -from indico.core.plugins import IndicoPlugin, IndicoPluginBlueprint, url_for_plugin, plugin_url_rule_to_js +from indico.core.plugins import IndicoPlugin, IndicoPluginBlueprint, plugin_url_rule_to_js, url_for_plugin from indico.modules.attachments.models.attachments import AttachmentType from indico.modules.events.contributions import Contribution from indico.web.menu import SideMenuItem from indico_piwik import _ -from indico_piwik.controllers import (RHStatistics, RHApiMaterial, RHApiDownloads, RHApiEventVisitsPerDay, - RHApiEventGraphCountries, RHApiEventGraphDevices) +from indico_piwik.controllers import (RHApiDownloads, RHApiEventGraphCountries, RHApiEventGraphDevices, + RHApiEventVisitsPerDay, RHApiMaterial, RHStatistics) from indico_piwik.forms import SettingsForm from indico_piwik.queries.tracking import track_download_request diff --git a/previewer_code/indico_previewer_code/__init__.py b/previewer_code/indico_previewer_code/__init__.py index 49c2aba..73aa618 100644 --- a/previewer_code/indico_previewer_code/__init__.py +++ b/previewer_code/indico_previewer_code/__init__.py @@ -18,4 +18,5 @@ from .plugin import CodePreviewerPlugin + __all__ = ('CodePreviewerPlugin',) diff --git a/previewer_code/indico_previewer_code/plugin.py b/previewer_code/indico_previewer_code/plugin.py index 522e6ab..42cc9dc 100644 --- a/previewer_code/indico_previewer_code/plugin.py +++ b/previewer_code/indico_previewer_code/plugin.py @@ -20,8 +20,8 @@ import mimetypes from flask import render_template from pygments import highlight -from pygments.lexers import get_lexer_for_mimetype, CppLexer, PhpLexer, JavaLexer, RubyLexer from pygments.formatters import HtmlFormatter +from pygments.lexers import CppLexer, JavaLexer, PhpLexer, RubyLexer, get_lexer_for_mimetype from indico.core import signals from indico.core.plugins import IndicoPlugin diff --git a/previewer_jupyter/indico_previewer_jupyter/__init__.py b/previewer_jupyter/indico_previewer_jupyter/__init__.py index 3163fe4..908178a 100644 --- a/previewer_jupyter/indico_previewer_jupyter/__init__.py +++ b/previewer_jupyter/indico_previewer_jupyter/__init__.py @@ -18,4 +18,5 @@ from .plugin import JupyterPreviewerPlugin + __all__ = ('JupyterPreviewerPlugin',) diff --git a/previewer_jupyter/indico_previewer_jupyter/blueprint.py b/previewer_jupyter/indico_previewer_jupyter/blueprint.py index 9b5458c..33d3e88 100644 --- a/previewer_jupyter/indico_previewer_jupyter/blueprint.py +++ b/previewer_jupyter/indico_previewer_jupyter/blueprint.py @@ -15,6 +15,7 @@ # along with Indico; if not, see . from indico.core.plugins import IndicoPluginBlueprint + from indico_previewer_jupyter.controllers import RHEventPreviewIPyNB diff --git a/previewer_jupyter/indico_previewer_jupyter/controllers.py b/previewer_jupyter/indico_previewer_jupyter/controllers.py index 9bf6707..a78c3e8 100644 --- a/previewer_jupyter/indico_previewer_jupyter/controllers.py +++ b/previewer_jupyter/indico_previewer_jupyter/controllers.py @@ -17,14 +17,13 @@ from uuid import uuid4 import nbformat -from flask import session, render_template, request, current_app +from flask import current_app, render_template, request, session from nbconvert.exporters import HTMLExporter from traitlets.config import Config from werkzeug.exceptions import Forbidden -from indico.modules.attachments import Attachment - from indico.legacy.webinterface.rh.base import RH +from indico.modules.attachments import Attachment from indico_previewer_jupyter.cpp_highlighter import CppHighlighter diff --git a/previewer_jupyter/indico_previewer_jupyter/cpp_highlighter.py b/previewer_jupyter/indico_previewer_jupyter/cpp_highlighter.py index 4c8df2f..a9fa09b 100644 --- a/previewer_jupyter/indico_previewer_jupyter/cpp_highlighter.py +++ b/previewer_jupyter/indico_previewer_jupyter/cpp_highlighter.py @@ -26,6 +26,7 @@ Code courtesy of the ROOT project (https://root.cern.ch). """ import re + from nbconvert.preprocessors.base import Preprocessor diff --git a/search/indico_search/__init__.py b/search/indico_search/__init__.py index 99260ee..9634feb 100644 --- a/search/indico_search/__init__.py +++ b/search/indico_search/__init__.py @@ -18,8 +18,9 @@ from __future__ import unicode_literals from indico.util.i18n import make_bound_gettext + _ = make_bound_gettext('search') __all__ = ('SearchPluginBase', 'SearchEngine', 'SearchForm') -from .base import SearchPluginBase, SearchEngine -from .forms import SearchForm +from .base import SearchPluginBase, SearchEngine # isort:skip +from .forms import SearchForm # isort:skip diff --git a/search/indico_search/forms.py b/search/indico_search/forms.py index f86414a..82f2416 100644 --- a/search/indico_search/forms.py +++ b/search/indico_search/forms.py @@ -17,7 +17,7 @@ from __future__ import unicode_literals from flask import request -from wtforms.fields.core import StringField, SelectField +from wtforms.fields.core import SelectField, StringField from wtforms.validators import Optional from indico.web.forms.base import IndicoForm diff --git a/search/indico_search/util.py b/search/indico_search/util.py index df1502b..bc817ec 100644 --- a/search/indico_search/util.py +++ b/search/indico_search/util.py @@ -16,7 +16,7 @@ from __future__ import unicode_literals -from flask_pluginengine import render_plugin_template, current_plugin +from flask_pluginengine import current_plugin, render_plugin_template def render_engine_or_search_template(template_name, **context): diff --git a/search/indico_search/views.py b/search/indico_search/views.py index 7d86afc..e1d365f 100644 --- a/search/indico_search/views.py +++ b/search/indico_search/views.py @@ -17,8 +17,8 @@ from __future__ import unicode_literals from indico.core.plugins import WPJinjaMixinPlugin -from indico.modules.categories.views import WPCategory from indico.legacy.webinterface.pages.conferences import WPConferenceDefaultDisplayBase +from indico.modules.categories.views import WPCategory class WPSearchCategory(WPJinjaMixinPlugin, WPCategory): diff --git a/search_invenio/indico_search_invenio/__init__.py b/search_invenio/indico_search_invenio/__init__.py index 148f789..79173ab 100644 --- a/search_invenio/indico_search_invenio/__init__.py +++ b/search_invenio/indico_search_invenio/__init__.py @@ -18,4 +18,5 @@ from __future__ import unicode_literals from indico.util.i18n import make_bound_gettext + _ = make_bound_gettext('search_invenio') diff --git a/search_invenio/indico_search_invenio/engine.py b/search_invenio/indico_search_invenio/engine.py index 64a4c2e..88fd572 100644 --- a/search_invenio/indico_search_invenio/engine.py +++ b/search_invenio/indico_search_invenio/engine.py @@ -18,20 +18,20 @@ from __future__ import unicode_literals import os import re -from datetime import timedelta, datetime +from datetime import datetime, timedelta +from xml.dom import minidom import requests -from flask import redirect, request, jsonify +from flask import jsonify, redirect, request from flask_pluginengine import current_plugin from lxml import etree from werkzeug.urls import url_encode -from xml.dom import minidom from indico.core.db import db from indico.core.plugins import get_plugin_template_module -from indico_search import SearchEngine -from indico_search_invenio.entries import Author, SubContributionEntry, ContributionEntry, EventEntry +from indico_search import SearchEngine +from indico_search_invenio.entries import Author, ContributionEntry, EventEntry, SubContributionEntry class InvenioRemoteSearch(object): diff --git a/search_invenio/indico_search_invenio/forms.py b/search_invenio/indico_search_invenio/forms.py index a51bad5..62b3c6f 100644 --- a/search_invenio/indico_search_invenio/forms.py +++ b/search_invenio/indico_search_invenio/forms.py @@ -19,7 +19,6 @@ from __future__ import unicode_literals from wtforms.fields.core import SelectField from indico_search import SearchForm - from indico_search_invenio import _ diff --git a/search_invenio/indico_search_invenio/plugin.py b/search_invenio/indico_search_invenio/plugin.py index fb26d38..06b0d99 100644 --- a/search_invenio/indico_search_invenio/plugin.py +++ b/search_invenio/indico_search_invenio/plugin.py @@ -17,14 +17,14 @@ from __future__ import unicode_literals from wtforms.fields.core import SelectField -from wtforms.fields.html5 import URLField, IntegerField +from wtforms.fields.html5 import IntegerField, URLField from wtforms.validators import URL, NumberRange from indico.core.plugins import IndicoPluginBlueprint from indico.web.forms.base import IndicoForm + from indico_search import SearchPluginBase from indico_search.views import WPSearchCategory, WPSearchConference - from indico_search_invenio import _ from indico_search_invenio.engine import InvenioSearchEngine from indico_search_invenio.forms import InvenioSearchForm diff --git a/vc_dummy/indico_vc_dummy/plugin.py b/vc_dummy/indico_vc_dummy/plugin.py index 76021cd..604ff55 100644 --- a/vc_dummy/indico_vc_dummy/plugin.py +++ b/vc_dummy/indico_vc_dummy/plugin.py @@ -19,9 +19,9 @@ from __future__ import unicode_literals from sqlalchemy.orm.attributes import flag_modified from wtforms.fields.core import BooleanField -from indico.core.plugins import IndicoPlugin, url_for_plugin, IndicoPluginBlueprint +from indico.core.plugins import IndicoPlugin, IndicoPluginBlueprint, url_for_plugin from indico.modules.vc import VCPluginMixin -from indico.modules.vc.forms import VCRoomFormBase, VCRoomAttachFormBase +from indico.modules.vc.forms import VCRoomAttachFormBase, VCRoomFormBase from indico.web.forms.widgets import SwitchWidget diff --git a/vc_vidyo/indico_vc_vidyo/__init__.py b/vc_vidyo/indico_vc_vidyo/__init__.py index a8fbc44..96022c4 100644 --- a/vc_vidyo/indico_vc_vidyo/__init__.py +++ b/vc_vidyo/indico_vc_vidyo/__init__.py @@ -19,6 +19,7 @@ from __future__ import unicode_literals from indico.core import signals from indico.util.i18n import make_bound_gettext + _ = make_bound_gettext('vc_vidyo') diff --git a/vc_vidyo/indico_vc_vidyo/api/__init__.py b/vc_vidyo/indico_vc_vidyo/api/__init__.py index 2435bb1..c90f2e0 100644 --- a/vc_vidyo/indico_vc_vidyo/api/__init__.py +++ b/vc_vidyo/indico_vc_vidyo/api/__init__.py @@ -15,6 +15,7 @@ # along with Indico; if not, see . -from .client import UserClient, AdminClient, APIException, RoomNotFoundAPIException +from .client import AdminClient, APIException, RoomNotFoundAPIException, UserClient + __all__ = ['UserClient', 'AdminClient', 'APIException', 'RoomNotFoundAPIException'] diff --git a/vc_vidyo/indico_vc_vidyo/api/cache.py b/vc_vidyo/indico_vc_vidyo/api/cache.py index 5d57483..e937747 100644 --- a/vc_vidyo/indico_vc_vidyo/api/cache.py +++ b/vc_vidyo/indico_vc_vidyo/api/cache.py @@ -15,8 +15,10 @@ # along with Indico; if not, see . from zeep.cache import Base + from indico.legacy.common.cache import GenericCache + DEFAULT_CACHE_TTL = 24 * 3600 diff --git a/vc_vidyo/indico_vc_vidyo/api/client.py b/vc_vidyo/indico_vc_vidyo/api/client.py index b8826eb..6346076 100644 --- a/vc_vidyo/indico_vc_vidyo/api/client.py +++ b/vc_vidyo/indico_vc_vidyo/api/client.py @@ -22,6 +22,7 @@ from zeep.transports import Transport from indico_vc_vidyo.api.cache import ZeepCache + DEFAULT_CLIENT_TIMEOUT = 30 AUTOMUTE_API_PROFILE = "NoAudioAndVideo" diff --git a/vc_vidyo/indico_vc_vidyo/blueprint.py b/vc_vidyo/indico_vc_vidyo/blueprint.py index 16a931c..32bb4ee 100644 --- a/vc_vidyo/indico_vc_vidyo/blueprint.py +++ b/vc_vidyo/indico_vc_vidyo/blueprint.py @@ -20,6 +20,7 @@ from indico.core.plugins import IndicoPluginBlueprint from indico_vc_vidyo.controllers import RHVidyoRoomOwner + blueprint = IndicoPluginBlueprint('vc_vidyo', 'indico_vc_vidyo') # Room management diff --git a/vc_vidyo/indico_vc_vidyo/forms.py b/vc_vidyo/indico_vc_vidyo/forms.py index e15ddeb..4098b73 100644 --- a/vc_vidyo/indico_vc_vidyo/forms.py +++ b/vc_vidyo/indico_vc_vidyo/forms.py @@ -18,17 +18,18 @@ from __future__ import unicode_literals from wtforms.fields.core import BooleanField from wtforms.fields.simple import TextAreaField -from wtforms.validators import DataRequired, Length, Optional, ValidationError, Regexp +from wtforms.validators import DataRequired, Length, Optional, Regexp, ValidationError -from indico.modules.vc.forms import VCRoomFormBase, VCRoomAttachFormBase +from indico.modules.vc.forms import VCRoomAttachFormBase, VCRoomFormBase from indico.util.user import retrieve_principal from indico.web.forms.base import generated_data -from indico.web.forms.fields import PrincipalField, IndicoPasswordField +from indico.web.forms.fields import IndicoPasswordField, PrincipalField from indico.web.forms.widgets import SwitchWidget from indico_vc_vidyo import _ from indico_vc_vidyo.util import iter_user_identities + PIN_VALIDATORS = [Optional(), Length(min=3, max=10), Regexp(r'^\d+$', message=_("The PIN must be a number"))] diff --git a/vc_vidyo/indico_vc_vidyo/migrations/20170630_1611_6019621fea50_create_tables.py b/vc_vidyo/indico_vc_vidyo/migrations/20170630_1611_6019621fea50_create_tables.py index acd5d1e..504c0ef 100644 --- a/vc_vidyo/indico_vc_vidyo/migrations/20170630_1611_6019621fea50_create_tables.py +++ b/vc_vidyo/indico_vc_vidyo/migrations/20170630_1611_6019621fea50_create_tables.py @@ -7,7 +7,6 @@ Create Date: 2017-06-30 16:11:31.486845 import sqlalchemy as sa from alembic import op - from sqlalchemy.sql.ddl import CreateSchema, DropSchema diff --git a/vc_vidyo/indico_vc_vidyo/plugin.py b/vc_vidyo/indico_vc_vidyo/plugin.py index 341fa1c..04f2982 100644 --- a/vc_vidyo/indico_vc_vidyo/plugin.py +++ b/vc_vidyo/indico_vc_vidyo/plugin.py @@ -19,17 +19,17 @@ from __future__ import unicode_literals from flask import session from sqlalchemy.orm.attributes import flag_modified from wtforms.fields import IntegerField, TextAreaField -from wtforms.fields.html5 import URLField, EmailField +from wtforms.fields.html5 import EmailField, URLField from wtforms.fields.simple import StringField -from wtforms.validators import NumberRange, DataRequired +from wtforms.validators import DataRequired, NumberRange +from indico.core import signals from indico.core.auth import multipass from indico.core.config import Config from indico.core.plugins import IndicoPlugin, url_for_plugin -from indico.core import signals from indico.modules.events.views import WPSimpleEventDisplay +from indico.modules.vc import VCPluginMixin, VCPluginSettingsFormBase from indico.modules.vc.exceptions import VCRoomError, VCRoomNotFoundError -from indico.modules.vc import VCPluginSettingsFormBase, VCPluginMixin from indico.modules.vc.views import WPVCEventPage, WPVCManageEvent from indico.util.user import retrieve_principal from indico.web.forms.fields import IndicoPasswordField @@ -40,10 +40,10 @@ from indico_vc_vidyo import _ from indico_vc_vidyo.api import AdminClient, APIException, RoomNotFoundAPIException from indico_vc_vidyo.blueprint import blueprint from indico_vc_vidyo.cli import cli -from indico_vc_vidyo.forms import VCRoomForm, VCRoomAttachForm +from indico_vc_vidyo.forms import VCRoomAttachForm, VCRoomForm from indico_vc_vidyo.http_api import DeleteVCRoomAPI -from indico_vc_vidyo.util import iter_user_identities, iter_extensions, update_room_from_obj from indico_vc_vidyo.models.vidyo_extensions import VidyoExtension +from indico_vc_vidyo.util import iter_extensions, iter_user_identities, update_room_from_obj class PluginSettingsForm(VCPluginSettingsFormBase): diff --git a/vc_vidyo/indico_vc_vidyo/task.py b/vc_vidyo/indico_vc_vidyo/task.py index ef4730b..dde631c 100644 --- a/vc_vidyo/indico_vc_vidyo/task.py +++ b/vc_vidyo/indico_vc_vidyo/task.py @@ -24,10 +24,11 @@ from indico.core.celery import celery from indico.core.db import db from indico.core.plugins import get_plugin_template_module from indico.modules.events import Event -from indico.modules.vc.models.vc_rooms import VCRoomEventAssociation, VCRoom, VCRoomStatus +from indico.modules.vc.models.vc_rooms import VCRoom, VCRoomEventAssociation, VCRoomStatus from indico.modules.vc.notifications import _send from indico.util.date_time import now_utc from indico.util.struct.iterables import committing_iterator + from indico_vc_vidyo.api import APIException, RoomNotFoundAPIException diff --git a/vc_vidyo/tests/task_test.py b/vc_vidyo/tests/task_test.py index 9197032..f789f11 100644 --- a/vc_vidyo/tests/task_test.py +++ b/vc_vidyo/tests/task_test.py @@ -19,7 +19,7 @@ from datetime import datetime import pytest from pytz import utc -from indico.modules.vc.models.vc_rooms import VCRoom, VCRoomEventAssociation, VCRoomStatus, VCRoomLinkType +from indico.modules.vc.models.vc_rooms import VCRoom, VCRoomEventAssociation, VCRoomLinkType, VCRoomStatus from indico_vc_vidyo.models.vidyo_extensions import VidyoExtension