Преглед изворни кода

Hue [py3] Remove chardet dependency in requests

Prakash Ranade пре 3 година
родитељ
комит
761f2eb064

+ 3 - 9
desktop/core/ext-py3/requests-2.27.1/requests/__init__.py

@@ -44,15 +44,9 @@ import urllib3
 import warnings
 from .exceptions import RequestsDependencyWarning
 
-try:
-    from charset_normalizer import __version__ as charset_normalizer_version
-except ImportError:
-    charset_normalizer_version = None
-
-try:
-    from chardet import __version__ as chardet_version
-except ImportError:
-    chardet_version = None
+# remove chardet dependancy
+charset_normalizer_version = None
+chardet_version = None
 
 def check_compatibility(urllib3_version, chardet_version, charset_normalizer_version):
     urllib3_version = urllib3_version.split('.')

+ 1 - 4
desktop/core/ext-py3/requests-2.27.1/requests/compat.py

@@ -8,10 +8,7 @@ This module handles import compatibility issues between Python 2 and
 Python 3.
 """
 
-try:
-    import chardet
-except ImportError:
-    import charset_normalizer as chardet
+import charset_normalizer as chardet
 
 import sys
 

+ 1 - 4
desktop/core/ext-py3/requests-2.27.1/requests/help.py

@@ -16,10 +16,7 @@ try:
 except ImportError:
     charset_normalizer = None
 
-try:
-    import chardet
-except ImportError:
-    chardet = None
+chardet = None
 
 try:
     from urllib3.contrib import pyopenssl

+ 3 - 7
desktop/core/ext-py3/requests-2.27.1/requests/packages.py

@@ -1,12 +1,8 @@
 import sys
 
-try:
-    import chardet
-except ImportError:
-    import charset_normalizer as chardet
-    import warnings
-
-    warnings.filterwarnings('ignore', 'Trying to detect', module='charset_normalizer')
+import charset_normalizer as chardet
+import warnings
+warnings.filterwarnings('ignore', 'Trying to detect', module='charset_normalizer')
 
 # This code exists for backwards compatibility reasons.
 # I don't like it either. Just look the other way. :)

+ 1 - 3
desktop/core/ext-py3/requests-2.27.1/setup.py

@@ -42,7 +42,6 @@ packages = ['requests']
 
 requires = [
     'charset_normalizer~=2.0.0; python_version >= "3"',
-    'chardet>=3.0.2,<5; python_version < "3"',
     'idna>=2.5,<3; python_version < "3"',
     'idna>=2.5,<4; python_version >= "3"',
     'urllib3>=1.21.1,<1.27',
@@ -108,8 +107,7 @@ setup(
     extras_require={
         'security': [],
         'socks': ['PySocks>=1.5.6, !=1.5.7'],
-        'socks:sys_platform == "win32" and python_version == "2.7"': ['win_inet_pton'],
-        'use_chardet_on_py3': ['chardet>=3.0.2,<5']
+        'socks:sys_platform == "win32" and python_version == "2.7"': ['win_inet_pton']
     },
     project_urls={
         'Documentation': 'https://requests.readthedocs.io',

+ 0 - 3
desktop/core/ext-py3/requests-2.27.1/tests/test_packages.py

@@ -8,6 +8,3 @@ def test_can_access_urllib3_attribute():
 def test_can_access_idna_attribute():
     requests.packages.idna
 
-
-def test_can_access_chardet_attribute():
-    requests.packages.chardet