lucaspalomodevelop/indico-plugins
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/indico-plugins.git synced 2026-03-12 23:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix usage of removed/renamed string utils

Browse Source
This commit is contained in:
Adrian Moennich 2020-11-10 12:57:29 +01:00
parent 948fa124d6
commit 15afb637b6
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
payment_paypal/indico_payment_paypal/plugin.py
View File

@ -16,7 +16,7 @@ from wtforms.validators import DataRequired, Optional
from indico.core.plugins import IndicoPlugin, url_for_plugin
from indico.modules.events.payment import (PaymentEventSettingsFormBase, PaymentPluginMixin,
PaymentPluginSettingsFormBase)
from indico.util.string import remove_accents, unicode_to_ascii
from indico.util.string import remove_accents, str_to_ascii
from indico.web.forms.validators import UsedIf
from indico_payment_paypal import _
@ -67,8 +67,8 @@ class PaypalPaymentPlugin(PaymentPluginMixin, IndicoPlugin):
event = data['event']
registration = data['registration']
data['item_name'] = '{}: registration for {}'.format(
unicode_to_ascii(remove_accents(registration.full_name, reencode=False)),
unicode_to_ascii(remove_accents(event.title, reencode=False))
str_to_ascii(remove_accents(registration.full_name, reencode=False)),
str_to_ascii(remove_accents(event.title, reencode=False))
)
data['return_url'] = url_for_plugin('payment_paypal.success', registration.locator.uuid, _external=True)
data['cancel_url'] = url_for_plugin('payment_paypal.cancel', registration.locator.uuid, _external=True)

4
piwik/indico_piwik/reports.py
View File

@ -16,7 +16,6 @@ from indico.modules.events import Event
from indico.modules.events.contributions import Contribution
from indico.util.date_time import format_time, now_utc, utc_to_server
from indico.util.serializer import Serializer
from indico.util.string import to_unicode
from indico_piwik.queries.graphs import PiwikQueryReportEventGraphCountries, PiwikQueryReportEventGraphDevices
from indico_piwik.queries.metrics import (PiwikQueryReportEventMetricDownloads,
@ -131,8 +130,7 @@ class ReportGeneral(ReportBase):
cid = (contribution.legacy_mapping.legacy_contribution_id if contribution.legacy_mapping
else contribution.id)
key = '{}t{}'.format(contribution.event_id, cid)
self.contributions[key] = u'{} ({})'.format(contribution.title,
to_unicode(format_time(contribution.start_dt)))
self.contributions[key] = u'{} ({})'.format(contribution.title, format_time(contribution.start_dt))
class ReportMaterial(ReportBase):