diff -r 9d01e990bb27 -r 4a69da851bd2 VultureChecker/VultureCheckerService.py
--- a/VultureChecker/VultureCheckerService.py Wed Jan 01 11:58:52 2020 +0100
+++ b/VultureChecker/VultureCheckerService.py Tue Jun 23 17:33:21 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
from vulture import Vulture
@@ -94,8 +82,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
@@ -153,13 +141,6 @@
@return tuple containing the result dictionary
@rtype (tuple of dict)
"""
- # 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:
v = EricVulture()
v.scan(text, filename=filename)
@@ -182,7 +163,7 @@
@return item dictionary
@rtype dict
"""
- d = {
+ return {
"name": item.name,
"type": item.typ,
"file": item.filename,
@@ -190,7 +171,6 @@
"last_line": item.last_lineno,
"confidence": item.confidence,
}
- return d
def getResults(self):
"""
