Mercurial > libervia-backend
comparison sat/tools/common/regex.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 | 9d0df638c8b4 |
comparison
equal
deleted
inserted
replaced
3027:ff5bcb12ae60 | 3028:ab2696e34d29 |
---|---|
1 #!/usr/bin/env python2 | 1 #!/usr/bin/env python3 |
2 # -*- coding: utf-8 -*- | 2 # -*- coding: utf-8 -*- |
3 | 3 |
4 # Salut à Toi: an XMPP client | 4 # Salut à Toi: an XMPP client |
5 # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org) | 5 # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org) |
6 | 6 |
20 """ regex tools common to backend and frontends """ | 20 """ regex tools common to backend and frontends """ |
21 | 21 |
22 import re | 22 import re |
23 | 23 |
24 path_escape = {"%": "%25", "/": "%2F", "\\": "%5c"} | 24 path_escape = {"%": "%25", "/": "%2F", "\\": "%5c"} |
25 path_escape_rev = {re.escape(v): k for k, v in path_escape.iteritems()} | 25 path_escape_rev = {re.escape(v): k for k, v in path_escape.items()} |
26 path_escape = {re.escape(k): v for k, v in path_escape.iteritems()} | 26 path_escape = {re.escape(k): v for k, v in path_escape.items()} |
27 # thanks to Martijn Pieters (https://stackoverflow.com/a/14693789) | 27 # thanks to Martijn Pieters (https://stackoverflow.com/a/14693789) |
28 RE_ANSI_REMOVE = re.compile(r"\x1b[^m]*m") | 28 RE_ANSI_REMOVE = re.compile(r"\x1b[^m]*m") |
29 | 29 |
30 | 30 |
31 def reJoin(exps): | 31 def reJoin(exps): |
42 @param string(basestr): string to use for the replacement | 42 @param string(basestr): string to use for the replacement |
43 """ | 43 """ |
44 return pattern.sub(lambda m: repl_dict[re.escape(m.group(0))], string) | 44 return pattern.sub(lambda m: repl_dict[re.escape(m.group(0))], string) |
45 | 45 |
46 | 46 |
47 path_escape_re = reJoin(path_escape.keys()) | 47 path_escape_re = reJoin(list(path_escape.keys())) |
48 path_escape_rev_re = reJoin(path_escape_rev.keys()) | 48 path_escape_rev_re = reJoin(list(path_escape_rev.keys())) |
49 | 49 |
50 | 50 |
51 def pathEscape(string): | 51 def pathEscape(string): |
52 """Escape string so it can be use in a file path | 52 """Escape string so it can be use in a file path |
53 | 53 |