Mercurial Repositories > Kivy Project / changeset

--- a/ChangeLog	Wed Jan 01 11:58:58 2020 +0100
+++ b/ChangeLog	Mon Jun 22 19:38:53 2020 +0200
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 3.0.0:
+- removed support for Python2
+
 Version 2.0.3:
 - bug fix
 

--- a/PluginKivy.e4p	Wed Jan 01 11:58:58 2020 +0100
+++ b/PluginKivy.e4p	Mon Jun 22 19:38:53 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 PluginKivy -->
-<!-- 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>edc66a361a68c8b839b94476f35c5809077c7a5d</Hash>
@@ -205,14 +205,6 @@
               <bool>False</bool>
             </value>
             <key>
-              <string>sourceExtensions</string>
-            </key>
-            <value>
-              <list>
-                <string></string>
-              </list>
-            </value>
-            <key>
               <string>useRecursion</string>
             </key>
             <value>
@@ -232,6 +224,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>
@@ -263,6 +283,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>
@@ -281,6 +314,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>
@@ -290,7 +329,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</string>
             </value>
             <key>
               <string>FixCodes</string>
@@ -308,7 +347,7 @@
               <string>FutureChecker</string>
             </key>
             <value>
-              <string>unicode_literals</string>
+              <string></string>
             </value>
             <key>
               <string>HangClosing</string>
@@ -341,6 +380,12 @@
               <int>10</int>
             </value>
             <key>
+              <string>MaxDocLineLength</string>
+            </key>
+            <value>
+              <int>79</int>
+            </value>
+            <key>
               <string>MaxLineLength</string>
             </key>
             <value>
@@ -359,6 +404,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/PluginProjectKivy.py	Wed Jan 01 11:58:58 2020 +0100
+++ b/PluginProjectKivy.py	Mon Jun 22 19:38:53 2020 +0200
@@ -7,8 +7,6 @@
 Module implementing the Kivy project plug-in.
 """
 
-from __future__ import unicode_literals
-
 import os
 import glob
 import fnmatch
@@ -26,15 +24,15 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "2.0.3"
+version = "3.0.0"
 className = "ProjectKivyPlugin"
 packageName = "ProjectKivy"
 shortDescription = "Project support for Kivy projects."
-longDescription = \
+longDescription = (
     """This plugin implements project support for Kivy projects."""
+)
 needsRestart = False
 pyqtApi = 2
-python2Compatible = True
 # End-of-Header
 
 error = ""
@@ -47,13 +45,12 @@
     @param language language to get API file for (string)
     @return list of API filenames (list of string)
     """
-    if language in ["Python2"]:
-        apisDir = \
-            os.path.join(os.path.dirname(__file__), "ProjectKivy", "APIs")
-        apis = glob.glob(os.path.join(apisDir, '*.api'))
+    if language in ["Python3"]:
+        apisDir = os.path.join(os.path.dirname(__file__),
+                               "ProjectKivy", "APIs")
+        return glob.glob(os.path.join(apisDir, '*.api'))
     else:
-        apis = []
-    return apis
+        return []
 
 
 class ProjectKivyPlugin(QObject):
@@ -99,19 +96,15 @@
         
         @return tuple of None and activation status (boolean)
         """
-        try:
-            self.__e5project.registerProjectType(
-                "Kivy", self.tr("Kivy"), self.fileTypesCallback,
-                lexerAssociationCallback=self.lexerAssociationCallback,
-                progLanguages=["Python2"])
-        except TypeError:
-            # for backward compatibility
-            self.__e5project.registerProjectType(
-                "Kivy", self.tr("Kivy"), self.fileTypesCallback,
-                lexerAssociationCallback=self.lexerAssociationCallback)
+        self.__e5project.registerProjectType(
+            "Kivy", self.tr("Kivy"), self.fileTypesCallback,
+            lexerAssociationCallback=self.lexerAssociationCallback,
+            progLanguages=["Python3"])
         
-        from Project.ProjectBrowser import SourcesBrowserFlag, \
-            FormsBrowserFlag, TranslationsBrowserFlag, OthersBrowserFlag
+        from Project.ProjectBrowser import (
+            SourcesBrowserFlag, FormsBrowserFlag, TranslationsBrowserFlag,
+            OthersBrowserFlag
+        )
         Preferences.setProjectBrowserFlagsDefault(
             "Kivy",
             SourcesBrowserFlag |
@@ -174,14 +167,13 @@
         @return dictionary with file type associations
         """
         if self.__e5project.getProjectType() == "Kivy":
