From 21c6c6bd85e8c85442bc95b3d8b85d70091a8108 Mon Sep 17 00:00:00 2001 From: Amit Kotlovski Date: Mon, 28 Feb 2022 13:31:40 +0200 Subject: [PATCH 1/3] fix: use demjson3 demjson is no longer installable on systems with newer setuptools --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index df7e22d..80842d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -demjson +demjson3 From bfb5dc35c50db13d2caa72f29980b82bd228d357 Mon Sep 17 00:00:00 2001 From: Andy Kipp Date: Mon, 28 Feb 2022 14:42:54 +0300 Subject: [PATCH 2/3] demjson3 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 78f0f78..01f9e1e 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ long_description_content_type='text/markdown', python_requires='>=3.6', install_requires=[ - 'demjson' + 'demjson3' ], packages=setuptools.find_packages(), package_data={'tokenize_output': ['*.py']}, From 71788b18005530ce17fa3df0b142c791e2c78ba6 Mon Sep 17 00:00:00 2001 From: Andy Kipp Date: Mon, 28 Feb 2022 14:43:23 +0300 Subject: [PATCH 3/3] Update tokenize_output.py --- tokenize_output/tokenize_output.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tokenize_output/tokenize_output.py b/tokenize_output/tokenize_output.py index 88db81f..dfe83cb 100644 --- a/tokenize_output/tokenize_output.py +++ b/tokenize_output/tokenize_output.py @@ -1,6 +1,6 @@ import re import json -import demjson +import demjson3 import ast import logging from collections.abc import Iterable @@ -120,7 +120,7 @@ def tokenizer_dict(text, text_cmd='', substring='', current_cmd={}): if dct is None: try: # JavaScript Object - dct = demjson.decode(text) + dct = demjson3.decode(text) except: pass