From 69e97554918bfb2276069eda44b4ebc8f635d416 Mon Sep 17 00:00:00 2001 From: Mickael FALCK Date: Wed, 25 Nov 2015 16:13:41 +0100 Subject: [PATCH] Fixing bytes-related TypeError upon report uploading when using python3 --- setup.py | 2 +- src/codacy/reporter.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index dcdfc24..eba5e97 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ packages=find_packages('src'), package_dir={'': 'src'}, include_package_data=True, - install_requires=['requests'], + install_requires=['requests', 'six'], extras_require={ 'dev': ['check-manifest'], diff --git a/src/codacy/reporter.py b/src/codacy/reporter.py index 68ebc6c..09fcc23 100755 --- a/src/codacy/reporter.py +++ b/src/codacy/reporter.py @@ -6,6 +6,7 @@ import os from xml.dom import minidom import requests +import six logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s') @@ -107,7 +108,10 @@ def upload_report(report, token, commit): logging.debug(r.content) r.raise_for_status() - message = json.loads(r.content)['success'] + if six.PY2: + message = json.loads(r.content)['success'] + else: + message = json.loads(str(r.content, 'utf-8'))['success'] logging.info(message)