Mercurial Repositories > Radon Code Metrics / changeset
changeset
Fixed some code style issues.
Mon, 27 Mar 2017 18:34:33 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 27 Mar 2017 18:34:33 +0200
- changeset 43
- 53dbd4f4d6c2
- parent 42
- 04457b4ceda5
- child 44
- 509744519228
Fixed some code style issues.
--- a/ChangeLog Sat Dec 31 13:50:43 2016 +0100 +++ b/ChangeLog Mon Mar 27 18:34:33 2017 +0200 @@ -1,5 +1,8 @@ ChangeLog --------- +Version 1.0.3: +- bug fixes + Version 1.0.2: - updated Russian translations
--- a/PluginMetricsRadon.e4p Sat Dec 31 13:50:43 2016 +0100 +++ b/PluginMetricsRadon.e4p Mon Mar 27 18:34:33 2017 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE Project SYSTEM "Project-5.1.dtd"> <!-- eric project file for project PluginMetricsRadon --> -<!-- Copyright (C) 2015 Detlev Offenbach, detlev@die-offenbachs.de --> +<!-- Copyright (C) 2017 Detlev Offenbach, detlev@die-offenbachs.de --> <Project version="5.1"> <Language>en_US</Language> <Hash>662232fb888fb1b426cf967a2c238f4dd2f58f08</Hash> @@ -158,9 +158,6 @@ </value> </dict> </VcsOptions> - <VcsOtherData> - <dict/> - </VcsOtherData> </Vcs> <FiletypeAssociations> <FiletypeAssociation pattern="*.idl" type="INTERFACES"/> @@ -222,14 +219,6 @@ <bool>False</bool> </value> <key> - <string>sourceExtensions</string> - </key> - <value> - <list> - <string></string> - </list> - </value> - <key> <string>useRecursion</string> </key> <value> @@ -249,10 +238,41 @@ <value> <dict> <key> + <string>BuiltinsChecker</string> + </key> + <value> + <dict> + <key> + <string>bytes</string> + </key> + <value> + <list> + <string>unicode</string> + </list> + </value> + <key> + <string>chr</string> + </key> + <value> + <list> + <string>unichr</string> + </list> + </value> + <key> + <string>str</string> + </key> + <value> + <list> + <string>unicode</string> + </list> + </value> + </dict> + </value> + <key> <string>CopyrightAuthor</string> </key> <value> - <string>Detlev Offenbach</string> + <string></string> </value> <key> <string>CopyrightMinFileSize</string> @@ -270,13 +290,13 @@ <string>ExcludeFiles</string> </key> <value> - <string>*/Ui_*.py,*/radon/*</string> + <string>*/Ui_*.py, */*_rc.py,*/radon/*</string> </value> <key> <string>ExcludeMessages</string> </key> <value> - <string>C101, E265, N802, N803, N807, N808, N821, W293, M801, M811</string> + <string>C101, E265, E266, E305, E402, M811, N802, N803, N807, N808, N821, W293</string> </value> <key> <string>FixCodes</string> @@ -309,6 +329,18 @@ <string></string> </value> <key> + <string>LineComplexity</string> + </key> + <value> + <int>20</int> + </value> + <key> + <string>LineComplexityScore</string> + </key> + <value> + <int>10</int> + </value> + <key> <string>MaxCodeComplexity</string> </key> <value>
--- a/PluginMetricsRadon.py Sat Dec 31 13:50:43 2016 +0100 +++ b/PluginMetricsRadon.py Mon Mar 27 18:34:33 2017 +0200 @@ -28,7 +28,7 @@ author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = True deactivateable = True -version = "1.0.2" +version = "1.0.3" className = "RadonMetricsPlugin" packageName = "RadonMetrics" shortDescription = "Code metrics plugin using radon package" @@ -1060,3 +1060,6 @@ self.__projectMIDialog and self.__projectMIDialog.clear() self.__projectRawMetricsDialog and \ self.__projectRawMetricsDialog.clear() + +# +# eflag: noqa = M801
--- a/RadonMetrics/CodeMetricsCalculator.py Sat Dec 31 13:50:43 2016 +0100 +++ b/RadonMetrics/CodeMetricsCalculator.py Mon Mar 27 18:34:33 2017 +0200 @@ -99,19 +99,19 @@ taskQueue.put('STOP') -def worker(input, output): +def worker(inputQueue, outputQueue): """ Module function acting as the parallel worker for the raw code metrics calculation. - @param input input queue + @param inputQueue input queue @type multiprocessing.Queue - @param output output queue + @param outputQueue output queue @type multiprocessing.Queue """ - for filename, source in iter(input.get, 'STOP'): + for filename, source in iter(inputQueue.get, 'STOP'): result = __rawCodeMetrics(filename, source) - output.put((filename, result)) + outputQueue.put((filename, result)) def __rawCodeMetrics(file, text=""):
--- a/RadonMetrics/CyclomaticComplexityCalculator.py Sat Dec 31 13:50:43 2016 +0100 +++ b/RadonMetrics/CyclomaticComplexityCalculator.py Mon Mar 27 18:34:33 2017 +0200 @@ -102,19 +102,19 @@ taskQueue.put('STOP') -def worker(input, output): +def worker(inputQueue, outputQueue): """ Module function acting as the parallel worker for the cyclomatic complexity calculation. - @param input input queue + @param inputQueue input queue @type multiprocessing.Queue - @param output output queue + @param outputQueue output queue @type multiprocessing.Queue """ - for filename, source in iter(input.get, 'STOP'): + for filename, source in iter(inputQueue.get, 'STOP'): result = __cyclomaticComplexity(filename, source) - output.put((filename, result)) + outputQueue.put((filename, result)) def __cyclomaticComplexity(file, text=""):
--- a/RadonMetrics/CyclomaticComplexityDialog.py Sat Dec 31 13:50:43 2016 +0100 +++ b/RadonMetrics/CyclomaticComplexityDialog.py Mon Mar 27 18:34:33 2017 +0200 @@ -547,9 +547,9 @@ filterList = [f.strip() for f in filterString.split(",") if f.strip()] if filterList: - for filter in filterList: + for fileFilter in filterList: fileList = \ - [f for f in fileList if not fnmatch.fnmatch(f, filter)] + [f for f in fileList if not fnmatch.fnmatch(f, fileFilter)] minimumRank = self.rankComboBox.currentText() if "MinimumRank" not in self.__data or \
--- a/RadonMetrics/Documentation/source/Plugin_Metrics_Radon.RadonMetrics.CodeMetricsCalculator.html Sat Dec 31 13:50:43 2016 +0100 +++ b/RadonMetrics/Documentation/source/Plugin_Metrics_Radon.RadonMetrics.CodeMetricsCalculator.html Mon Mar 27 18:34:33 2017 +0200 @@ -183,15 +183,15 @@ <hr /><hr /> <a NAME="worker" ID="worker"></a> <h2>worker</h2> -<b>worker</b>(<i>input, output</i>) +<b>worker</b>(<i>inputQueue, outputQueue</i>) <p> Module function acting as the parallel worker for the raw code metrics calculation. </p><dl> -<dt><i>input</i> (multiprocessing.Queue)</dt> +<dt><i>inputQueue</i> (multiprocessing.Queue)</dt> <dd> input queue -</dd><dt><i>output</i> (multiprocessing.Queue)</dt> +</dd><dt><i>outputQueue</i> (multiprocessing.Queue)</dt> <dd> output queue </dd>
--- a/RadonMetrics/Documentation/source/Plugin_Metrics_Radon.RadonMetrics.CyclomaticComplexityCalculator.html Sat Dec 31 13:50:43 2016 +0100 +++ b/RadonMetrics/Documentation/source/Plugin_Metrics_Radon.RadonMetrics.CyclomaticComplexityCalculator.html Mon Mar 27 18:34:33 2017 +0200 @@ -212,15 +212,15 @@ <hr /><hr /> <a NAME="worker" ID="worker"></a> <h2>worker</h2> -<b>worker</b>(<i>input, output</i>) +<b>worker</b>(<i>inputQueue, outputQueue</i>) <p> Module function acting as the parallel worker for the cyclomatic complexity calculation. </p><dl> -<dt><i>input</i> (multiprocessing.Queue)</dt> +<dt><i>inputQueue</i> (multiprocessing.Queue)</dt> <dd> input queue -</dd><dt><i>output</i> (multiprocessing.Queue)</dt> +</dd><dt><i>outputQueue</i> (multiprocessing.Queue)</dt> <dd> output queue </dd>
--- a/RadonMetrics/Documentation/source/Plugin_Metrics_Radon.RadonMetrics.MaintainabilityIndexCalculator.html Sat Dec 31 13:50:43 2016 +0100 +++ b/RadonMetrics/Documentation/source/Plugin_Metrics_Radon.RadonMetrics.MaintainabilityIndexCalculator.html Mon Mar 27 18:34:33 2017 +0200 @@ -159,15 +159,15 @@ <hr /><hr /> <a NAME="worker" ID="worker"></a> <h2>worker</h2> -<b>worker</b>(<i>input, output</i>) +<b>worker</b>(<i>inputQueue, outputQueue</i>) <p> Module function acting as the parallel worker for the maintainability index calculation. </p><dl> -<dt><i>input</i> (multiprocessing.Queue)</dt> +<dt><i>inputQueue</i> (multiprocessing.Queue)</dt> <dd> input queue -</dd><dt><i>output</i> (multiprocessing.Queue)</dt> +</dd><dt><i>outputQueue</i> (multiprocessing.Queue)</dt> <dd> output queue </dd>
--- a/RadonMetrics/MaintainabilityIndexCalculator.py Sat Dec 31 13:50:43 2016 +0100 +++ b/RadonMetrics/MaintainabilityIndexCalculator.py Mon Mar 27 18:34:33 2017 +0200 @@ -102,19 +102,19 @@ taskQueue.put('STOP') -def worker(input, output): +def worker(inputQueue, outputQueue): """ Module function acting as the parallel worker for the maintainability index calculation. - @param input input queue + @param inputQueue input queue @type multiprocessing.Queue - @param output output queue + @param outputQueue output queue @type multiprocessing.Queue """ - for filename, source in iter(input.get, 'STOP'): + for filename, source in iter(inputQueue.get, 'STOP'): result = __maintainabilityIndex(filename, source) - output.put((filename, result)) + outputQueue.put((filename, result)) def __maintainabilityIndex(file, text=""):
--- a/RadonMetrics/MaintainabilityIndexDialog.py Sat Dec 31 13:50:43 2016 +0100 +++ b/RadonMetrics/MaintainabilityIndexDialog.py Mon Mar 27 18:34:33 2017 +0200 @@ -431,9 +431,9 @@ filterList = [f.strip() for f in filterString.split(",") if f.strip()] if filterList: - for filter in filterList: + for fileFilter in filterList: fileList = \ - [f for f in fileList if not fnmatch.fnmatch(f, filter)] + [f for f in fileList if not fnmatch.fnmatch(f, fileFilter)] self.start(fileList)
--- a/RadonMetrics/RawMetricsDialog.py Sat Dec 31 13:50:43 2016 +0100 +++ b/RadonMetrics/RawMetricsDialog.py Mon Mar 27 18:34:33 2017 +0200 @@ -484,9 +484,9 @@ filterList = [f.strip() for f in filterString.split(",") if f.strip()] if filterList: - for filter in filterList: + for fileFilter in filterList: fileList = \ - [f for f in fileList if not fnmatch.fnmatch(f, filter)] + [f for f in fileList if not fnmatch.fnmatch(f, fileFilter)] self.start(fileList)
