Mercurial > libervia-backend
comparison sat_frontends/jp/xml_tools.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 | 710de41da2f2 |
| children | 9d0df638c8b4 |
comparison
equal
deleted
inserted
replaced
| 3027:ff5bcb12ae60 | 3028:ab2696e34d29 |
|---|---|
| 31 """ | 31 """ |
| 32 try: | 32 try: |
| 33 from lxml import etree | 33 from lxml import etree |
| 34 except ImportError: | 34 except ImportError: |
| 35 cmd.disp( | 35 cmd.disp( |
| 36 u'lxml module must be installed, please install it with "pip install lxml"', | 36 'lxml module must be installed, please install it with "pip install lxml"', |
| 37 error=True, | 37 error=True, |
| 38 ) | 38 ) |
| 39 cmd.host.quit(C.EXIT_ERROR) | 39 cmd.host.quit(C.EXIT_ERROR) |
| 40 try: | 40 try: |
| 41 if isinstance(raw_xml, basestring): | 41 if isinstance(raw_xml, str): |
| 42 parser = etree.XMLParser(remove_blank_text=True) | 42 parser = etree.XMLParser(remove_blank_text=True) |
| 43 element = etree.fromstring(raw_xml, parser) | 43 element = etree.fromstring(raw_xml, parser) |
| 44 else: | 44 else: |
| 45 element = etree.parse(raw_xml).getroot() | 45 element = etree.parse(raw_xml).getroot() |
| 46 except Exception as e: | 46 except Exception as e: |
| 47 if reraise: | 47 if reraise: |
| 48 raise e | 48 raise e |
| 49 cmd.parser.error( | 49 cmd.parser.error( |
| 50 _(u"Can't parse the payload XML in input: {msg}").format(msg=e) | 50 _("Can't parse the payload XML in input: {msg}").format(msg=e) |
| 51 ) | 51 ) |
| 52 return element, etree | 52 return element, etree |
| 53 | 53 |
| 54 def getPayload(cmd, element): | 54 def getPayload(cmd, element): |
| 55 """Retrieve payload element and exit with and error if not found | 55 """Retrieve payload element and exit with and error if not found |
| 57 @param element(etree.Element): root element | 57 @param element(etree.Element): root element |
| 58 @return element(etree.Element): payload element | 58 @return element(etree.Element): payload element |
| 59 """ | 59 """ |
| 60 if element.tag in ("item", "{http://jabber.org/protocol/pubsub}item"): | 60 if element.tag in ("item", "{http://jabber.org/protocol/pubsub}item"): |
| 61 if len(element) > 1: | 61 if len(element) > 1: |
| 62 cmd.disp(_(u"<item> can only have one child element (the payload)"), | 62 cmd.disp(_("<item> can only have one child element (the payload)"), |
| 63 error=True) | 63 error=True) |
| 64 cmd.host.quit(C.EXIT_DATA_ERROR) | 64 cmd.host.quit(C.EXIT_DATA_ERROR) |
| 65 element = element[0] | 65 element = element[0] |
| 66 return element | 66 return element |