Mercurial > libervia-web
diff libervia/pages/events/admin/page_meta.py @ 1216:b2d067339de3
python 3 port:
/!\ Python 3.6+ is now needed to use libervia
/!\ instability may occur and features may not be working anymore, this will improve with time
/!\ TxJSONRPC dependency has been removed
The same procedure as in backend has been applied (check backend commit ab2696e34d29 logs
for details). Removed now deprecated code (Pyjamas compiled browser part, legacy blog,
JSON RPC related code).
Adapted code to work without `html` and `themes` dirs.
author | Goffi <goffi@goffi.org> |
---|---|
date | Tue, 13 Aug 2019 19:12:31 +0200 |
parents | 0f37b65fe7c2 |
children | acec8e9185db |
line wrap: on
line diff
--- a/libervia/pages/events/admin/page_meta.py Tue Aug 13 09:39:33 2019 +0200 +++ b/libervia/pages/events/admin/page_meta.py Tue Aug 13 19:12:31 2019 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- from libervia.server.constants import Const as C @@ -12,9 +12,9 @@ import math import re -name = u"event_admin" +name = "event_admin" access = C.PAGES_ACCESS_PROFILE -template = u"event/admin.html" +template = "event/admin.html" log = getLogger(__name__) REG_EMAIL_RE = re.compile(C.REG_EMAIL_RE, re.IGNORECASE) @@ -36,12 +36,12 @@ ## Event ## - event_service = template_data[u"event_service"] = data["event_service"] - event_node = template_data[u"event_node"] = data["event_node"] - event_id = template_data[u"event_id"] = data["event_id"] + event_service = template_data["event_service"] = data["event_service"] + event_node = template_data["event_node"] = data["event_node"] + event_id = template_data["event_id"] = data["event_id"] profile = self.getProfile(request) event_timestamp, event_data = yield self.host.bridgeCall( - u"eventGet", + "eventGet", event_service.userhost() if event_service else "", event_node, event_id, @@ -53,7 +53,7 @@ pass else: template_data["dynamic_style"] = safe( - u""" + """ html { background-image: url("%s"); background-size: 15em; @@ -63,21 +63,21 @@ ) template_data["event"] = event_data invitees = yield self.host.bridgeCall( - u"eventInviteesList", + "eventInviteesList", event_data["invitees_service"], event_data["invitees_node"], profile, ) template_data["invitees"] = invitees invitees_guests = 0 - for invitee_data in invitees.itervalues(): + for invitee_data in invitees.values(): if invitee_data.get("attend", "no") == "no": continue try: invitees_guests += int(invitee_data.get("guests", 0)) except ValueError: log.warning( - _(u"guests value is not valid: {invitee}").format(invitee=invitee_data) + _("guests value is not valid: {invitee}").format(invitee=invitee_data) ) template_data["invitees_guests"] = invitees_guests template_data["days_left"] = int( @@ -86,13 +86,13 @@ ## Blog ## - data[u"service"] = jid.JID(event_data[u"blog_service"]) - data[u"node"] = event_data[u"blog_node"] - data[u"allow_commenting"] = u"simple" + data["service"] = jid.JID(event_data["blog_service"]) + data["node"] = event_data["blog_node"] + data["allow_commenting"] = "simple" # we now need blog items, using blog common page # this will fill the "items" template data - blog_page = self.getPageByName(u"blog_view") + blog_page = self.getPageByName("blog_view") yield blog_page.prepare_render(self, request) @@ -100,46 +100,46 @@ def on_data_post(self, request): profile = self.getProfile(request) if not profile: - log.error(u"got post data without profile") + log.error("got post data without profile") self.pageError(request, C.HTTP_INTERNAL_ERROR) type_ = self.getPostedData(request, "type") if type_ == "blog": service, node, title, body, lang = self.getPostedData( - request, (u"service", u"node", u"title", u"body", u"language") + request, ("service", "node", "title", "body", "language") ) if not body.strip(): self.pageError(request, C.HTTP_BAD_REQUEST) - data = {u"content": body} + data = {"content": body} if title: - data[u"title"] = title + data["title"] = title if lang: - data[u"language"] = lang + data["language"] = lang try: - comments = bool(self.getPostedData(request, u"comments").strip()) + comments = bool(self.getPostedData(request, "comments").strip()) except KeyError: pass else: if comments: - data[u"allow_comments"] = C.BOOL_TRUE + data["allow_comments"] = C.BOOL_TRUE try: - yield self.host.bridgeCall(u"mbSend", service, node, data, profile) + yield self.host.bridgeCall("mbSend", service, node, data, profile) except Exception as e: - if u"forbidden" in unicode(e): + if "forbidden" in str(e): self.pageError(request, C.HTTP_FORBIDDEN) else: raise e elif type_ == "event": service, node, event_id, jids, emails = self.getPostedData( - request, (u"service", u"node", u"event_id", u"jids", u"emails") + request, ("service", "node", "event_id", "jids", "emails") ) for invitee_jid_s in jids.split(): try: invitee_jid = jid.JID(invitee_jid_s) except RuntimeError as e: log.warning( - _(u"this is not a valid jid: {jid}").format(jid=invitee_jid_s) + _("this is not a valid jid: {jid}").format(jid=invitee_jid_s) ) continue yield self.host.bridgeCall( @@ -148,7 +148,7 @@ for email_addr in emails.split(): if not REG_EMAIL_RE.match(email_addr): log.warning( - _(u"this is not a valid email address: {email}").format( + _("this is not a valid email address: {email}").format( email=email_addr ) ) @@ -160,14 +160,14 @@ event_id, email_addr, {}, - u"", - u"", - u"", - u"", - u"", - u"", + "", + "", + "", + "", + "", + "", profile, ) else: - log.warning(_(u"Unhandled data type: {}").format(type_)) + log.warning(_("Unhandled data type: {}").format(type_))