Internal change

PiperOrigin-RevId: 502401179

c/include/brotli/encode.h

@@ -453,7 +453,7 @@ BROTLI_ENC_API BROTLI_BOOL BrotliEncoderHasMoreOutput(
  *
  * This method is used to make language bindings easier and more efficient:
  *  -# push data to ::BrotliEncoderCompressStream,
- *     until ::BrotliEncoderHasMoreOutput returns BROTL_TRUE
+ *     until ::BrotliEncoderHasMoreOutput returns BROTLI_TRUE
  *  -# use ::BrotliEncoderTakeOutput to peek bytes and copy to language-specific
  *     entity
  *

docs/encode.h.3

@@ -587,7 +587,7 @@ invalid values might be accepted in case they would not break encoding process\&
 .PP
 Acquires pointer to internal output buffer\&. This method is used to make language bindings easier and more efficient:
 .IP "1." 4
-push data to \fBBrotliEncoderCompressStream\fP, until \fBBrotliEncoderHasMoreOutput\fP returns BROTL_TRUE
+push data to \fBBrotliEncoderCompressStream\fP, until \fBBrotliEncoderHasMoreOutput\fP returns BROTLI_TRUE
 .IP "2." 4
 use \fBBrotliEncoderTakeOutput\fP to peek bytes and copy to language-specific entity
 .PP

java/org/brotli/integration/BrotliJniTestBase.java

@@ -10,4 +10,4 @@ public class BrotliJniTestBase {
       System.load(new java.io.File(jniLibrary).getAbsolutePath());
     }
   }
-}
+}

java/org/brotli/wrapper/enc/UseCompoundDictionaryTest.java

@@ -111,4 +111,4 @@ public class UseCompoundDictionaryTest extends BrotliJniTestBase {
       decoder.close();
     }
   }
-}
+}

python/README.md

@@ -22,7 +22,7 @@ following command from this directory:
 You may run the following commands from this directory:
 
     $ make          # Build the module in-place
-   
+
     $ make test     # Test the module
 
     $ make clean    # Remove all temporary files and build output

python/bro.py

@@ -51,7 +51,7 @@ def main(args=None):
     parser = argparse.ArgumentParser(
         prog=os.path.basename(__file__), description=__doc__)
     parser.add_argument(
-        '--version', action='version', version=brotli.__version__)
+        '--version', action='version', version=brotli.version)
     parser.add_argument(
         '-i',
         '--input',

python/brotli.py

@@ -8,7 +8,7 @@
 import _brotli
 
 # The library version.
-__version__ = _brotli.__version__
+version = __version__ = _brotli.__version__
 
 # The compression mode.
 MODE_GENERIC = _brotli.MODE_GENERIC

python/tests/_test_utils.py

@@ -44,9 +44,17 @@ TESTDATA_FILES = [
     'alice29.txt',  # Large text
     'random_org_10k.bin',  # Small data
     'mapsdatazrh',  # Large data
+    'ukkonooa',  # Poem
 ]
 
-TESTDATA_PATHS = [os.path.join(TESTDATA_DIR, f) for f in TESTDATA_FILES]
+# Some files might be missing in a lightweight sources pack.
+TESTDATA_PATH_CANDIDATES = [
+    os.path.join(TESTDATA_DIR, f) for f in TESTDATA_FILES
+]
+
+TESTDATA_PATHS = [
+    path for path in TESTDATA_PATH_CANDIDATES if os.path.isfile(path)
+]
 
 TESTDATA_PATHS_FOR_DECOMPRESSION = glob.glob(
     os.path.join(TESTDATA_DIR, '*.compressed'))

python/tests/bro_test.py

@@ -7,7 +7,6 @@ import subprocess
 import unittest
 
 from . import _test_utils
-import brotli
 
 BRO_ARGS = _test_utils.BRO_ARGS
 TEST_ENV = _test_utils.TEST_ENV