From b1c7be7bb5ae6099e9fe8a7ea8848be4e5514b16 Mon Sep 17 00:00:00 2001 From: Dino Hensen Date: Wed, 15 Nov 2017 22:21:08 +0100 Subject: [PATCH 1/2] Fix file_exists method for filenames that contain subdirectories by just using os.path.exists --- src/codacy/reporter.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/codacy/reporter.py b/src/codacy/reporter.py index 58bbe49..68b78fa 100755 --- a/src/codacy/reporter.py +++ b/src/codacy/reporter.py @@ -47,13 +47,7 @@ def get_git_directory(): def file_exists(rootdir, filename): - for root, subFolders, files in os.walk(rootdir): - if filename in files: - return True - else: - for subFolder in subFolders: - return file_exists(os.path.join(rootdir, subFolder), filename) - return False + return os.path.exists(os.path.join(rootdir, filename)) def generate_filename(sources, filename, git_directory): From e8fd8006e8943073a4c135de96f2934b141e955c Mon Sep 17 00:00:00 2001 From: Dino Hensen Date: Wed, 15 Nov 2017 22:22:49 +0100 Subject: [PATCH 2/2] Fixed unicode keyword for python3 --- tests/tests.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/tests.py b/tests/tests.py index ed4bf83..b9d53f1 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -1,11 +1,19 @@ import json import os import unittest +import sys import codacy.reporter HERE = os.path.abspath(os.path.dirname(__file__)) +print("PYTHON_VERSION: ", sys.version_info) + +if sys.version_info[0] == 3: + unicode_type = str +else: + unicode_type = unicode + def _file_location(*args): return os.path.join(HERE, *args) @@ -22,7 +30,7 @@ def to_utf8(d): result = {} for key, value in d.items(): result[to_utf8(key)] = to_utf8(value) - elif type(d) is unicode: + elif type(d) is unicode_type: return d.encode('utf8') else: return d