move python files from python/* to python/brotli/*

Author: K0lb3

python/__init__.py

@@ -5,21 +5,26 @@
 
 """Functions to compress and decompress data using the Brotli library."""
 
-import _brotli
+from ._brotli import (
+    # The library version.
+    __version__,
+    # The compression mode.
+    MODE_GENERIC,
+    MODE_TEXT,
+    MODE_FONT,
+    # The Compressor object.
+    Compressor,
+    # The Decompressor object.
+    Decompressor,
+    # Decompress a compressed byte string.
+    decompress,
+    # Raised if compression or decompression fails.
+    error,
+)
+
+
+version = __version__
 
-# The library version.
-version = __version__ = _brotli.__version__
-
-# The compression mode.
-MODE_GENERIC = _brotli.MODE_GENERIC
-MODE_TEXT = _brotli.MODE_TEXT
-MODE_FONT = _brotli.MODE_FONT
-
-# The Compressor object.
-Compressor = _brotli.Compressor
-
-# The Decompressor object.
-Decompressor = _brotli.Decompressor
 
 # Compress a byte string.
 def compress(string, mode=MODE_GENERIC, quality=11, lgwin=22, lgblock=0):
@@ -46,12 +51,5 @@ def compress(string, mode=MODE_GENERIC, quality=11, lgwin=22, lgblock=0):
     Raises:
       brotli.error: If arguments are invalid, or compressor fails.
     """
-    compressor = Compressor(mode=mode, quality=quality, lgwin=lgwin,
-                            lgblock=lgblock)
+    compressor = Compressor(mode=mode, quality=quality, lgwin=lgwin, lgblock=lgblock)
     return compressor.process(string) + compressor.finish()
-
-# Decompress a compressed byte string.
-decompress = _brotli.decompress
-
-# Raised if compression or decompression fails.
-error = _brotli.error

python/brotli.py python/brotli/__init__.pypython/brotli.py renamed to python/brotli/__init__.py

@@ -18,7 +18,7 @@
   test_dir = os.path.join(project_dir, 'tests')
 if BRO_ARGS[0] is None:
   python_exe = sys.executable or 'python'
-  bro_path = os.path.join(project_dir, 'python', 'bro.py')
+  bro_path = os.path.join(project_dir, 'python', 'brotli', '__main__.py')
   BRO_ARGS = [python_exe, bro_path]
 
 # Get the platform/version-specific build folder.

python/brotli.pyi python/brotli/__init__.pyipython/brotli.pyi renamed to python/brotli/__init__.pyi

@@ -132,7 +132,7 @@ def __init__(self, *args, **kwargs):
 
 EXT_MODULES = [
     VersionedExtension(
-        name='_brotli',
+        name='brotli._brotli',
         sources=[
             'python/_brotli.c',
             'c/common/constants.c',
@@ -266,8 +266,8 @@ def get_tag(self):
     platforms=PLATFORMS,
     classifiers=CLASSIFIERS,
     package_dir=PACKAGE_DIR,
-    packages=[''],
-    package_data={'': ['__init__.py', 'brotli.py', 'brotli.pyi', 'py.typed']},
+    packages=["brotli"],
+    package_data={"brotli": ["*.py", "*.pyi", "py.typed"]},
     ext_modules=EXT_MODULES,
     test_suite=TEST_SUITE,
     cmdclass=CMD_CLASS)