Tue, 23 Jun 2020 18:59:26 +0200
Removed support for Python2.
--- a/ChangeLog Wed Jan 01 11:58:59 2020 +0100 +++ b/ChangeLog Tue Jun 23 18:59:26 2020 +0200 @@ -1,5 +1,8 @@ ChangeLog --------- +Version 2.0.0: +- removed support for Python2 + Version 1.1.4: - bug fixes
--- a/PluginProjectWeb.py Wed Jan 01 11:58:59 2020 +0100 +++ b/PluginProjectWeb.py Tue Jun 23 18:59:26 2020 +0200 @@ -7,8 +7,6 @@ Module implementing the Web project plugin. """ -from __future__ import unicode_literals - import os from PyQt5.QtCore import QObject, QTranslator @@ -30,7 +28,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "1.1.4" +version = "2.0.0" className = "ProjectWebPlugin" packageName = "ProjectWeb" shortDescription = "Support for Web projects and web related tools." @@ -41,7 +39,6 @@ ) needsRestart = False pyqtApi = 2 -python2Compatible = True # End-Of-Header error = "" @@ -89,8 +86,9 @@ "Web", self.tr("Web"), self.fileTypesCallback) - from Project.ProjectBrowser import SourcesBrowserFlag, \ - FormsBrowserFlag, OthersBrowserFlag + from Project.ProjectBrowser import ( + SourcesBrowserFlag, FormsBrowserFlag, OthersBrowserFlag + ) Preferences.setProjectBrowserFlagsDefault( "Web", SourcesBrowserFlag | FormsBrowserFlag | OthersBrowserFlag, @@ -171,14 +169,13 @@ @return dictionary with file type associations """ if self.__e5project.getProjectType() == "Web": - fileTypes = { + return { "*.html": "FORMS", "*.htm": "FORMS", "*.js": "SOURCES", } else: - fileTypes = {} - return fileTypes + return {} def __initMenu(self): """
--- a/PluginWeb.e4p Wed Jan 01 11:58:59 2020 +0100 +++ b/PluginWeb.e4p Tue Jun 23 18:59:26 2020 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE Project SYSTEM "Project-5.1.dtd"> <!-- eric project file for project PluginWeb --> -<!-- Copyright (C) 2018 Detlev Offenbach, detlev@die-offenbachs.de --> +<!-- Copyright (C) 2020 Detlev Offenbach, detlev@die-offenbachs.de --> <Project version="5.1"> <Language>en_US</Language> <Hash>b8ec8ccc0a087e55bdb7879c78b018b43ce2c6ed</Hash> @@ -210,14 +210,6 @@ <bool>False</bool> </value> <key> - <string>sourceExtensions</string> - </key> - <value> - <list> - <string></string> - </list> - </value> - <key> <string>useRecursion</string> </key> <value> @@ -237,6 +229,34 @@ <value> <dict> <key> + <string>AnnotationsChecker</string> + </key> + <value> + <dict> + <key> + <string>MaximumComplexity</string> + </key> + <value> + <int>3</int> + </value> + <key> + <string>MinimumCoverage</string> + </key> + <value> + <int>75</int> + </value> + </dict> + </value> + <key> + <string>BlankLines</string> + </key> + <value> + <tuple> + <int>2</int> + <int>1</int> + </tuple> + </value> + <key> <string>BuiltinsChecker</string> </key> <value> @@ -268,6 +288,19 @@ </dict> </value> <key> + <string>CommentedCodeChecker</string> + </key> + <value> + <dict> + <key> + <string>Aggressive</string> + </key> + <value> + <bool>False</bool> + </value> + </dict> + </value> + <key> <string>CopyrightAuthor</string> </key> <value> @@ -286,6 +319,12 @@ <string>eric</string> </value> <key> + <string>EnabledCheckerCategories</string> + </key> + <value> + <string>C, D, E, M, N, S, W</string> + </value> + <key> <string>ExcludeFiles</string> </key> <value> @@ -295,7 +334,7 @@ <string>ExcludeMessages</string> </key> <value> - <string>C101, E265, E266, E305, E402, M811, N802, N803, N807, N808, N821, W293, M201</string> + <string>C101,E265,E266,E305,E402,M811,N802,N803,N807,N808,N821,W293,M201,W504,M305</string> </value> <key> <string>FixCodes</string> @@ -313,7 +352,7 @@ <string>FutureChecker</string> </key> <value> - <string>unicode_literals</string> + <string></string> </value> <key> <string>HangClosing</string> @@ -346,6 +385,12 @@ <int>10</int> </value> <key> + <string>MaxDocLineLength</string> + </key> + <value> + <int>79</int> + </value> + <key> <string>MaxLineLength</string> </key> <value> @@ -364,6 +409,91 @@ <bool>True</bool> </value> <key> + <string>SecurityChecker</string> + </key> + <value> + <dict> + <key> + <string>CheckTypedException</string> + </key> + <value> + <bool>False</bool> + </value> + <key> + <string>HardcodedTmpDirectories</string> + </key> + <value> + <list> + <string>/tmp</string> + <string>/var/tmp</string> + <string>/dev/shm</string> + <string>~/tmp</string> + </list> + </value> + <key> + <string>InsecureHashes</string> + </key> + <value> + <list> + <string>md4</string> + <string>md5</string> + <string>sha</string> + <string>sha1</string> + </list> + </value> + <key> + <string>InsecureSslProtocolVersions</string> + </key> + <value> + <list> + <string>PROTOCOL_SSLv2</string> + <string>SSLv2_METHOD</string> + <string>SSLv23_METHOD</string> + <string>PROTOCOL_SSLv3</string> + <string>PROTOCOL_TLSv1</string> + <string>SSLv3_METHOD</string> + <string>TLSv1_METHOD</string> + </list> + </value> + <key> + <string>WeakKeySizeDsaHigh</string> + </key> + <value> + <string>1024</string> + </value> + <key> + <string>WeakKeySizeDsaMedium</string> + </key> + <value> + <string>2048</string> + </value> + <key> + <string>WeakKeySizeEcHigh</string> + </key> + <value> + <string>160</string> + </value> + <key> + <string>WeakKeySizeEcMedium</string> + </key> + <value> + <string>224</string> + </value> + <key> + <string>WeakKeySizeRsaHigh</string> + </key> + <value> + <string>1024</string> + </value> + <key> + <string>WeakKeySizeRsaMedium</string> + </key> + <value> + <string>2048</string> + </value> + </dict> + </value> + <key> <string>ShowIgnored</string> </key> <value>
--- a/ProjectWeb/Documentation/source/Plugin_Project_Web.PluginProjectWeb.html Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Documentation/source/Plugin_Project_Web.PluginProjectWeb.html Tue Jun 23 18:59:26 2020 +0200 @@ -18,211 +18,283 @@ </style> </head> -<body><a NAME="top" ID="top"></a> +<body> +<a NAME="top" ID="top"></a> <h1>Plugin_Project_Web.PluginProjectWeb</h1> + <p> Module implementing the Web project plugin. </p> <h3>Global Attributes</h3> + <table> -<tr><td>author</td></tr><tr><td>autoactivate</td></tr><tr><td>className</td></tr><tr><td>deactivateable</td></tr><tr><td>error</td></tr><tr><td>longDescription</td></tr><tr><td>name</td></tr><tr><td>needsRestart</td></tr><tr><td>packageName</td></tr><tr><td>pyqtApi</td></tr><tr><td>python2Compatible</td></tr><tr><td>shortDescription</td></tr><tr><td>version</td></tr> +<tr><td>author</td></tr><tr><td>autoactivate</td></tr><tr><td>className</td></tr><tr><td>deactivateable</td></tr><tr><td>error</td></tr><tr><td>longDescription</td></tr><tr><td>name</td></tr><tr><td>needsRestart</td></tr><tr><td>packageName</td></tr><tr><td>pyqtApi</td></tr><tr><td>shortDescription</td></tr><tr><td>version</td></tr> </table> <h3>Classes</h3> + <table> + <tr> <td><a href="#ProjectWebPlugin">ProjectWebPlugin</a></td> <td>Class implementing the Web project plugin.</td> </tr> </table> <h3>Functions</h3> + <table> <tr><td>None</td></tr> </table> -<hr /><hr /> +<hr /> +<hr /> <a NAME="ProjectWebPlugin" ID="ProjectWebPlugin"></a> <h2>ProjectWebPlugin</h2> + <p> Class implementing the Web project plugin. </p> <h3>Derived from</h3> QObject <h3>Class Attributes</h3> + <table> <tr><td>None</td></tr> </table> <h3>Class Methods</h3> + <table> <tr><td>None</td></tr> </table> <h3>Methods</h3> + <table> + <tr> <td><a href="#ProjectWebPlugin.__init__">ProjectWebPlugin</a></td> <td>Constructor</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.__editorClosed">__editorClosed</a></td> <td>Private slot called, when an editor was closed.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.__editorOpened">__editorOpened</a></td> <td>Private slot called, when a new editor was opened.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.__editorShowMenu">__editorShowMenu</a></td> <td>Private slot called, when the the editor context menu or a submenu is about to be shown.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.__html5Prettify">__html5Prettify</a></td> <td>Private slot handling the Prettify HTML action.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.__html5ToCss3">__html5ToCss3</a></td> <td>Private slot handling the HTML5 to CSS3 conversion.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.__html5ToJs">__html5ToJs</a></td> <td>Private slot handling the HTML5 to JavaScript conversion.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.__initMenu">__initMenu</a></td> <td>Private method to initialize the web tools menu.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.__initialize">__initialize</a></td> <td>Private slot to (re)initialize the plugin.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.__loadTranslator">__loadTranslator</a></td> <td>Private method to load the translation file.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.__menuAboutToShow">__menuAboutToShow</a></td> <td>Private slot to prepare the menu before it is shown.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.__populateMenu">__populateMenu</a></td> <td>Private slot to populate the tools menu with our entries.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.activate">activate</a></td> <td>Public method to activate this plugin.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.deactivate">deactivate</a></td> <td>Public method to deactivate this plugin.</td> -</tr><tr> +</tr> +<tr> <td><a href="#ProjectWebPlugin.fileTypesCallback">fileTypesCallback</a></td> <td>Public method to get the filetype associations of the Web project type.</td> </tr> </table> <h3>Static Methods</h3> + <table> <tr><td>None</td></tr> </table> + <a NAME="ProjectWebPlugin.__init__" ID="ProjectWebPlugin.__init__"></a> <h4>ProjectWebPlugin (Constructor)</h4> <b>ProjectWebPlugin</b>(<i>ui</i>) + <p> Constructor -</p><dl> +</p> +<dl> + <dt><i>ui</i></dt> <dd> reference to the user interface object (UI.UserInterface) </dd> -</dl><a NAME="ProjectWebPlugin.__editorClosed" ID="ProjectWebPlugin.__editorClosed"></a> +</dl> +<a NAME="ProjectWebPlugin.__editorClosed" ID="ProjectWebPlugin.__editorClosed"></a> <h4>ProjectWebPlugin.__editorClosed</h4> <b>__editorClosed</b>(<i>editor</i>) + <p> Private slot called, when an editor was closed. -</p><dl> +</p> +<dl> + <dt><i>editor</i></dt> <dd> reference to the editor (QScintilla.Editor) </dd> -</dl><a NAME="ProjectWebPlugin.__editorOpened" ID="ProjectWebPlugin.__editorOpened"></a> +</dl> +<a NAME="ProjectWebPlugin.__editorOpened" ID="ProjectWebPlugin.__editorOpened"></a> <h4>ProjectWebPlugin.__editorOpened</h4> <b>__editorOpened</b>(<i>editor</i>) + <p> Private slot called, when a new editor was opened. -</p><dl> +</p> +<dl> + <dt><i>editor</i></dt> <dd> reference to the new editor (QScintilla.Editor) </dd> -</dl><a NAME="ProjectWebPlugin.__editorShowMenu" ID="ProjectWebPlugin.__editorShowMenu"></a> +</dl> +<a NAME="ProjectWebPlugin.__editorShowMenu" ID="ProjectWebPlugin.__editorShowMenu"></a> <h4>ProjectWebPlugin.__editorShowMenu</h4> <b>__editorShowMenu</b>(<i>menuName, menu, editor</i>) + <p> Private slot called, when the the editor context menu or a submenu is about to be shown. -</p><dl> +</p> +<dl> + <dt><i>menuName</i></dt> <dd> name of the menu to be shown (string) -</dd><dt><i>menu</i></dt> +</dd> +<dt><i>menu</i></dt> <dd> reference to the menu (QMenu) -</dd><dt><i>editor</i></dt> +</dd> +<dt><i>editor</i></dt> <dd> reference to the editor </dd> -</dl><a NAME="ProjectWebPlugin.__html5Prettify" ID="ProjectWebPlugin.__html5Prettify"></a> +</dl> +<a NAME="ProjectWebPlugin.__html5Prettify" ID="ProjectWebPlugin.__html5Prettify"></a> <h4>ProjectWebPlugin.__html5Prettify</h4> <b>__html5Prettify</b>(<i></i>) + <p> Private slot handling the Prettify HTML action. -</p><a NAME="ProjectWebPlugin.__html5ToCss3" ID="ProjectWebPlugin.__html5ToCss3"></a> +</p> +<a NAME="ProjectWebPlugin.__html5ToCss3" ID="ProjectWebPlugin.__html5ToCss3"></a> <h4>ProjectWebPlugin.__html5ToCss3</h4> <b>__html5ToCss3</b>(<i></i>) + <p> Private slot handling the HTML5 to CSS3 conversion. -</p><a NAME="ProjectWebPlugin.__html5ToJs" ID="ProjectWebPlugin.__html5ToJs"></a> +</p> +<a NAME="ProjectWebPlugin.__html5ToJs" ID="ProjectWebPlugin.__html5ToJs"></a> <h4>ProjectWebPlugin.__html5ToJs</h4> <b>__html5ToJs</b>(<i></i>) + <p> Private slot handling the HTML5 to JavaScript conversion. -</p><a NAME="ProjectWebPlugin.__initMenu" ID="ProjectWebPlugin.__initMenu"></a> +</p> +<a NAME="ProjectWebPlugin.__initMenu" ID="ProjectWebPlugin.__initMenu"></a> <h4>ProjectWebPlugin.__initMenu</h4> <b>__initMenu</b>(<i></i>) + <p> Private method to initialize the web tools menu. -</p><a NAME="ProjectWebPlugin.__initialize" ID="ProjectWebPlugin.__initialize"></a> +</p> +<a NAME="ProjectWebPlugin.__initialize" ID="ProjectWebPlugin.__initialize"></a> <h4>ProjectWebPlugin.__initialize</h4> <b>__initialize</b>(<i></i>) + <p> Private slot to (re)initialize the plugin. -</p><a NAME="ProjectWebPlugin.__loadTranslator" ID="ProjectWebPlugin.__loadTranslator"></a> +</p> +<a NAME="ProjectWebPlugin.__loadTranslator" ID="ProjectWebPlugin.__loadTranslator"></a> <h4>ProjectWebPlugin.__loadTranslator</h4> <b>__loadTranslator</b>(<i></i>) + <p> Private method to load the translation file. -</p><a NAME="ProjectWebPlugin.__menuAboutToShow" ID="ProjectWebPlugin.__menuAboutToShow"></a> +</p> +<a NAME="ProjectWebPlugin.__menuAboutToShow" ID="ProjectWebPlugin.__menuAboutToShow"></a> <h4>ProjectWebPlugin.__menuAboutToShow</h4> <b>__menuAboutToShow</b>(<i></i>) + <p> Private slot to prepare the menu before it is shown. -</p><a NAME="ProjectWebPlugin.__populateMenu" ID="ProjectWebPlugin.__populateMenu"></a> +</p> +<a NAME="ProjectWebPlugin.__populateMenu" ID="ProjectWebPlugin.__populateMenu"></a> <h4>ProjectWebPlugin.__populateMenu</h4> <b>__populateMenu</b>(<i>name, menu</i>) + <p> Private slot to populate the tools menu with our entries. -</p><dl> +</p> +<dl> + <dt><i>name</i></dt> <dd> name of the menu (string) -</dd><dt><i>menu</i></dt> +</dd> +<dt><i>menu</i></dt> <dd> reference to the menu to be populated (QMenu) </dd> -</dl><a NAME="ProjectWebPlugin.activate" ID="ProjectWebPlugin.activate"></a> +</dl> +<a NAME="ProjectWebPlugin.activate" ID="ProjectWebPlugin.activate"></a> <h4>ProjectWebPlugin.activate</h4> <b>activate</b>(<i></i>) + <p> Public method to activate this plugin. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> tuple of None and activation status (boolean) </dd> -</dl><a NAME="ProjectWebPlugin.deactivate" ID="ProjectWebPlugin.deactivate"></a> +</dl> +<a NAME="ProjectWebPlugin.deactivate" ID="ProjectWebPlugin.deactivate"></a> <h4>ProjectWebPlugin.deactivate</h4> <b>deactivate</b>(<i></i>) + <p> Public method to deactivate this plugin. -</p><a NAME="ProjectWebPlugin.fileTypesCallback" ID="ProjectWebPlugin.fileTypesCallback"></a> +</p> +<a NAME="ProjectWebPlugin.fileTypesCallback" ID="ProjectWebPlugin.fileTypesCallback"></a> <h4>ProjectWebPlugin.fileTypesCallback</h4> <b>fileTypesCallback</b>(<i></i>) + <p> Public method to get the filetype associations of the Web project type. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> dictionary with file type associations
--- a/ProjectWeb/Documentation/source/Plugin_Project_Web.ProjectWeb.Html5Prettifier.html Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Documentation/source/Plugin_Project_Web.ProjectWeb.Html5Prettifier.html Tue Jun 23 18:59:26 2020 +0200 @@ -18,111 +18,145 @@ </style> </head> -<body><a NAME="top" ID="top"></a> +<body> +<a NAME="top" ID="top"></a> <h1>Plugin_Project_Web.ProjectWeb.Html5Prettifier</h1> + <p> Module implementing a class to prettify HTML code. </p> <h3>Global Attributes</h3> + <table> <tr><td>None</td></tr> </table> <h3>Classes</h3> + <table> + <tr> <td><a href="#Html5Prettifier">Html5Prettifier</a></td> <td>Class implementing the HTML5 prettifier.</td> </tr> </table> <h3>Functions</h3> + <table> <tr><td>None</td></tr> </table> -<hr /><hr /> +<hr /> +<hr /> <a NAME="Html5Prettifier" ID="Html5Prettifier"></a> <h2>Html5Prettifier</h2> + <p> Class implementing the HTML5 prettifier. </p> <h3>Derived from</h3> QObject <h3>Class Attributes</h3> + <table> <tr><td>None</td></tr> </table> <h3>Class Methods</h3> + <table> <tr><td>None</td></tr> </table> <h3>Methods</h3> + <table> + <tr> <td><a href="#Html5Prettifier.__init__">Html5Prettifier</a></td> <td>Constructor</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5Prettifier.commentPrettify">commentPrettify</a></td> <td>Public method to prettify HTML comments.</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5Prettifier.getPrettifiedHtml">getPrettifiedHtml</a></td> <td>Public method to prettify the HTML code.</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5Prettifier.tagPrettify">tagPrettify</a></td> <td>Public method to prettify HTML tags.</td> </tr> </table> <h3>Static Methods</h3> + <table> <tr><td>None</td></tr> </table> + <a NAME="Html5Prettifier.__init__" ID="Html5Prettifier.__init__"></a> <h4>Html5Prettifier (Constructor)</h4> <b>Html5Prettifier</b>(<i>html, parent=None</i>) + <p> Constructor -</p><dl> +</p> +<dl> + <dt><i>html</i></dt> <dd> HTML text to be prettified (string) -</dd><dt><i>parent</i></dt> +</dd> +<dt><i>parent</i></dt> <dd> reference to the parent object (QObject) </dd> -</dl><a NAME="Html5Prettifier.commentPrettify" ID="Html5Prettifier.commentPrettify"></a> +</dl> +<a NAME="Html5Prettifier.commentPrettify" ID="Html5Prettifier.commentPrettify"></a> <h4>Html5Prettifier.commentPrettify</h4> <b>commentPrettify</b>(<i>matchobj</i>) + <p> Public method to prettify HTML comments. -</p><dl> +</p> +<dl> + <dt><i>matchobj</i></dt> <dd> reference to the match object (re.MatchObject) </dd> -</dl><dl> +</dl> +<dl> <dt>Returns:</dt> <dd> prettified comment (string) </dd> -</dl><a NAME="Html5Prettifier.getPrettifiedHtml" ID="Html5Prettifier.getPrettifiedHtml"></a> +</dl> +<a NAME="Html5Prettifier.getPrettifiedHtml" ID="Html5Prettifier.getPrettifiedHtml"></a> <h4>Html5Prettifier.getPrettifiedHtml</h4> <b>getPrettifiedHtml</b>(<i></i>) + <p> Public method to prettify the HTML code. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> prettified HTML code (string) </dd> -</dl><a NAME="Html5Prettifier.tagPrettify" ID="Html5Prettifier.tagPrettify"></a> +</dl> +<a NAME="Html5Prettifier.tagPrettify" ID="Html5Prettifier.tagPrettify"></a> <h4>Html5Prettifier.tagPrettify</h4> <b>tagPrettify</b>(<i>tag</i>) + <p> Public method to prettify HTML tags. -</p><dl> +</p> +<dl> + <dt><i>tag</i></dt> <dd> tag to be prettified (string) </dd> -</dl><dl> +</dl> +<dl> <dt>Returns:</dt> <dd> prettified tag (string)
--- a/ProjectWeb/Documentation/source/Plugin_Project_Web.ProjectWeb.Html5ToCss3Converter.html Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Documentation/source/Plugin_Project_Web.ProjectWeb.Html5ToCss3Converter.html Tue Jun 23 18:59:26 2020 +0200 @@ -18,124 +18,161 @@ </style> </head> -<body><a NAME="top" ID="top"></a> +<body> +<a NAME="top" ID="top"></a> <h1>Plugin_Project_Web.ProjectWeb.Html5ToCss3Converter</h1> + <p> Module implementing the HTML5 to CSS3 converter. </p> <h3>Global Attributes</h3> + <table> <tr><td>None</td></tr> </table> <h3>Classes</h3> + <table> + <tr> <td><a href="#Html5ToCss3Converter">Html5ToCss3Converter</a></td> <td>Class implementing the HTML5 to CSS3 converter.</td> </tr> </table> <h3>Functions</h3> + <table> <tr><td>None</td></tr> </table> -<hr /><hr /> +<hr /> +<hr /> <a NAME="Html5ToCss3Converter" ID="Html5ToCss3Converter"></a> <h2>Html5ToCss3Converter</h2> + <p> Class implementing the HTML5 to CSS3 converter. </p> <h3>Derived from</h3> QObject <h3>Class Attributes</h3> + <table> <tr><td>CssTemplate7</td></tr><tr><td>CssTemplate8</td></tr><tr><td>Placeholders</td></tr><tr><td>TagsToIgnore</td></tr> </table> <h3>Class Methods</h3> + <table> <tr><td>None</td></tr> </table> <h3>Methods</h3> + <table> + <tr> <td><a href="#Html5ToCss3Converter.__init__">Html5ToCss3Converter</a></td> <td>Constructor</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5ToCss3Converter.__createSoup">__createSoup</a></td> <td>Private method to get a BeaitifulSoup object with our HTML text.</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5ToCss3Converter.__getClasses">__getClasses</a></td> <td>Private method to extract all classes of the HTML text.</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5ToCss3Converter.__getIds">__getIds</a></td> <td>Private method to extract all IDs of the HTML text.</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5ToCss3Converter.__getTags">__getTags</a></td> <td>Private method to extract all tags of the HTML text.</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5ToCss3Converter.getCss3">getCss3</a></td> <td>Public method to get the converted CSS3 text.</td> </tr> </table> <h3>Static Methods</h3> + <table> <tr><td>None</td></tr> </table> + <a NAME="Html5ToCss3Converter.__init__" ID="Html5ToCss3Converter.__init__"></a> <h4>Html5ToCss3Converter (Constructor)</h4> <b>Html5ToCss3Converter</b>(<i>html, parent=None</i>) + <p> Constructor -</p><dl> +</p> +<dl> + <dt><i>html</i></dt> <dd> HTML text to be converted (string) -</dd><dt><i>parent</i></dt> +</dd> +<dt><i>parent</i></dt> <dd> reference to the parent object (QObject) </dd> -</dl><a NAME="Html5ToCss3Converter.__createSoup" ID="Html5ToCss3Converter.__createSoup"></a> +</dl> +<a NAME="Html5ToCss3Converter.__createSoup" ID="Html5ToCss3Converter.__createSoup"></a> <h4>Html5ToCss3Converter.__createSoup</h4> <b>__createSoup</b>(<i></i>) + <p> Private method to get a BeaitifulSoup object with our HTML text. -</p><a NAME="Html5ToCss3Converter.__getClasses" ID="Html5ToCss3Converter.__getClasses"></a> +</p> +<a NAME="Html5ToCss3Converter.__getClasses" ID="Html5ToCss3Converter.__getClasses"></a> <h4>Html5ToCss3Converter.__getClasses</h4> <b>__getClasses</b>(<i></i>) + <p> Private method to extract all classes of the HTML text. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> list of tuples containing the tag name and its classes as a blank separated string (list of tuples of two strings) </dd> -</dl><a NAME="Html5ToCss3Converter.__getIds" ID="Html5ToCss3Converter.__getIds"></a> +</dl> +<a NAME="Html5ToCss3Converter.__getIds" ID="Html5ToCss3Converter.__getIds"></a> <h4>Html5ToCss3Converter.__getIds</h4> <b>__getIds</b>(<i></i>) + <p> Private method to extract all IDs of the HTML text. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> list of tuples containing the tag name and its ID (list of tuples of two strings) </dd> -</dl><a NAME="Html5ToCss3Converter.__getTags" ID="Html5ToCss3Converter.__getTags"></a> +</dl> +<a NAME="Html5ToCss3Converter.__getTags" ID="Html5ToCss3Converter.__getTags"></a> <h4>Html5ToCss3Converter.__getTags</h4> <b>__getTags</b>(<i></i>) + <p> Private method to extract all tags of the HTML text. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> list of all tags (list of strings) </dd> -</dl><a NAME="Html5ToCss3Converter.getCss3" ID="Html5ToCss3Converter.getCss3"></a> +</dl> +<a NAME="Html5ToCss3Converter.getCss3" ID="Html5ToCss3Converter.getCss3"></a> <h4>Html5ToCss3Converter.getCss3</h4> <b>getCss3</b>(<i></i>) + <p> Public method to get the converted CSS3 text. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> CSS3 text (string)
--- a/ProjectWeb/Documentation/source/Plugin_Project_Web.ProjectWeb.Html5ToCss3ConverterParameterDialog.html Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Documentation/source/Plugin_Project_Web.ProjectWeb.Html5ToCss3ConverterParameterDialog.html Tue Jun 23 18:59:26 2020 +0200 @@ -18,72 +18,93 @@ </style> </head> -<body><a NAME="top" ID="top"></a> +<body> +<a NAME="top" ID="top"></a> <h1>Plugin_Project_Web.ProjectWeb.Html5ToCss3ConverterParameterDialog</h1> + <p> Module implementing a dialog to enter the CSS conversion parameters. </p> <h3>Global Attributes</h3> + <table> <tr><td>None</td></tr> </table> <h3>Classes</h3> + <table> + <tr> <td><a href="#Html5ToCss3ConverterParameterDialog">Html5ToCss3ConverterParameterDialog</a></td> <td>Class implementing a dialog to enter the CSS conversion parameters.</td> </tr> </table> <h3>Functions</h3> + <table> <tr><td>None</td></tr> </table> -<hr /><hr /> +<hr /> +<hr /> <a NAME="Html5ToCss3ConverterParameterDialog" ID="Html5ToCss3ConverterParameterDialog"></a> <h2>Html5ToCss3ConverterParameterDialog</h2> + <p> Class implementing a dialog to enter the CSS conversion parameters. </p> <h3>Derived from</h3> QDialog, Ui_Html5ToCss3ConverterParameterDialog <h3>Class Attributes</h3> + <table> <tr><td>None</td></tr> </table> <h3>Class Methods</h3> + <table> <tr><td>None</td></tr> </table> <h3>Methods</h3> + <table> + <tr> <td><a href="#Html5ToCss3ConverterParameterDialog.__init__">Html5ToCss3ConverterParameterDialog</a></td> <td>Constructor</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5ToCss3ConverterParameterDialog.getData">getData</a></td> <td>Public method to get the entered data.</td> </tr> </table> <h3>Static Methods</h3> + <table> <tr><td>None</td></tr> </table> + <a NAME="Html5ToCss3ConverterParameterDialog.__init__" ID="Html5ToCss3ConverterParameterDialog.__init__"></a> <h4>Html5ToCss3ConverterParameterDialog (Constructor)</h4> <b>Html5ToCss3ConverterParameterDialog</b>(<i>parent=None</i>) + <p> Constructor -</p><dl> +</p> +<dl> + <dt><i>parent</i></dt> <dd> reference to the parent widget (QWidget) </dd> -</dl><a NAME="Html5ToCss3ConverterParameterDialog.getData" ID="Html5ToCss3ConverterParameterDialog.getData"></a> +</dl> +<a NAME="Html5ToCss3ConverterParameterDialog.getData" ID="Html5ToCss3ConverterParameterDialog.getData"></a> <h4>Html5ToCss3ConverterParameterDialog.getData</h4> <b>getData</b>(<i></i>) + <p> Public method to get the entered data. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> tuple of indentation string (string) and a flag indicating to
--- a/ProjectWeb/Documentation/source/Plugin_Project_Web.ProjectWeb.Html5ToJsConverter.html Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Documentation/source/Plugin_Project_Web.ProjectWeb.Html5ToJsConverter.html Tue Jun 23 18:59:26 2020 +0200 @@ -18,111 +18,144 @@ </style> </head> -<body><a NAME="top" ID="top"></a> +<body> +<a NAME="top" ID="top"></a> <h1>Plugin_Project_Web.ProjectWeb.Html5ToJsConverter</h1> + <p> Module implementing the HTML5 to JavaScript converter. </p> <h3>Global Attributes</h3> + <table> <tr><td>None</td></tr> </table> <h3>Classes</h3> + <table> + <tr> <td><a href="#Html5ToJsConverter">Html5ToJsConverter</a></td> <td>Class implementing the HTML5 to JavaScript converter.</td> </tr> </table> <h3>Functions</h3> + <table> <tr><td>None</td></tr> </table> -<hr /><hr /> +<hr /> +<hr /> <a NAME="Html5ToJsConverter" ID="Html5ToJsConverter"></a> <h2>Html5ToJsConverter</h2> + <p> Class implementing the HTML5 to JavaScript converter. </p> <h3>Derived from</h3> QObject <h3>Class Attributes</h3> + <table> <tr><td>JsTemplate8</td></tr><tr><td>TagsToIgnore</td></tr> </table> <h3>Class Methods</h3> + <table> <tr><td>None</td></tr> </table> <h3>Methods</h3> + <table> + <tr> <td><a href="#Html5ToJsConverter.__init__">Html5ToJsConverter</a></td> <td>Constructor</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5ToJsConverter.__createSoup">__createSoup</a></td> <td>Private method to get a BeaitifulSoup object with our HTML text.</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5ToJsConverter.__getClasses">__getClasses</a></td> <td>Private method to extract all classes of the HTML text.</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5ToJsConverter.__getIds">__getIds</a></td> <td>Private method to extract all IDs of the HTML text.</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5ToJsConverter.getJavaScript">getJavaScript</a></td> <td>Public method to get the converted JavaScript text.</td> </tr> </table> <h3>Static Methods</h3> + <table> <tr><td>None</td></tr> </table> + <a NAME="Html5ToJsConverter.__init__" ID="Html5ToJsConverter.__init__"></a> <h4>Html5ToJsConverter (Constructor)</h4> <b>Html5ToJsConverter</b>(<i>html, parent=None</i>) + <p> Constructor -</p><dl> +</p> +<dl> + <dt><i>html</i></dt> <dd> HTML text to be converted (string) -</dd><dt><i>parent</i></dt> +</dd> +<dt><i>parent</i></dt> <dd> reference to the parent object (QObject) </dd> -</dl><a NAME="Html5ToJsConverter.__createSoup" ID="Html5ToJsConverter.__createSoup"></a> +</dl> +<a NAME="Html5ToJsConverter.__createSoup" ID="Html5ToJsConverter.__createSoup"></a> <h4>Html5ToJsConverter.__createSoup</h4> <b>__createSoup</b>(<i></i>) + <p> Private method to get a BeaitifulSoup object with our HTML text. -</p><a NAME="Html5ToJsConverter.__getClasses" ID="Html5ToJsConverter.__getClasses"></a> +</p> +<a NAME="Html5ToJsConverter.__getClasses" ID="Html5ToJsConverter.__getClasses"></a> <h4>Html5ToJsConverter.__getClasses</h4> <b>__getClasses</b>(<i></i>) + <p> Private method to extract all classes of the HTML text. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> list of tuples containing the tag name and its classes as a blank separated string (list of tuples of two strings) </dd> -</dl><a NAME="Html5ToJsConverter.__getIds" ID="Html5ToJsConverter.__getIds"></a> +</dl> +<a NAME="Html5ToJsConverter.__getIds" ID="Html5ToJsConverter.__getIds"></a> <h4>Html5ToJsConverter.__getIds</h4> <b>__getIds</b>(<i></i>) + <p> Private method to extract all IDs of the HTML text. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> list of tuples containing the tag name and its ID (list of tuples of two strings) </dd> -</dl><a NAME="Html5ToJsConverter.getJavaScript" ID="Html5ToJsConverter.getJavaScript"></a> +</dl> +<a NAME="Html5ToJsConverter.getJavaScript" ID="Html5ToJsConverter.getJavaScript"></a> <h4>Html5ToJsConverter.getJavaScript</h4> <b>getJavaScript</b>(<i></i>) + <p> Public method to get the converted JavaScript text. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> JavaScript text (string)
--- a/ProjectWeb/Documentation/source/Plugin_Project_Web.ProjectWeb.Html5ToJsConverterParameterDialog.html Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Documentation/source/Plugin_Project_Web.ProjectWeb.Html5ToJsConverterParameterDialog.html Tue Jun 23 18:59:26 2020 +0200 @@ -18,72 +18,93 @@ </style> </head> -<body><a NAME="top" ID="top"></a> +<body> +<a NAME="top" ID="top"></a> <h1>Plugin_Project_Web.ProjectWeb.Html5ToJsConverterParameterDialog</h1> + <p> Module implementing a dialog to enter the JavaScript conversion parameters. </p> <h3>Global Attributes</h3> + <table> <tr><td>None</td></tr> </table> <h3>Classes</h3> + <table> + <tr> <td><a href="#Html5ToJsConverterParameterDialog">Html5ToJsConverterParameterDialog</a></td> <td>Class implementing a dialog to enter the JavaScript conversion parameters.</td> </tr> </table> <h3>Functions</h3> + <table> <tr><td>None</td></tr> </table> -<hr /><hr /> +<hr /> +<hr /> <a NAME="Html5ToJsConverterParameterDialog" ID="Html5ToJsConverterParameterDialog"></a> <h2>Html5ToJsConverterParameterDialog</h2> + <p> Class implementing a dialog to enter the JavaScript conversion parameters. </p> <h3>Derived from</h3> QDialog, Ui_Html5ToJsConverterParameterDialog <h3>Class Attributes</h3> + <table> <tr><td>None</td></tr> </table> <h3>Class Methods</h3> + <table> <tr><td>None</td></tr> </table> <h3>Methods</h3> + <table> + <tr> <td><a href="#Html5ToJsConverterParameterDialog.__init__">Html5ToJsConverterParameterDialog</a></td> <td>Constructor</td> -</tr><tr> +</tr> +<tr> <td><a href="#Html5ToJsConverterParameterDialog.getData">getData</a></td> <td>Public method to get the entered data.</td> </tr> </table> <h3>Static Methods</h3> + <table> <tr><td>None</td></tr> </table> + <a NAME="Html5ToJsConverterParameterDialog.__init__" ID="Html5ToJsConverterParameterDialog.__init__"></a> <h4>Html5ToJsConverterParameterDialog (Constructor)</h4> <b>Html5ToJsConverterParameterDialog</b>(<i>parent=None</i>) + <p> Constructor -</p><dl> +</p> +<dl> + <dt><i>parent</i></dt> <dd> reference to the parent widget (QWidget) </dd> -</dl><a NAME="Html5ToJsConverterParameterDialog.getData" ID="Html5ToJsConverterParameterDialog.getData"></a> +</dl> +<a NAME="Html5ToJsConverterParameterDialog.getData" ID="Html5ToJsConverterParameterDialog.getData"></a> <h4>Html5ToJsConverterParameterDialog.getData</h4> <b>getData</b>(<i></i>) + <p> Public method to get the entered data. -</p><dl> +</p> +<dl> <dt>Returns:</dt> <dd> tuple of indentation string (string) and a flag indicating to
--- a/ProjectWeb/Documentation/source/index-Plugin_Project_Web.ProjectWeb.html Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Documentation/source/index-Plugin_Project_Web.ProjectWeb.html Tue Jun 23 18:59:26 2020 +0200 @@ -20,6 +20,7 @@ </head> <body> <h1>Plugin_Project_Web.ProjectWeb</h1> + <p> Package implementing web project plug-in data and functions. </p> @@ -27,19 +28,24 @@ <h3>Modules</h3> <table> + <tr> <td><a href="Plugin_Project_Web.ProjectWeb.Html5Prettifier.html">Html5Prettifier</a></td> <td>Module implementing a class to prettify HTML code.</td> -</tr><tr> +</tr> +<tr> <td><a href="Plugin_Project_Web.ProjectWeb.Html5ToCss3Converter.html">Html5ToCss3Converter</a></td> <td>Module implementing the HTML5 to CSS3 converter.</td> -</tr><tr> +</tr> +<tr> <td><a href="Plugin_Project_Web.ProjectWeb.Html5ToCss3ConverterParameterDialog.html">Html5ToCss3ConverterParameterDialog</a></td> <td>Module implementing a dialog to enter the CSS conversion parameters.</td> -</tr><tr> +</tr> +<tr> <td><a href="Plugin_Project_Web.ProjectWeb.Html5ToJsConverter.html">Html5ToJsConverter</a></td> <td>Module implementing the HTML5 to JavaScript converter.</td> -</tr><tr> +</tr> +<tr> <td><a href="Plugin_Project_Web.ProjectWeb.Html5ToJsConverterParameterDialog.html">Html5ToJsConverterParameterDialog</a></td> <td>Module implementing a dialog to enter the JavaScript conversion parameters.</td> </tr>
--- a/ProjectWeb/Documentation/source/index-Plugin_Project_Web.html Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Documentation/source/index-Plugin_Project_Web.html Tue Jun 23 18:59:26 2020 +0200 @@ -20,12 +20,14 @@ </head> <body> <h1>Plugin_Project_Web</h1> + <p> Package implementing the Web project plugin. </p> <h3>Packages</h3> <table> + <tr> <td><a href="index-Plugin_Project_Web.ProjectWeb.html">ProjectWeb</a></td> <td>Package implementing web project plug-in data and functions.</td> @@ -34,6 +36,7 @@ <h3>Modules</h3> <table> + <tr> <td><a href="Plugin_Project_Web.PluginProjectWeb.html">PluginProjectWeb</a></td> <td>Module implementing the Web project plugin.</td>
--- a/ProjectWeb/Documentation/source/index.html Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Documentation/source/index.html Tue Jun 23 18:59:26 2020 +0200 @@ -24,6 +24,7 @@ <h3>Packages</h3> <table> + <tr> <td><a href="index-Plugin_Project_Web.html">Plugin_Project_Web</a></td> <td>Package implementing the Web project plugin.</td>
--- a/ProjectWeb/Html5Prettifier.py Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Html5Prettifier.py Tue Jun 23 18:59:26 2020 +0200 @@ -7,11 +7,8 @@ Module implementing a class to prettify HTML code. """ -from __future__ import unicode_literals - import re - from PyQt5.QtCore import QObject import Preferences @@ -59,9 +56,8 @@ @param tag tag to be prettified (string) @return prettified tag (string) """ - result = re.sub(" {{1,{0}}}".format(self.__indentWidth), " ", tag, - flags=re.MULTILINE) - return result + return re.sub(" {{1,{0}}}".format(self.__indentWidth), " ", tag, + flags=re.MULTILINE) def commentPrettify(self, matchobj): """ @@ -71,7 +67,6 @@ @return prettified comment (string) """ if re.search("\n", matchobj.group()): - result = self.tagPrettify(matchobj.group()) + return self.tagPrettify(matchobj.group()) else: - result = matchobj.group() - return result + return matchobj.group()
--- a/ProjectWeb/Html5ToCss3Converter.py Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Html5ToCss3Converter.py Tue Jun 23 18:59:26 2020 +0200 @@ -7,8 +7,6 @@ Module implementing the HTML5 to CSS3 converter. """ -from __future__ import unicode_literals - import os import datetime import getpass @@ -17,8 +15,9 @@ from PyQt5.QtCore import QObject from PyQt5.QtWidgets import QDialog -from .Html5ToCss3ConverterParameterDialog import \ +from .Html5ToCss3ConverterParameterDialog import ( Html5ToCss3ConverterParameterDialog +) class Html5ToCss3Converter(QObject): @@ -76,7 +75,7 @@ "{", os.linesep, indentation, - random.choice(self.Placeholders) + os.linesep + random.choice(self.Placeholders) + os.linesep # secok if placeholders else os.linesep, "}", os.linesep @@ -100,7 +99,7 @@ "{", os.linesep, indentation, - random.choice(self.Placeholders) + os.linesep + random.choice(self.Placeholders) + os.linesep # secok if placeholders else os.linesep, "}", os.linesep @@ -124,7 +123,7 @@ "{", os.linesep, indentation, - random.choice(self.Placeholders) + os.linesep + random.choice(self.Placeholders) + os.linesep # secok if placeholders else os.linesep, "}", os.linesep
--- a/ProjectWeb/Html5ToCss3ConverterParameterDialog.py Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Html5ToCss3ConverterParameterDialog.py Tue Jun 23 18:59:26 2020 +0200 @@ -7,12 +7,11 @@ Module implementing a dialog to enter the CSS conversion parameters. """ -from __future__ import unicode_literals - from PyQt5.QtWidgets import QDialog -from .Ui_Html5ToCss3ConverterParameterDialog import \ +from .Ui_Html5ToCss3ConverterParameterDialog import ( Ui_Html5ToCss3ConverterParameterDialog +) class Html5ToCss3ConverterParameterDialog(
--- a/ProjectWeb/Html5ToJsConverter.py Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Html5ToJsConverter.py Tue Jun 23 18:59:26 2020 +0200 @@ -7,8 +7,6 @@ Module implementing the HTML5 to JavaScript converter. """ -from __future__ import unicode_literals - import os import re import datetime @@ -17,8 +15,9 @@ from PyQt5.QtCore import QObject from PyQt5.QtWidgets import QDialog -from .Html5ToJsConverterParameterDialog import \ +from .Html5ToJsConverterParameterDialog import ( Html5ToJsConverterParameterDialog +) class Html5ToJsConverter(QObject):
--- a/ProjectWeb/Html5ToJsConverterParameterDialog.py Wed Jan 01 11:58:59 2020 +0100 +++ b/ProjectWeb/Html5ToJsConverterParameterDialog.py Tue Jun 23 18:59:26 2020 +0200 @@ -7,12 +7,11 @@ Module implementing a dialog to enter the JavaScript conversion parameters. """ -from __future__ import unicode_literals - from PyQt5.QtWidgets import QDialog -from .Ui_Html5ToJsConverterParameterDialog import \ +from .Ui_Html5ToJsConverterParameterDialog import ( Ui_Html5ToJsConverterParameterDialog +) class Html5ToJsConverterParameterDialog(