libervia-backend: sat/memory/params.py comparison

comparison sat/memory/params.py @ 3028:ab2696e34d29

Python 3 port: /!\ this is a huge commit /!\ starting from this commit, SàT is needs Python 3.6+ /!\ SàT maybe be instable or some feature may not work anymore, this will improve with time This patch port backend, bridge and frontends to Python 3. Roughly this has been done this way: - 2to3 tools has been applied (with python 3.7) - all references to python2 have been replaced with python3 (notably shebangs) - fixed files not handled by 2to3 (notably the shell script) - several manual fixes - fixed issues reported by Python 3 that where not handled in Python 2 - replaced "async" with "async_" when needed (it's a reserved word from Python 3.7) - replaced zope's "implements" with @implementer decorator - temporary hack to handle data pickled in database, as str or bytes may be returned, to be checked later - fixed hash comparison for password - removed some code which is not needed anymore with Python 3 - deactivated some code which needs to be checked (notably certificate validation) - tested with jp, fixed reported issues until some basic commands worked - ported Primitivus (after porting dependencies like urwid satext) - more manual fixes

author	Goffi <goffi@goffi.org>
date	Tue, 13 Aug 2019 19:08:41 +0200
parents	003b8b4b56a7
children	fee60f17ebac

comparison

equal deleted inserted replaced

-:ff5bcb12ae60
+:ab2696e34d29
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # SAT: a jabber client
 # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org)
 ### TODO: add desciption in params
 # TODO: when priority is changed, a new presence stanza must be emitted
 # TODO: int type (Priority should be int instead of string)
-default_xml = u"""
+default_xml = """
 <params>
 <general>
 </general>
 <individual>
 <category name="General" label="%(category_general)s">
 <param name="check_certificate" label="%(check_certificate_label)s" value="true"  type="bool" security="4" />
 </category>
 </individual>
 </params>
 """ % {
-u"category_general": D_(u"General"),
+"category_general": D_("General"),
-u"category_connection": D_(u"Connection"),
+"category_connection": D_("Connection"),
-u"history_param": C.HISTORY_LIMIT,
+"history_param": C.HISTORY_LIMIT,
-u"history_label": D_(u"Chat history limit"),
+"history_label": D_("Chat history limit"),
-u"show_offline_contacts": C.SHOW_OFFLINE_CONTACTS,
+"show_offline_contacts": C.SHOW_OFFLINE_CONTACTS,
-u"show_offline_contacts_label": D_(u"Show offline contacts"),
+"show_offline_contacts_label": D_("Show offline contacts"),
-u"show_empty_groups": C.SHOW_EMPTY_GROUPS,
+"show_empty_groups": C.SHOW_EMPTY_GROUPS,
-u"show_empty_groups_label": D_(u"Show empty groups"),
+"show_empty_groups_label": D_("Show empty groups"),
-u"force_server_param": C.FORCE_SERVER_PARAM,
+"force_server_param": C.FORCE_SERVER_PARAM,
-u"force_port_param": C.FORCE_PORT_PARAM,
+"force_port_param": C.FORCE_PORT_PARAM,
-u"new_account_label": D_(u"Register new account"),
+"new_account_label": D_("Register new account"),
-u"autoconnect_label": D_(u"Connect on frontend startup"),
+"autoconnect_label": D_("Connect on frontend startup"),
-u"autodisconnect_label": D_(u"Disconnect on frontend closure"),
+"autodisconnect_label": D_("Disconnect on frontend closure"),
-u"check_certificate_label": D_(u"Check certificate (don't uncheck if unsure)"),
+"check_certificate_label": D_("Check certificate (don't uncheck if unsure)"),
 }
 def load_default_params(self):
 self.dom = minidom.parseString(Params.default_xml.encode("utf-8"))
 """
 try:
 del self.params[profile]
 except KeyError:
 log.error(
-_(u"Trying to purge cache of a profile not in memory: [%s]") % profile
+_("Trying to purge cache of a profile not in memory: [%s]") % profile
 )
 def save_xml(self, filename):
 """Save parameters template to xml file"""
 with open(filename, "wb") as xml_file:
 elif profile_key == C.PROF_KEY_NONE:
 raise exceptions.ProfileNotSetError
 elif return_profile_keys and profile_key in [C.PROF_KEY_ALL]:
 return profile_key  # this value must be managed by the caller
 if not self.storage.hasProfile(profile_key):
-log.error(_(u"Trying to access an unknown profile (%s)") % profile_key)
+log.error(_("Trying to access an unknown profile (%s)") % profile_key)
 raise exceptions.ProfileUnknownError(profile_key)
 return profile_key
 def __get_unique_node(self, parent, tag, name):
 """return node with given tag
 continue
 node.setAttribute("app", app)
 if (
 len(cat_node.childNodes) == to_remove_count
 ):  # remove empty category
-for __ in xrange(0, to_remove_count):
+for __ in range(0, to_remove_count):
 to_remove.pop()
 to_remove.append(cat_node)
 for node in to_remove:
 node.parentNode.removeChild(node)
 @param app: name of the frontend registering the parameters
 """
 if not app:
 log.warning(
 _(
-u"Trying to register frontends parameters with no specified app: aborted"
+"Trying to register frontends parameters with no specified app: aborted"
 )
 )
 return
 if not hasattr(self, "frontends_cache"):
 self.frontends_cache = []
 if app in self.frontends_cache:
 log.debug(
 _(
-u"Trying to register twice frontends parameters for %(app)s: aborted"
+"Trying to register twice frontends parameters for %(app)s: aborted"
 % {"app": app}
 )
 )
 return
 self.frontends_cache.append(app)
 self.updateParams(xml, security_limit, app)
-log.debug(u"Frontends parameters registered for %(app)s" % {"app": app})
+log.debug("Frontends parameters registered for %(app)s" % {"app": app})
 def __default_ok(self, value, name, category):
 # FIXME: will not work with individual parameters
 self.setParam(name, value, category)
 def __default_ko(self, failure, name, category):
 log.error(
-_(u"Can't determine default value for [%(category)s/%(name)s]: %(reason)s")
+_("Can't determine default value for [%(category)s/%(name)s]: %(reason)s")
 % {"category": category, "name": name, "reason": str(failure.value)}
 )
 def setDefault(self, name, category, callback, errback=None):
 """Set default value of parameter
 )
 node = self._getParamNode(name, category, "@ALL@")
 if not node:
 log.error(
 _(
-u"Requested param [%(name)s] in category [%(category)s] doesn't exist !"
+"Requested param [%(name)s] in category [%(category)s] doesn't exist !"
 )
 % {"name": name, "category": category}
 )
 return
 if node[1].getAttribute("default_cb") == "yes":
 )
 return value_to_use
 if len(selected) == 0:
 log.error(
 _(
-u"Parameter (%(cat)s, %(param)s) of type list has no default option!"
+"Parameter (%(cat)s, %(param)s) of type list has no default option!"
 )
 % {"cat": cat, "param": param}
 )
 else:
 log.error(
 _(
-u"Parameter (%(cat)s, %(param)s) of type list has more than one default option!"
+"Parameter (%(cat)s, %(param)s) of type list has more than one default option!"
 )
 % {"cat": cat, "param": param}
 )
 raise exceptions.DataError
 elif node.getAttribute("type") == "jids_list":
 for idx, value in enumerate(jids):
 try:
 jids[idx] = jid.JID(value)
 except (RuntimeError, jid.InvalidFormat, AttributeError):
 log.warning(
-u"Incorrect jid value found in jids list: [{}]".format(value)
+"Incorrect jid value found in jids list: [{}]".format(value)
 )
 to_delete.append(value)
 for value in to_delete:
 jids.remove(value)
 return jids
 # FIXME: security_limit is not managed here !
 node = self._getParamNode(name, category)
 if not node:
 log.error(
 _(
-u"Requested param [%(name)s] in category [%(category)s] doesn't exist !"
+"Requested param [%(name)s] in category [%(category)s] doesn't exist !"
 )
 % {"name": name, "category": category}
 )
 raise exceptions.NotFound
 """
 node = self._getParamNode(name, category)
 if not node:
 log.error(
 _(
-u"Requested param [%(name)s] in category [%(category)s] doesn't exist !"
+"Requested param [%(name)s] in category [%(category)s] doesn't exist !"
 )
 % {"name": name, "category": category}
 )
 raise ValueError("Requested param doesn't exist")
 if not self.checkSecurityLimit(node[1], security_limit):
 log.warning(
 _(
-u"Trying to get parameter '%(param)s' in category '%(cat)s' without authorization!!!"
+"Trying to get parameter '%(param)s' in category '%(cat)s' without authorization!!!"
 % {"param": name, "cat": category}
 )
 )
 raise exceptions.PermissionError
 if category_node.getAttribute("name") == category:
 for param_node in category_node.getElementsByTagName("param"):
 name = param_node.getAttribute("name")
 if not name:
 log.warning(
-u"ignoring attribute without name: {}".format(
+"ignoring attribute without name: {}".format(
 param_node.toxml()
 )
 )
 continue
 d = self.asyncGetStringParamA(
 RuntimeError,
 jid.InvalidFormat,
 AttributeError,
 ):
 log.warning(
-u"Incorrect jid value found in jids list: [{}]".format(
+"Incorrect jid value found in jids list: [{}]".format(
 jid_
 )
 )
 else:
 jid_elt = prof_xml.createElement("jid")
 """
 # FIXME: setParam should accept the right type for value, not only str !
 if profile_key != C.PROF_KEY_NONE:
 profile = self.getProfileName(profile_key)
 if not profile:
-log.error(_(u"Trying to set parameter for an unknown profile"))
+log.error(_("Trying to set parameter for an unknown profile"))
 raise exceptions.ProfileUnknownError(profile_key)
 node = self._getParamNode(name, category, "@ALL@")
 if not node:
 log.error(
-_(u"Requesting an unknown parameter (%(category)s/%(name)s)")
+_("Requesting an unknown parameter (%(category)s/%(name)s)")
 % {"category": category, "name": name}
 )
 return defer.succeed(None)
 if not self.checkSecurityLimit(node[1], security_limit):
 log.warning(
 _(
-u"Trying to set parameter '%(param)s' in category '%(cat)s' without authorization!!!"
+"Trying to set parameter '%(param)s' in category '%(cat)s' without authorization!!!"
 % {"param": name, "cat": category}
 )
 )
 return defer.succeed(None)
 try:
 int(value)
 except ValueError:
 log.debug(
 _(
-u"Trying to set parameter '%(param)s' in category '%(cat)s' with an non-integer value"
+"Trying to set parameter '%(param)s' in category '%(cat)s' with an non-integer value"
 % {"param": name, "cat": category}
 )
 )
 return defer.succeed(None)
 if node[1].hasAttribute("constraint"):
 assert node[0] == C.INDIVIDUAL
 assert profile_key != C.PROF_KEY_NONE
 if type_ == "button":
-log.debug(u"Clicked param button %s" % node.toxml())
+log.debug("Clicked param button %s" % node.toxml())
 return defer.succeed(None)
 elif type_ == "password":
 try:
 personal_key = self.host.memory.auth_sessions.profileGetUnique(profile)[
 C.MEMORY_CRYPTO_KEY

Mercurial > libervia-backend

comparison sat/memory/params.py @ 3028:ab2696e34d29