From ea6038851b875f35c9ab409c7743b04de4509b6b Mon Sep 17 00:00:00 2001 From: Michal Kolodziejski Date: Fri, 13 Nov 2015 16:01:00 +0100 Subject: [PATCH] Adapt payment module imports --- payment_manual/indico_payment_manual/plugin.py | 3 ++- payment_paypal/indico_payment_paypal/controllers.py | 6 +++--- payment_paypal/indico_payment_paypal/plugin.py | 3 ++- payment_paypal/tests/controllers_test.py | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/payment_manual/indico_payment_manual/plugin.py b/payment_manual/indico_payment_manual/plugin.py index cefc207..cf81bc6 100644 --- a/payment_manual/indico_payment_manual/plugin.py +++ b/payment_manual/indico_payment_manual/plugin.py @@ -20,7 +20,8 @@ from wtforms.fields.simple import TextAreaField from wtforms.validators import DataRequired from indico.core.plugins import IndicoPlugin, IndicoPluginBlueprint, url_for_plugin -from indico.modules.payment import PaymentPluginMixin, PaymentPluginSettingsFormBase, PaymentEventSettingsFormBase +from indico.modules.events.payment import (PaymentPluginMixin, PaymentPluginSettingsFormBase, + PaymentEventSettingsFormBase) from indico.web.forms.validators import UsedIf from indico_payment_manual import _ diff --git a/payment_paypal/indico_payment_paypal/controllers.py b/payment_paypal/indico_payment_paypal/controllers.py index 9d332c0..551f539 100644 --- a/payment_paypal/indico_payment_paypal/controllers.py +++ b/payment_paypal/indico_payment_paypal/controllers.py @@ -24,9 +24,9 @@ from flask_pluginengine import current_plugin from werkzeug.exceptions import BadRequest from indico.modules.events.registration.models.registrations import Registration -from indico.modules.payment.models.transactions import TransactionAction -from indico.modules.payment.notifications import notify_amount_inconsistency -from indico.modules.payment.util import register_transaction +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.web.flask.util import url_for from MaKaC.webinterface.rh.base import RH diff --git a/payment_paypal/indico_payment_paypal/plugin.py b/payment_paypal/indico_payment_paypal/plugin.py index 811af1d..e6a3363 100644 --- a/payment_paypal/indico_payment_paypal/plugin.py +++ b/payment_paypal/indico_payment_paypal/plugin.py @@ -21,7 +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.payment import PaymentPluginMixin, PaymentPluginSettingsFormBase, PaymentEventSettingsFormBase +from indico.modules.events.payment import (PaymentPluginMixin, PaymentPluginSettingsFormBase, + PaymentEventSettingsFormBase) from indico.util.string import remove_accents from indico_payment_paypal import _ diff --git a/payment_paypal/tests/controllers_test.py b/payment_paypal/tests/controllers_test.py index ba34e0b..4a6fd9e 100644 --- a/payment_paypal/tests/controllers_test.py +++ b/payment_paypal/tests/controllers_test.py @@ -18,7 +18,7 @@ import pytest from flask import request from mock import MagicMock -from indico.modules.payment.models.transactions import PaymentTransaction +from indico.modules.events.payment.models.transactions import PaymentTransaction from indico_payment_paypal.controllers import RHPaypalIPN from indico_payment_paypal.plugin import PaypalPaymentPlugin