diff -r 69445de59a30 -r cdf51e6abaee RadonMetrics/CyclomaticComplexityCalculator.py --- a/RadonMetrics/CyclomaticComplexityCalculator.py Wed Jan 01 11:58:55 2020 +0100 +++ b/RadonMetrics/CyclomaticComplexityCalculator.py Tue Jun 23 19:05:15 2020 +0200 @@ -7,19 +7,7 @@ Module implementing the cyclomatic complexity service. """ -from __future__ import unicode_literals - -try: - str = unicode # __IGNORE_EXCEPTION__ __IGNORE_WARNING__ -except NameError: - pass - -try: - import Queue as queue # Py2 -except ImportError: - import queue - -import sys +import queue import multiprocessing @@ -95,8 +83,8 @@ # Start worker processes for _ in range(NumberOfProcesses): - multiprocessing.Process(target=worker, args=(taskQueue, doneQueue))\ - .start() + multiprocessing.Process( + target=worker, args=(taskQueue, doneQueue)).start() # Get and send results endIndex = len(argumentsList) - initialTasks @@ -157,13 +145,6 @@ """ from radon.complexity import cc_visit, cc_rank - # Check type for py2: if not str it's unicode - if sys.version_info[0] == 2: - try: - text = text.encode('utf-8') - except UnicodeError: - pass - try: cc = cc_visit(text) res = {"result": [v for v in map(__cc2Dict, cc) @@ -205,7 +186,7 @@ 'type': __getType(obj), 'rank': cc_rank(obj.complexity), } - attrs = set(Function._fields) - set(('is_method', 'closures')) + attrs = set(Function._fields) - {'is_method', 'closures'} attrs.add("fullname") for attr in attrs: v = getattr(obj, attr, None)