Mercurial > libervia-web
diff libervia/pages/chat/select/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 | 29eb15062416 |
| children | f511f8fbbf8a |
line wrap: on
line diff
--- a/libervia/pages/chat/select/page_meta.py Tue Aug 13 09:39:33 2019 +0200 +++ b/libervia/pages/chat/select/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 sat.core.i18n import _ @@ -10,9 +10,9 @@ log = getLogger(__name__) -name = u"chat_select" +name = "chat_select" access = C.PAGES_ACCESS_PROFILE -template = u"chat/select.html" +template = "chat/select.html" @defer.inlineCallbacks @@ -21,17 +21,17 @@ template_data = request.template_data rooms = template_data["rooms"] = [] bookmarks = yield self.host.bridgeCall("bookmarksList", "muc", "all", profile) - for bm_values in bookmarks.values(): - for room_jid, room_data in bm_values.iteritems(): - url = self.getPageByName(u"chat").getURL(room_jid) + for bm_values in list(bookmarks.values()): + for room_jid, room_data in bm_values.items(): + url = self.getPageByName("chat").getURL(room_jid) rooms.append(data_objects.Room(room_jid, name=room_data.get("name"), url=url)) rooms.sort(key=lambda r: r.name) @defer.inlineCallbacks def on_data_post(self, request): - jid_ = self.getPostedData(request, u"jid") - if u"@" not in jid_: + jid_ = self.getPostedData(request, "jid") + if "@" not in jid_: profile = self.getProfile(request) service = yield self.host.bridgeCall("mucGetService", "", profile) if service: @@ -39,7 +39,7 @@ muc_jid.user = jid_ jid_ = muc_jid.full() else: - log.warning(_(u"Invalid jid received: {jid}".format(jid=jid_))) + log.warning(_("Invalid jid received: {jid}".format(jid=jid_))) defer.returnValue(C.POST_NO_CONFIRM) - url = self.getPageByName(u"chat").getURL(jid_) + url = self.getPageByName("chat").getURL(jid_) self.HTTPRedirect(request, url)