-            fileTypes = {
+            return {
                 "*.kv": "SOURCES",
                 "*.kivy": "SOURCES",
                 "*.py": "SOURCES",
             }
         else:
-            fileTypes = {}
-        return fileTypes
+            return {}
     
     def lexerAssociationCallback(self, filename):
         """

Binary file PluginProjectKivy.zip has changed

--- a/ProjectKivy/Documentation/source/Plugin_Project_Kivy.PluginProjectKivy.html	Wed Jan 01 11:58:58 2020 +0100
+++ b/ProjectKivy/Documentation/source/Plugin_Project_Kivy.PluginProjectKivy.html	Mon Jun 22 19:38:53 2020 +0200
@@ -18,149 +18,196 @@
 
 </style>
 </head>
-<body><a NAME="top" ID="top"></a>
+<body>
+<a NAME="top" ID="top"></a>
 <h1>Plugin_Project_Kivy.PluginProjectKivy</h1>
+
 <p>
 Module implementing the Kivy project plug-in.
 </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="#ProjectKivyPlugin">ProjectKivyPlugin</a></td>
 <td>Class implementing the Kivy project plugin.</td>
 </tr>
 </table>
 <h3>Functions</h3>
+
 <table>
+
 <tr>
 <td><a href="#apiFiles">apiFiles</a></td>
 <td>Module function to return the API files made available by this plugin.</td>
 </tr>
 </table>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="ProjectKivyPlugin" ID="ProjectKivyPlugin"></a>
 <h2>ProjectKivyPlugin</h2>
+
 <p>
     Class implementing the Kivy project plugin.
 </p>
 <h3>Derived from</h3>
 QObject
 <h3>Class Attributes</h3>
+
 <table>
 <tr><td>KivyLexerEntry</td></tr><tr><td>KivyLexerKey</td></tr><tr><td>lexerAssociations</td></tr>
 </table>
 <h3>Class Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Methods</h3>
+
 <table>
+
 <tr>
 <td><a href="#ProjectKivyPlugin.__init__">ProjectKivyPlugin</a></td>
 <td>Constructor</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#ProjectKivyPlugin.__initialize">__initialize</a></td>
 <td>Private slot to (re)initialize the plugin.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#ProjectKivyPlugin.__loadTranslator">__loadTranslator</a></td>
 <td>Private method to load the translation file.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#ProjectKivyPlugin.activate">activate</a></td>
 <td>Public method to activate this plugin.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#ProjectKivyPlugin.deactivate">deactivate</a></td>
 <td>Public method to deactivate this plugin.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#ProjectKivyPlugin.fileTypesCallback">fileTypesCallback</a></td>
 <td>Public method get the filetype associations of the Kivy project type.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#ProjectKivyPlugin.getLexer">getLexer</a></td>
 <td>Public method to instantiate a Pygments Kivy lexer object.</td>
-</tr><tr>
+</tr>
+<tr>
 <td><a href="#ProjectKivyPlugin.lexerAssociationCallback">lexerAssociationCallback</a></td>
 <td>Public method to get the lexer association of the Kivy project type for a file.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
+
 <a NAME="ProjectKivyPlugin.__init__" ID="ProjectKivyPlugin.__init__"></a>
 <h4>ProjectKivyPlugin (Constructor)</h4>
 <b>ProjectKivyPlugin</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="ProjectKivyPlugin.__initialize" ID="ProjectKivyPlugin.__initialize"></a>
+</dl>
+<a NAME="ProjectKivyPlugin.__initialize" ID="ProjectKivyPlugin.__initialize"></a>
 <h4>ProjectKivyPlugin.__initialize</h4>
 <b>__initialize</b>(<i></i>)
+
 <p>
         Private slot to (re)initialize the plugin.
-</p><a NAME="ProjectKivyPlugin.__loadTranslator" ID="ProjectKivyPlugin.__loadTranslator"></a>
+</p>
+<a NAME="ProjectKivyPlugin.__loadTranslator" ID="ProjectKivyPlugin.__loadTranslator"></a>
 <h4>ProjectKivyPlugin.__loadTranslator</h4>
 <b>__loadTranslator</b>(<i></i>)
+
 <p>
         Private method to load the translation file.
-</p><a NAME="ProjectKivyPlugin.activate" ID="ProjectKivyPlugin.activate"></a>
+</p>
+<a NAME="ProjectKivyPlugin.activate" ID="ProjectKivyPlugin.activate"></a>
 <h4>ProjectKivyPlugin.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="ProjectKivyPlugin.deactivate" ID="ProjectKivyPlugin.deactivate"></a>
+</dl>
+<a NAME="ProjectKivyPlugin.deactivate" ID="ProjectKivyPlugin.deactivate"></a>
 <h4>ProjectKivyPlugin.deactivate</h4>
 <b>deactivate</b>(<i></i>)
+
 <p>
         Public method to deactivate this plugin.
-</p><a NAME="ProjectKivyPlugin.fileTypesCallback" ID="ProjectKivyPlugin.fileTypesCallback"></a>
+</p>
+<a NAME="ProjectKivyPlugin.fileTypesCallback" ID="ProjectKivyPlugin.fileTypesCallback"></a>
 <h4>ProjectKivyPlugin.fileTypesCallback</h4>
 <b>fileTypesCallback</b>(<i></i>)
+
 <p>
         Public method get the filetype associations of the Kivy project type.
-</p><dl>
+</p>
+<dl>
 <dt>Returns:</dt>
 <dd>
 dictionary with file type associations
 </dd>
-</dl><a NAME="ProjectKivyPlugin.getLexer" ID="ProjectKivyPlugin.getLexer"></a>
+</dl>
+<a NAME="ProjectKivyPlugin.getLexer" ID="ProjectKivyPlugin.getLexer"></a>
 <h4>ProjectKivyPlugin.getLexer</h4>
 <b>getLexer</b>(<i>parent=None</i>)
+
 <p>
         Public method to instantiate a Pygments Kivy lexer object.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>parent</i></dt>
 <dd>
 reference to the parent object (QObject)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 reference to the instanciated lexer object (QsciLexer)
 </dd>
-</dl><a NAME="ProjectKivyPlugin.lexerAssociationCallback" ID="ProjectKivyPlugin.lexerAssociationCallback"></a>
+</dl>
+<a NAME="ProjectKivyPlugin.lexerAssociationCallback" ID="ProjectKivyPlugin.lexerAssociationCallback"></a>
 <h4>ProjectKivyPlugin.lexerAssociationCallback</h4>
 <b>lexerAssociationCallback</b>(<i>filename</i>)
+
 <p>
         Public method to get the lexer association of the Kivy project type for
         a file.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>filename</i></dt>
 <dd>
 name of the file (string)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 name of the lexer (string) (Pygments lexers are prefixed with
@@ -168,18 +215,23 @@
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="apiFiles" ID="apiFiles"></a>
 <h2>apiFiles</h2>
 <b>apiFiles</b>(<i>language</i>)
+
 <p>
     Module function to return the API files made available by this plugin.
-</p><dl>
+</p>
+<dl>
+
 <dt><i>language</i></dt>
 <dd>
 language to get API file for (string)
 </dd>
-</dl><dl>
+</dl>
+<dl>
 <dt>Returns:</dt>
 <dd>
 list of API filenames (list of string)

--- a/ProjectKivy/Documentation/source/Plugin_Project_Kivy.ProjectKivy.KivyLexer.html	Wed Jan 01 11:58:58 2020 +0100
+++ b/ProjectKivy/Documentation/source/Plugin_Project_Kivy.ProjectKivy.KivyLexer.html	Mon Jun 22 19:38:53 2020 +0200
@@ -18,47 +18,59 @@
 
 </style>
 </head>
-<body><a NAME="top" ID="top"></a>
+<body>
+<a NAME="top" ID="top"></a>
 <h1>Plugin_Project_Kivy.ProjectKivy.KivyLexer</h1>
+
 <p>
 Module implementing a Pygments lexer for the Kivy language.
 </p>
 <h3>Global Attributes</h3>
+
 <table>
 <tr><td>__all__</td></tr>
 </table>
 <h3>Classes</h3>
+
 <table>
+
 <tr>
 <td><a href="#KivyLexer">KivyLexer</a></td>
 <td>Class implementing a Pygments lexer for the Kivy language.</td>
 </tr>
 </table>
 <h3>Functions</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
-<hr /><hr />
+<hr />
+<hr />
 <a NAME="KivyLexer" ID="KivyLexer"></a>
 <h2>KivyLexer</h2>
+
 <p>
     Class implementing a Pygments lexer for the Kivy language.
 </p>
 <h3>Derived from</h3>
 RegexLexer
 <h3>Class Attributes</h3>
+
 <table>
 <tr><td>aliases</td></tr><tr><td>filenames</td></tr><tr><td>mimetypes</td></tr><tr><td>name</td></tr><tr><td>tokens</td></tr>
 </table>
 <h3>Class Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>
 <h3>Static Methods</h3>
+
 <table>
 <tr><td>None</td></tr>
 </table>

--- a/ProjectKivy/Documentation/source/index-Plugin_Project_Kivy.ProjectKivy.html	Wed Jan 01 11:58:58 2020 +0100
+++ b/ProjectKivy/Documentation/source/index-Plugin_Project_Kivy.ProjectKivy.html	Mon Jun 22 19:38:53 2020 +0200
@@ -20,6 +20,7 @@
 </head>
 <body>
 <h1>Plugin_Project_Kivy.ProjectKivy</h1>
+
 <p>
 Package implementing project support for eric6 Kivy projects.
 </p>
@@ -27,6 +28,7 @@
 
 <h3>Modules</h3>
 <table>
+
 <tr>
 <td><a href="Plugin_Project_Kivy.ProjectKivy.KivyLexer.html">KivyLexer</a></td>
 <td>Module implementing a Pygments lexer for the Kivy language.</td>

--- a/ProjectKivy/Documentation/source/index-Plugin_Project_Kivy.html	Wed Jan 01 11:58:58 2020 +0100
+++ b/ProjectKivy/Documentation/source/index-Plugin_Project_Kivy.html	Mon Jun 22 19:38:53 2020 +0200
@@ -20,12 +20,14 @@
 </head>
 <body>
 <h1>Plugin_Project_Kivy</h1>
+
 <p>
 Package implementing the Kivy project plugin.
 </p>
 
 <h3>Packages</h3>
 <table>
+
 <tr>
 <td><a href="index-Plugin_Project_Kivy.ProjectKivy.html">ProjectKivy</a></td>
 <td>Package implementing project support for eric6 Kivy projects.</td>
@@ -34,6 +36,7 @@
 
 <h3>Modules</h3>
 <table>
+
 <tr>
 <td><a href="Plugin_Project_Kivy.PluginProjectKivy.html">PluginProjectKivy</a></td>
 <td>Module implementing the Kivy project plug-in.</td>

--- a/ProjectKivy/Documentation/source/index.html	Wed Jan 01 11:58:58 2020 +0100
+++ b/ProjectKivy/Documentation/source/index.html	Mon Jun 22 19:38:53 2020 +0200
@@ -24,6 +24,7 @@
 
 <h3>Packages</h3>
 <table>
+
 <tr>
 <td><a href="index-Plugin_Project_Kivy.html">Plugin_Project_Kivy</a></td>
 <td>Package implementing the Kivy project plugin.</td>