erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Python 3 port:

Browse source 
/!\ 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
This commit is contained in:
Goffi 2019-08-13 19:08:41 +02:00
commit fbfe96c505
1 changed files with 6336 additions and 6398 deletions
Download patch file Download diff file Expand all files Collapse all files

40
sat_frontends/jp/cmd_param.py
View file

@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import base
from . import base
from sat.core.i18n import _
__commands__ = ["Param"]
@ -29,31 +29,31 @@ class Get(base.CommandBase):
super(Get, self).__init__(host, 'get', need_connect=False, help=_('Get a parameter value'))
def add_parser_options(self):
self.parser.add_argument("category", nargs='?', type=base.unicode_decoder, help=_(u"Category of the parameter"))
self.parser.add_argument("name", nargs='?', type=base.unicode_decoder, help=_(u"Name of the parameter"))
self.parser.add_argument("-a", "--attribute", type=str, default="value", help=_(u"Name of the attribute to get"))
self.parser.add_argument("--security-limit", type=int, default=-1, help=_(u"Security limit"))
self.parser.add_argument("category", nargs='?', help=_("Category of the parameter"))
self.parser.add_argument("name", nargs='?', help=_("Name of the parameter"))
self.parser.add_argument("-a", "--attribute", type=str, default="value", help=_("Name of the attribute to get"))
self.parser.add_argument("--security-limit", type=int, default=-1, help=_("Security limit"))
def start(self):
if self.args.category is None:
categories = self.host.bridge.getParamsCategories()
print u"\n".join(categories)
print("\n".join(categories))
elif self.args.name is None:
try:
values_dict = self.host.bridge.asyncGetParamsValuesFromCategory(self.args.category, self.args.security_limit, self.profile)
except Exception as e:
print u"Can't find requested parameters: {}".format(e)
print("Can't find requested parameters: {}".format(e))
self.host.quit(1)
for name, value in values_dict.iteritems():
print u"{}\t{}".format(name, value)
for name, value in values_dict.items():
print("{}\t{}".format(name, value))
else:
try:
value = self.host.bridge.asyncGetParamA(self.args.name, self.args.category, self.args.attribute,
self.args.security_limit, self.profile)
except Exception as e:
print u"Can't find requested parameter: {}".format(e)
print("Can't find requested parameter: {}".format(e))
self.host.quit(1)
print value
print(value)
class Set(base.CommandBase):
@ -61,16 +61,16 @@ class Set(base.CommandBase):
super(Set, self).__init__(host, 'set', need_connect=False, help=_('Set a parameter value'))
def add_parser_options(self):
self.parser.add_argument("category", type=base.unicode_decoder, help=_(u"Category of the parameter"))
self.parser.add_argument("name", type=base.unicode_decoder, help=_(u"Name of the parameter"))
self.parser.add_argument("value", type=base.unicode_decoder, help=_(u"Name of the parameter"))
self.parser.add_argument("--security-limit", type=int, default=-1, help=_(u"Security limit"))
self.parser.add_argument("category", help=_("Category of the parameter"))
self.parser.add_argument("name", help=_("Name of the parameter"))
self.parser.add_argument("value", help=_("Name of the parameter"))
self.parser.add_argument("--security-limit", type=int, default=-1, help=_("Security limit"))
def start(self):
try:
self.host.bridge.setParam(self.args.name, self.args.value, self.args.category, self.args.security_limit, self.profile)
except Exception as e:
print u"Can set requested parameter: {}".format(e)
print("Can set requested parameter: {}".format(e))
class SaveTemplate(base.CommandBase):
@ -83,9 +83,9 @@ class SaveTemplate(base.CommandBase):
def start(self):
"""Save parameters template to xml file"""
if self.host.bridge.saveParamsTemplate(self.args.filename):
print _("Parameters saved to file %s") % self.args.filename
print(_("Parameters saved to file %s") % self.args.filename)
else:
print _("Can't save parameters to file %s") % self.args.filename
print(_("Can't save parameters to file %s") % self.args.filename)
class LoadTemplate(base.CommandBase):
@ -99,9 +99,9 @@ class LoadTemplate(base.CommandBase):
def start(self):
"""Load parameters template from xml file"""
if self.host.bridge.loadParamsTemplate(self.args.filename):
print _("Parameters loaded from file %s") % self.args.filename
print(_("Parameters loaded from file %s") % self.args.filename)
else:
print _("Can't load parameters from file %s") % self.args.filename
print(_("Can't load parameters from file %s") % self.args.filename)
class Param(base.CommandBase):