Merge branch 'master' into master

python/README.md

@@ -17,6 +17,16 @@ following command from this directory:
 
     $ make install
 
+If you already have native Brotli installed on your system and want to use this one instead of the vendored sources, you
+should set the `USE_SYSTEM_BROTLI=1` environment variable when building the wheel, like this:
+
+    $ USE_SYSTEM_BROTLI=1 pip install brotli --no-binary brotli
+
+Brotli is found via the `pkg-config` utility. Moreover, you must build all 3 `brotlicommon`, `brotlienc`, and `brotlidec`
+components. If you're installing brotli from the package manager, you need the development package, like this on Fedora:
+
+    $ dnf install brotli brotli-devel
+
 ### Development
 
 You may run the following commands from this directory:

python/_brotli.c

@@ -1,8 +1,13 @@
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #define PY_SSIZE_T_CLEAN 1
 #include <Python.h>
 #include <bytesobject.h>
 #include <structmember.h>
 
+#include <brotli/types.h>
 #include <brotli/decode.h>
 #include <brotli/encode.h>
 

python/bro.py

@@ -165,7 +165,7 @@ def main(args=None):
         # redirect the write according to symlink.
         if os.path.exists(options.outfile) and not options.force:
             parser.error(('Target --outfile=%s already exists, '
-                          'but --force was not requested.') % (outfile,))
+                          'but --force was not requested.') % (options.outfile,))
         outfile = open(options.outfile, 'wb')
         did_open_outfile = True
     else: