libervia-backend: sat/plugins/plugin_misc_text

comparison sat/plugins/plugin_misc_text_syntaxes.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	a02ad4bc0a6d
children	fee60f17ebac

comparison

equal deleted inserted replaced

-:ff5bcb12ae60
+:ab2696e34d29
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # SAT plugin for managing various text syntaxes
 # Copyright (C) 2009-2019 Jérôme Poisson (goffi@goffi.org)
 from lxml import html
 from lxml.html import clean
 from lxml import etree
 except ImportError:
 raise exceptions.MissingModule(
-u"Missing module lxml, please download/install it from http://lxml.de/"
+"Missing module lxml, please download/install it from http://lxml.de/"
 )
 log = getLogger(__name__)
 CATEGORY = D_("Composition")
 self.addSyntax(
 self.SYNTAX_MARKDOWN,
 partial(markdown.markdown,
 extensions=[
 EscapeHTML(),
-u'nl2br',
+'nl2br',
-u'codehilite',
+'codehilite',
-u'fenced_code',
+'fenced_code',
-u'sane_lists',
+'sane_lists',
-u'tables',
+'tables',
 ],
 extension_configs = {
-u"codehilite": {
+"codehilite": {
-u"css_class": "highlight",
+"css_class": "highlight",
 }
 }),
 _html2text,
 [TextSyntaxes.OPT_DEFAULT],
 )
 except ImportError:
-log.warning(u"markdown or html2text not found, can't use Markdown syntax")
+log.warning("markdown or html2text not found, can't use Markdown syntax")
 log.info(
-u"You can download/install them from https://pythonhosted.org/Markdown/ and https://github.com/Alir3z4/html2text/"
+"You can download/install them from https://pythonhosted.org/Markdown/ and https://github.com/Alir3z4/html2text/"
 )
 host.bridge.addMethod(
 "syntaxConvert",
 ".plugin",
 in_sign="sssbs",
 out_sign="s",
-async=True,
+async_=True,
 method=self.convert,
 )
 host.bridge.addMethod(
 "syntaxGet", ".plugin", in_sign="s", out_sign="s", method=self.getSyntax
 )
 if xml_tools.cleanXHTML is None:
-log.debug(u"Installing cleaning method")
+log.debug("Installing cleaning method")
 xml_tools.cleanXHTML = self.cleanXHTML
 def _updateParamOptions(self):
 data_synt = TextSyntaxes.syntaxes
 default_synt = TextSyntaxes.default_syntax
 syntaxes = []
-for syntax in data_synt.keys():
+for syntax in list(data_synt.keys()):
 flags = data_synt[syntax]["flags"]
 if TextSyntaxes.OPT_HIDDEN not in flags:
 syntaxes.append(syntax)
 syntaxes.sort(key=lambda synt: synt.lower())
 options = []
 for syntax in syntaxes:
 selected = 'selected="true"' if syntax == default_synt else ""
-options.append(u'<option value="%s" %s/>' % (syntax, selected))
+options.append('<option value="%s" %s/>' % (syntax, selected))
-TextSyntaxes.params_data["options"] = u"\n".join(options)
+TextSyntaxes.params_data["options"] = "\n".join(options)
 self.host.memory.updateParams(TextSyntaxes.params % TextSyntaxes.params_data)
 def getCurrentSyntax(self, profile):
 """ Return the selected syntax for the given profile
 @param profile: %(doc_profile)s
 @return: profile selected syntax
 """
 return self.host.memory.getParamA(NAME, CATEGORY, profile_key=profile)
-def _logError(self, failure, action=u"converting syntax"):
+def _logError(self, failure, action="converting syntax"):
 log.error(
-u"Error while {action}: {failure}".format(action=action, failure=failure)
+"Error while {action}: {failure}".format(action=action, failure=failure)
 )
 return failure
 def cleanStyle(self, styles):
 """"Clean unsafe CSS styles
 @param xhtml(unicode, lxml.etree._Element): raw HTML/XHTML text to clean
 @return (unicode): cleaned XHTML
 """
-if isinstance(xhtml, basestring):
+if isinstance(xhtml, str):
 try:
 xhtml_elt = html.fromstring(xhtml)
 except etree.ParserError as e:
 if not xhtml.strip():
-return u""
+return ""
-log.error(u"Can't clean XHTML: {xhtml}".format(xhtml=xhtml))
+log.error("Can't clean XHTML: {xhtml}".format(xhtml=xhtml))
 raise e
 elif isinstance(xhtml, html.HtmlElement):
 xhtml_elt = xhtml
 else:
 log.error("Only strings and HtmlElements can be cleaned")
 for element in xhtml_elt.iter(tag=etree.Element):
 if not element.text:
 if element.tag in VOID_ELEMENTS:
 element.text = None
 else:
-element.text = u''
+element.text = ''
-return html.tostring(xhtml_elt, encoding=unicode, method="xml")
+return html.tostring(xhtml_elt, encoding=str, method="xml")
 def convert(
 self, text, syntax_from, syntax_to=_SYNTAX_XHTML, safe=True, profile=None
 ):
 """Convert a text between two syntaxes
 TextSyntaxes.OPT_NO_THREAD: do not defer to thread when converting (the callback may then return a deferred)
 """
 flags = flags if flags is not None else []
 if TextSyntaxes.OPT_HIDDEN in flags and TextSyntaxes.OPT_DEFAULT in flags:
 raise ValueError(
-u"{} and {} are mutually exclusive".format(
+"{} and {} are mutually exclusive".format(
 TextSyntaxes.OPT_HIDDEN, TextSyntaxes.OPT_DEFAULT
 )
 )
 syntaxes = TextSyntaxes.syntaxes
 key = name.lower().strip()
 if key in syntaxes:
 raise exceptions.ConflictError(
-u"This syntax key already exists: {}".format(key)
+"This syntax key already exists: {}".format(key)
 )
 syntaxes[key] = {
 "name": name,
 "to": to_xhtml_cb,
 "from": from_xhtml_cb,
 @param xhtml: the XHTML string to be cleaned
 @return: the cleaned string
 """
 cleaner = clean.Cleaner(kill_tags=["style"])
 cleaned = cleaner.clean_html(html.fromstring(xhtml))
-return html.tostring(cleaned, encoding=unicode, method="text")
+return html.tostring(cleaned, encoding=str, method="text")

Mercurial > libervia-backend

comparison sat/plugins/plugin_misc_text_syntaxes.py @ 3028:ab2696e34d29