Mercurial > libervia-backend
annotate sat_frontends/jp/cmd_uri.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 |
rev | line source |
---|---|
2240
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
1 #!/usr/bin/env python2 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
2 # -*- coding: utf-8 -*- |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
3 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
4 # jp: a SàT command line tool |
2771 | 5 # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org) |
2240
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
6 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
7 # This program is free software: you can redistribute it and/or modify |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
8 # it under the terms of the GNU Affero General Public License as published by |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
9 # the Free Software Foundation, either version 3 of the License, or |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
10 # (at your option) any later version. |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
11 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
12 # This program is distributed in the hope that it will be useful, |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
15 # GNU Affero General Public License for more details. |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
16 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
17 # You should have received a copy of the GNU Affero General Public License |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
18 # along with this program. If not, see <http://www.gnu.org/licenses/>. |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
19 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
20 |
3028 | 21 from . import base |
2240
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
22 from sat.core.i18n import _ |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
23 from sat_frontends.jp.constants import Const as C |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
24 from sat.tools.common import uri |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
25 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
26 __commands__ = ["Uri"] |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
27 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
28 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
29 class Parse(base.CommandBase): |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
30 def __init__(self, host): |
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
31 base.CommandBase.__init__( |
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
32 self, |
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
33 host, |
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
34 "parse", |
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
35 use_profile=False, |
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
36 use_output=C.OUTPUT_DICT, |
3028 | 37 help=_("parse URI"), |
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
38 ) |
2240
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
39 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
40 def add_parser_options(self): |
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
41 self.parser.add_argument( |
3028 | 42 "uri", help=_("XMPP URI to parse") |
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
43 ) |
2240
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
44 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
45 def start(self): |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
46 self.output(uri.parseXMPPUri(self.args.uri)) |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
47 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
48 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
49 class Build(base.CommandBase): |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
50 def __init__(self, host): |
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
51 base.CommandBase.__init__( |
3028 | 52 self, host, "build", use_profile=False, help=_("build URI") |
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
53 ) |
2240
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
54 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
55 def add_parser_options(self): |
3028 | 56 self.parser.add_argument("type", help=_("URI type")) |
57 self.parser.add_argument("path", help=_("URI path")) | |
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
58 self.parser.add_argument( |
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
59 "-f", |
2240
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
60 "--field", |
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
61 action="append", |
2240
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
62 nargs=2, |
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
63 dest="fields", |
3028 | 64 metavar=("KEY", "VALUE"), |
65 help=_("URI fields"), | |
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
66 ) |
2240
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
67 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
68 def start(self): |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
69 fields = dict(self.args.fields) if self.args.fields else {} |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
70 self.disp(uri.buildXMPPUri(self.args.type, path=self.args.path, **fields)) |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
71 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
72 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
73 class Uri(base.CommandBase): |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
74 subcommands = (Parse, Build) |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
75 |
4b66f070cfbb
jp (uri): new command to parse or generate XMPP URIs
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
76 def __init__(self, host): |
2624
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
77 super(Uri, self).__init__( |
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
78 host, "uri", use_profile=False, help=_("XMPP URI parsing/generation") |
56f94936df1e
code style reformatting using black
Goffi <goffi@goffi.org>
parents:
2562
diff
changeset
|
79 ) |