diff --git a/.travis.yml b/.travis.yml index b2285386..cb1eb157 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,16 @@ language: python python: - - "2.7" - "3.5" - "3.6" - "3.7" + - "3.8" + - "3.9" + - "3.10-dev" matrix: allow_failures: - - python: "2.7" - python: "3.5" # TODO: Investigate why language detection act differently + - python: "3.10-dev" install: - pip install nose codecov diff --git a/README.md b/README.md index 6cd5aa3c..99fb7b2e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -
The Real First Universal Charset Detector
diff --git a/charset_normalizer/normalizer.py b/charset_normalizer/normalizer.py
index 72ec86d7..611929cb 100644
--- a/charset_normalizer/normalizer.py
+++ b/charset_normalizer/normalizer.py
@@ -4,7 +4,7 @@
import statistics
from encodings.aliases import aliases
from os.path import basename, splitext
-from platform import python_version_tuple
+from sys import version_info
from warnings import warn
from cached_property import cached_property
@@ -392,7 +392,7 @@ def from_bytes(sequences, steps=10, chunk_size=512, threshold=0.20, cp_isolation
excluded_list=', '.join(cp_exclusion))
# Bellow Python 3.6, Expect dict to not behave the same.
- py_v = [int(el) for el in python_version_tuple()]
+ py_v = [int(el) for el in (version_info.major, version_info.minor, version_info.micro,)]
py_need_sort = py_v[0] < 3 or (py_v[0] == 3 and py_v[1] < 6)
supported = collections.OrderedDict(aliases).items() if py_need_sort else aliases.items()
diff --git a/charset_normalizer/version.py b/charset_normalizer/version.py
index f293ce49..37398b00 100644
--- a/charset_normalizer/version.py
+++ b/charset_normalizer/version.py
@@ -2,5 +2,5 @@
Expose version
"""
-__version__ = "1.3.4"
+__version__ = "1.3.5"
VERSION = __version__.split('.')
diff --git a/setup.py b/setup.py
index aef65cfe..ea33c304 100644
--- a/setup.py
+++ b/setup.py
@@ -23,11 +23,10 @@ def get_version():
VERSION = get_version()
REQUIRED = [
- 'cached_property',
- 'dragonmapper',
- 'zhon',
- 'prettytable',
- 'loguru'
+ 'cached_property>=1.5,<2.0',
+ 'dragonmapper>=0.2,<0.3',
+ 'prettytable>=1.0,<2.0',
+ 'loguru>=0.5,<0.6'
]
EXTRAS = {
@@ -80,6 +79,8 @@ def get_version():
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
+ 'Programming Language :: Python :: 3.9',
+ 'Programming Language :: Python :: 3.10',
'Topic :: Text Processing :: Linguistic',
'Topic :: Utilities',
'Programming Language :: Python :: Implementation :: PyPy'