Mercurial Repositories > Radon Code Metrics / file diff

diff -r 1ae73306422a -r 725eaca7bc4b RadonMetrics/CyclomaticComplexityCalculator.py
--- a/RadonMetrics/CyclomaticComplexityCalculator.py	Mon Sep 19 17:43:37 2022 +0200
+++ b/RadonMetrics/CyclomaticComplexityCalculator.py	Mon Sep 19 17:54:33 2022 +0200
@@ -14,7 +14,7 @@
 def initService():
     """
     Initialize the service and return the entry point.
-    
+
     @return the entry point for the background client (function)
     """
     return cyclomaticComplexity
@@ -23,7 +23,7 @@
 def initBatchService():
     """
     Initialize the batch service and return the entry point.
-    
+
     @return the entry point for the background client (function)
     """
     return batchCyclomaticComplexity
@@ -32,7 +32,7 @@
 def cyclomaticComplexity(file, text=""):
     """
     Private function to calculate the cyclomatic complexity of one file.
-    
+
     @param file source filename
     @type str
     @param text source text
@@ -43,12 +43,11 @@
     return __cyclomaticComplexity(file, text)
 
 
-def batchCyclomaticComplexity(argumentsList, send, fx, cancelled,
-                              maxProcesses=0):
+def batchCyclomaticComplexity(argumentsList, send, fx, cancelled, maxProcesses=0):
     """
     Module function to calculate the cyclomatic complexity for a batch of
     files.
-    
+
     @param argumentsList list of arguments tuples as given for
         cyclomaticComplexity
     @type list
@@ -83,9 +82,8 @@
 
     # Start worker processes
     workers = [
-        multiprocessing.Process(
-            target=workerTask, args=(taskQueue, doneQueue)
-        ) for _ in range(NumberOfProcesses)
+        multiprocessing.Process(target=workerTask, args=(taskQueue, doneQueue))
+        for _ in range(NumberOfProcesses)
     ]
     for worker in workers:
         worker.start()
@@ -95,7 +93,7 @@
     for i in range(len(argumentsList)):
         resultSent = False
         wasCancelled = False
-        
+
         while not resultSent:
             try:
                 # get result (waiting max. 3 seconds and send it to frontend
@@ -107,18 +105,18 @@
                 if cancelled():
                     wasCancelled = True
                     break
-        
+
         if wasCancelled or cancelled():
             # just exit the loop ignoring the results of queued tasks
             break
-        
+
         if i < endIndex:
             taskQueue.put(argumentsList[i + initialTasks])
 
     # Tell child processes to stop
     for _ in range(NumberOfProcesses):
-        taskQueue.put('STOP')
-    
+        taskQueue.put("STOP")
+
     for worker in workers:
         worker.join()
         worker.close()
@@ -128,13 +126,13 @@
     """
     Module function acting as the parallel worker for the cyclomatic
     complexity calculation.
-    
+
     @param inputQueue input queue
     @type multiprocessing.Queue
     @param outputQueue output queue
     @type multiprocessing.Queue
     """
-    for filename, source in iter(inputQueue.get, 'STOP'):
+    for filename, source in iter(inputQueue.get, "STOP"):
         result = __cyclomaticComplexity(filename, source)
         outputQueue.put((filename, result))
 
@@ -143,7 +141,7 @@
     """
     Private function to calculate the cyclomatic complexity for one Python
     file.
-    
+
     @param file source filename
     @type str
     @param text source text
@@ -152,11 +150,10 @@
     @rtype (tuple of dict)
     """
     from radon.complexity import cc_visit, cc_rank
-    
+
     try:
         cc = cc_visit(text)
-        res = {"result": [v for v in map(__cc2Dict, cc)
-                          if v["type"] != "method"]}
+        res = {"result": [v for v in map(__cc2Dict, cc) if v["type"] != "method"]}
         totalCC = 0
         rankSummary = {
             "A": 0,
@@ -174,14 +171,14 @@
         res["summary"] = rankSummary
     except Exception as err:
         res = {"error": str(err)}
-    return (res, )
+    return (res,)
 
 
 def __cc2Dict(obj):
     """
     Private function to convert an object holding cyclomatic complexity results
     into a dictionary.
-    
+
     @param obj object as returned from cc_visit()
     @type radon.visitors.Function
     @return conversion result
@@ -189,18 +186,18 @@
     """
     from radon.complexity import cc_rank
     from radon.visitors import Function
-    
+
     result = {
-        'type': __getType(obj),
-        'rank': cc_rank(obj.complexity),
+        "type": __getType(obj),
+        "rank": cc_rank(obj.complexity),
     }
-    attrs = set(Function._fields) - {'is_method', 'closures'}
+    attrs = set(Function._fields) - {"is_method", "closures"}
     attrs.add("fullname")
     for attr in attrs:
         v = getattr(obj, attr, None)
         if v is not None:
             result[attr] = v
-    for key in ('methods', 'closures'):
+    for key in ("methods", "closures"):
         if hasattr(obj, key):
             result[key] = list(map(__cc2Dict, getattr(obj, key)))
     return result
@@ -209,18 +206,18 @@
 def __getType(obj):
     """
     Private function to get the type of an object as a string.
-    
+
     @param obj object to be analyzed
     @type radon.visitors.Function or radon.visitors.Class
     @return type string for the object
     @rtype str, one of ["method", "function", "class"]
     """
     from radon.visitors import Function
-    
+
     if isinstance(obj, Function):
         if obj.is_method:
-            return 'method'
+            return "method"
         else:
-            return 'function'
+            return "function"
     else:
-        return 'class'
+        return "class"