Mercurial > libervia-backend
diff sat_frontends/jp/cmd_adhoc.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 |
line wrap: on
line diff
--- a/sat_frontends/jp/cmd_adhoc.py Wed Jul 31 11:31:22 2019 +0200 +++ b/sat_frontends/jp/cmd_adhoc.py Tue Aug 13 19:08:41 2019 +0200 @@ -17,7 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -import base +from . import base from sat.core.i18n import _ from functools import partial from sat_frontends.jp.constants import Const as C @@ -32,43 +32,39 @@ class Remote(base.CommandBase): def __init__(self, host): super(Remote, self).__init__( - host, "remote", use_verbose=True, help=_(u"remote control a software") + host, "remote", use_verbose=True, help=_("remote control a software") ) def add_parser_options(self): - self.parser.add_argument("software", type=str, help=_(u"software name")) + self.parser.add_argument("software", type=str, help=_("software name")) self.parser.add_argument( "-j", "--jids", - type=base.unicode_decoder, nargs="*", default=[], - help=_(u"jids allowed to use the command"), + help=_("jids allowed to use the command"), ) self.parser.add_argument( "-g", "--groups", - type=base.unicode_decoder, nargs="*", default=[], - help=_(u"groups allowed to use the command"), + help=_("groups allowed to use the command"), ) self.parser.add_argument( "--forbidden-groups", - type=base.unicode_decoder, nargs="*", default=[], - help=_(u"groups that are *NOT* allowed to use the command"), + help=_("groups that are *NOT* allowed to use the command"), ) self.parser.add_argument( "--forbidden-jids", - type=base.unicode_decoder, nargs="*", default=[], - help=_(u"jids that are *NOT* allowed to use the command"), + help=_("jids that are *NOT* allowed to use the command"), ) self.parser.add_argument( - "-l", "--loop", action="store_true", help=_(u"loop on the commands") + "-l", "--loop", action="store_true", help=_("loop on the commands") ) def start(self): @@ -109,7 +105,7 @@ def __init__(self, host): super(Run, self).__init__( - host, "run", use_verbose=True, help=_(u"run an Ad-Hoc command") + host, "run", use_verbose=True, help=_("run an Ad-Hoc command") ) self.need_loop = True @@ -117,9 +113,8 @@ self.parser.add_argument( "-j", "--jid", - type=base.unicode_decoder, - default=u"", - help=_(u"jid of the service (default: profile's server"), + default="", + help=_("jid of the service (default: profile's server"), ) self.parser.add_argument( "-S", @@ -127,24 +122,22 @@ action="append_const", const=xmlui_manager.SUBMIT, dest="workflow", - help=_(u"submit form/page"), + help=_("submit form/page"), ) self.parser.add_argument( "-f", "--field", - type=base.unicode_decoder, action="append", nargs=2, dest="workflow", - metavar=(u"KEY", u"VALUE"), - help=_(u"field value"), + metavar=("KEY", "VALUE"), + help=_("field value"), ) self.parser.add_argument( "node", - type=base.unicode_decoder, nargs="?", - default=u"", - help=_(u"node of the command (default: list commands)"), + default="", + help=_("node of the command (default: list commands)"), ) def adHocRunCb(self, xmlui_raw): @@ -165,7 +158,7 @@ callback=self.adHocRunCb, errback=partial( self.errback, - msg=_(u"can't get ad-hoc commands list: {}"), + msg=_("can't get ad-hoc commands list: {}"), exit_code=C.EXIT_BRIDGE_ERRBACK, ), ) @@ -176,7 +169,7 @@ def __init__(self, host): super(List, self).__init__( - host, "list", use_verbose=True, help=_(u"list Ad-Hoc commands of a service") + host, "list", use_verbose=True, help=_("list Ad-Hoc commands of a service") ) self.need_loop = True @@ -184,9 +177,8 @@ self.parser.add_argument( "-j", "--jid", - type=base.unicode_decoder, - default=u"", - help=_(u"jid of the service (default: profile's server"), + default="", + help=_("jid of the service (default: profile's server"), ) def adHocListCb(self, xmlui_raw): @@ -202,7 +194,7 @@ callback=self.adHocListCb, errback=partial( self.errback, - msg=_(u"can't get ad-hoc commands list: {}"), + msg=_("can't get ad-hoc commands list: {}"), exit_code=C.EXIT_BRIDGE_ERRBACK, ), )