diff --git a/vc_zoom/indico_vc_zoom/api/__init__.py b/vc_zoom/indico_vc_zoom/api/__init__.py index 28dc103..035dd7c 100644 --- a/vc_zoom/indico_vc_zoom/api/__init__.py +++ b/vc_zoom/indico_vc_zoom/api/__init__.py @@ -5,7 +5,7 @@ # them and/or modify them under the terms of the MIT License; # see the LICENSE file for more details. -from .client import ZoomIndicoClient, ZoomClient +from .client import ZoomClient, ZoomIndicoClient __all__ = ['ZoomIndicoClient', 'ZoomClient'] diff --git a/vc_zoom/indico_vc_zoom/api/client.py b/vc_zoom/indico_vc_zoom/api/client.py index 6b3da45..ad223c3 100644 --- a/vc_zoom/indico_vc_zoom/api/client.py +++ b/vc_zoom/indico_vc_zoom/api/client.py @@ -10,9 +10,9 @@ from __future__ import absolute_import, unicode_literals import time import jwt +from pytz import utc from requests import Session from requests.exceptions import HTTPError -from pytz import utc def format_iso_dt(d): diff --git a/vc_zoom/indico_vc_zoom/controllers.py b/vc_zoom/indico_vc_zoom/controllers.py index b099a5f..86fddce 100644 --- a/vc_zoom/indico_vc_zoom/controllers.py +++ b/vc_zoom/indico_vc_zoom/controllers.py @@ -12,21 +12,21 @@ from flask_pluginengine import current_plugin from sqlalchemy.orm.attributes import flag_modified from webargs import fields from webargs.flaskparser import use_kwargs +from werkzeug.exceptions import Forbidden from indico.core.db import db from indico.modules.vc.controllers import RHVCSystemEventBase from indico.modules.vc.exceptions import VCRoomError from indico.modules.vc.models.vc_rooms import VCRoom -from indico.web.rh import RH from indico.util.i18n import _ -from werkzeug.exceptions import Forbidden +from indico.web.rh import RH class RHRoomAlternativeHost(RHVCSystemEventBase): def _process(self): new_identifier = session.user.identifier if new_identifier == self.vc_room.data['host'] or new_identifier in self.vc_room.data['alternative_hosts']: - flash(_("You were already an (alternative) host of this meeting"), 'warning') + flash(_('You were already an (alternative) host of this meeting'), 'warning') return jsonify(success=False) self.vc_room.data['alternative_hosts'].append(new_identifier) diff --git a/vc_zoom/indico_vc_zoom/forms.py b/vc_zoom/indico_vc_zoom/forms.py index 0dd0f50..75a0289 100644 --- a/vc_zoom/indico_vc_zoom/forms.py +++ b/vc_zoom/indico_vc_zoom/forms.py @@ -6,9 +6,9 @@ # see the LICENSE file for more details. from __future__ import unicode_literals + from flask import session from flask_pluginengine import current_plugin - from wtforms.fields.core import BooleanField, StringField from wtforms.fields.simple import TextAreaField from wtforms.validators import DataRequired, ValidationError diff --git a/vc_zoom/indico_vc_zoom/notifications.py b/vc_zoom/indico_vc_zoom/notifications.py index 87a1b14..0e58d85 100644 --- a/vc_zoom/indico_vc_zoom/notifications.py +++ b/vc_zoom/indico_vc_zoom/notifications.py @@ -7,9 +7,9 @@ from __future__ import unicode_literals -from indico.web.flask.templating import get_template_module from indico.core.notifications import make_email, send_email from indico.util.user import principal_from_identifier +from indico.web.flask.templating import get_template_module def notify_host_start_url(vc_room): diff --git a/vc_zoom/indico_vc_zoom/plugin.py b/vc_zoom/indico_vc_zoom/plugin.py index 2bd5eec..b3f17d2 100644 --- a/vc_zoom/indico_vc_zoom/plugin.py +++ b/vc_zoom/indico_vc_zoom/plugin.py @@ -11,8 +11,8 @@ from flask import flash, session from markupsafe import escape from requests.exceptions import HTTPError from sqlalchemy.orm.attributes import flag_modified -from wtforms.fields.core import BooleanField from wtforms.fields import TextAreaField +from wtforms.fields.core import BooleanField from wtforms.fields.simple import StringField from wtforms.validators import DataRequired, ValidationError @@ -35,9 +35,9 @@ from indico_vc_zoom.blueprint import blueprint from indico_vc_zoom.cli import cli from indico_vc_zoom.forms import VCRoomAttachForm, VCRoomForm from indico_vc_zoom.notifications import notify_host_start_url -from indico_vc_zoom.util import (UserLookupMode, fetch_zoom_meeting, find_enterprise_email, gen_random_password, - get_alt_host_emails, get_schedule_args, get_url_data_args, process_alternative_hosts, - update_zoom_meeting, ZoomMeetingType) +from indico_vc_zoom.util import (UserLookupMode, ZoomMeetingType, fetch_zoom_meeting, find_enterprise_email, + gen_random_password, get_alt_host_emails, get_schedule_args, get_url_data_args, + process_alternative_hosts, update_zoom_meeting) class PluginSettingsForm(VCPluginSettingsFormBase):