fix json loads

restran · Mar 16, 2020 · 6e5b2d5 · 6e5b2d5
1 parent 58dc698
commit 6e5b2d5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,9 @@ python:
     - pypy
     - 3.4
     - 3.5
-
+    - 3.6
+    - 3.7
+    - 3.8
 _base_envs:
 - &pypy_base
   python: pypy
@@ -50,8 +52,6 @@ _base_envs:
 matrix:
   fast_finish: true
   include:
-  - python: 3.6
-    env: TOXENV=pre-commit
   - <<: *pypy_base
     python: pypy3
     env:

diff --git a/mountains/json/__init__.py b/mountains/json/__init__.py
@@ -46,10 +46,7 @@ def json_default(obj):
 
 
 def loads(content, encoding='utf-8', **kwargs):
-    if PY3:
-        return json.loads(s=force_bytes(content), encoding=encoding, **kwargs)
-    else:
-        return json.loads(s=content, encoding=encoding, **kwargs)
+    return json.loads(s=content, encoding=encoding, **kwargs)
 
 
 def dumps(dict_data, ensure_ascii=True, indent=None,

diff --git a/mountains/utils/string_utils.py b/mountains/utils/string_utils.py
@@ -2,7 +2,7 @@
 # Created by restran on 2017/11/7
 from __future__ import unicode_literals, absolute_import
 from ..encoding import force_bytes
-from .. import PY2
+from .. import PY2, string_types
 
 
 def fixed_length_split(s, width):

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -5,7 +5,7 @@
 import logging
 import unittest
 
-from mountains.utils import *
+from mountains.utils import any_in, any_none
 
 logger = logging.getLogger(__name__)