diff --git a/included_dependencies/_brotlidecpy/__init__.py b/included_dependencies/_brotlidecpy/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/included_dependencies/brotlidecpy.py b/included_dependencies/brotlidecpy.py deleted file mode 100644 index fa5d3732..00000000 --- a/included_dependencies/brotlidecpy.py +++ /dev/null @@ -1,2 +0,0 @@ -# noinspection PyUnresolvedReferences -from _brotlidecpy.decode import brotli_decompress_buffer as decompress diff --git a/included_dependencies/_brotlidecpy/LICENSE b/included_dependencies/brotlidecpy/LICENSE similarity index 100% rename from included_dependencies/_brotlidecpy/LICENSE rename to included_dependencies/brotlidecpy/LICENSE diff --git a/included_dependencies/brotlidecpy/__init__.py b/included_dependencies/brotlidecpy/__init__.py new file mode 100644 index 00000000..2585ffc1 --- /dev/null +++ b/included_dependencies/brotlidecpy/__init__.py @@ -0,0 +1,6 @@ +from __future__ import absolute_import + +__version__ = "1.0.0" + +# noinspection PyUnresolvedReferences +from .decode import brotli_decompress_buffer as decompress diff --git a/included_dependencies/_brotlidecpy/bit_reader.py b/included_dependencies/brotlidecpy/bit_reader.py similarity index 100% rename from included_dependencies/_brotlidecpy/bit_reader.py rename to included_dependencies/brotlidecpy/bit_reader.py diff --git a/included_dependencies/_brotlidecpy/brotli-dict b/included_dependencies/brotlidecpy/brotli-dict similarity index 100% rename from included_dependencies/_brotlidecpy/brotli-dict rename to included_dependencies/brotlidecpy/brotli-dict diff --git a/included_dependencies/_brotlidecpy/context.py b/included_dependencies/brotlidecpy/context.py similarity index 100% rename from included_dependencies/_brotlidecpy/context.py rename to included_dependencies/brotlidecpy/context.py diff --git a/included_dependencies/_brotlidecpy/decode.py b/included_dependencies/brotlidecpy/decode.py similarity index 100% rename from included_dependencies/_brotlidecpy/decode.py rename to included_dependencies/brotlidecpy/decode.py diff --git a/included_dependencies/_brotlidecpy/dictionary.py b/included_dependencies/brotlidecpy/dictionary.py similarity index 91% rename from included_dependencies/_brotlidecpy/dictionary.py rename to included_dependencies/brotlidecpy/dictionary.py index da3321f6..801a3e99 100644 --- a/included_dependencies/_brotlidecpy/dictionary.py +++ b/included_dependencies/brotlidecpy/dictionary.py @@ -24,4 +24,4 @@ class BrotliDictionary: minDictionaryWordLength = 4 maxDictionaryWordLength = 24 - dictionary = pkgutil.get_data('_brotlidecpy', 'brotli-dict') + dictionary = pkgutil.get_data('brotlidecpy', 'brotli-dict') diff --git a/included_dependencies/_brotlidecpy/huffman.py b/included_dependencies/brotlidecpy/huffman.py similarity index 100% rename from included_dependencies/_brotlidecpy/huffman.py rename to included_dependencies/brotlidecpy/huffman.py diff --git a/included_dependencies/_brotlidecpy/prefix.py b/included_dependencies/brotlidecpy/prefix.py similarity index 100% rename from included_dependencies/_brotlidecpy/prefix.py rename to included_dependencies/brotlidecpy/prefix.py diff --git a/included_dependencies/_brotlidecpy/transform.py b/included_dependencies/brotlidecpy/transform.py similarity index 100% rename from included_dependencies/_brotlidecpy/transform.py rename to included_dependencies/brotlidecpy/transform.py diff --git a/makeplugin.py b/makeplugin.py index c7f16be0..2abcbc0e 100644 --- a/makeplugin.py +++ b/makeplugin.py @@ -37,7 +37,7 @@ if __name__=="__main__": os.chdir('../included_dependencies') files=['bs4','chardet','html2text','soupsieve','backports', 'cloudscraper','requests','requests_toolbelt','urllib3', - 'certifi','idna','brotlidecpy.py','_brotlidecpy'] + 'certifi','idna','brotlidecpy'] ## Kept only for v2.85.1 support now. createZipFile("../"+filename,"a", files,