diff options
| -rw-r--r--[-rwxr-xr-x] | bootstrap | 0 | ||||
| -rw-r--r-- | c/include/brotli/encode.h | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | configure-cmake | 0 | ||||
| -rw-r--r-- | docs/encode.h.3 | 2 | ||||
| -rw-r--r-- | java/org/brotli/integration/BrotliJniTestBase.java | 2 | ||||
| -rw-r--r-- | java/org/brotli/wrapper/enc/UseCompoundDictionaryTest.java | 2 | ||||
| -rw-r--r-- | python/README.md | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | python/bro.py | 2 | ||||
| -rw-r--r-- | python/brotli.py | 2 | ||||
| -rw-r--r-- | python/tests/_test_utils.py | 10 | ||||
| -rw-r--r-- | python/tests/bro_test.py | 1 |
11 files changed, 16 insertions, 9 deletions
diff --git a/bootstrap b/bootstrap index 1da6d60..1da6d60 100755..100644 --- a/bootstrap +++ b/bootstrap diff --git a/c/include/brotli/encode.h b/c/include/brotli/encode.h index b2c6f61..7247d3d 100644 --- a/c/include/brotli/encode.h +++ b/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 * diff --git a/configure-cmake b/configure-cmake index 6dfb92c..6dfb92c 100755..100644 --- a/configure-cmake +++ b/configure-cmake diff --git a/docs/encode.h.3 b/docs/encode.h.3 index e31b6b4..f3430fa 100644 --- a/docs/encode.h.3 +++ b/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 diff --git a/java/org/brotli/integration/BrotliJniTestBase.java b/java/org/brotli/integration/BrotliJniTestBase.java index 4d699d5..c272f42 100644 --- a/java/org/brotli/integration/BrotliJniTestBase.java +++ b/java/org/brotli/integration/BrotliJniTestBase.java @@ -10,4 +10,4 @@ public class BrotliJniTestBase { System.load(new java.io.File(jniLibrary).getAbsolutePath()); } } -}
\ No newline at end of file +} diff --git a/java/org/brotli/wrapper/enc/UseCompoundDictionaryTest.java b/java/org/brotli/wrapper/enc/UseCompoundDictionaryTest.java index cbfd0d9..196d4d9 100644 --- a/java/org/brotli/wrapper/enc/UseCompoundDictionaryTest.java +++ b/java/org/brotli/wrapper/enc/UseCompoundDictionaryTest.java @@ -111,4 +111,4 @@ public class UseCompoundDictionaryTest extends BrotliJniTestBase { decoder.close(); } } -}
\ No newline at end of file +} diff --git a/python/README.md b/python/README.md index 6a9068a..4b6f63f 100644 --- a/python/README.md +++ b/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 diff --git a/python/bro.py b/python/bro.py index 7a094b4..6d71549 100644..100755 --- a/python/bro.py +++ b/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', diff --git a/python/brotli.py b/python/brotli.py index 9f8bc24..9be4ed4 100644 --- a/python/brotli.py +++ b/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 diff --git a/python/tests/_test_utils.py b/python/tests/_test_utils.py index 03868e9..059cb43 100644 --- a/python/tests/_test_utils.py +++ b/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')) diff --git a/python/tests/bro_test.py b/python/tests/bro_test.py index b55129d..454bd62 100644 --- a/python/tests/bro_test.py +++ b/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 |