Enable bzip2 extension

Unit test test_bz2 now passes successfully.

Signed-off-by: Stefan Teodorescu <stefanl.teodorescu@gmail.com>
Reviewed-by: Costin Lupu <costin.lupu@cs.pub.ro>

diff --git a/Config.uk b/Config.uk
index 095a063c5d06d0722e0a533febe271056077259c..1bdaef2594c3f43a94b2addc490032d4feb62e8a 100644 (file)
--- a/Config.uk
+++ b/Config.uk
@@ -41,6 +41,11 @@ menuconfig LIBPYTHON3_EXTENSIONS
        bool "Extensions"
        default n
 
+if LIBBZIP2
+config LIBPYTHON3_EXTENSION_BZIP2
+       bool "bzip2"
+       default y
+endif
 if LIBPYTHON3_EXTENSIONS
 config LIBPYTHON3_EXTENSION_EXPAT
        bool "Expat XML parser"

diff --git a/Makefile.uk b/Makefile.uk
index ed28f0418b01a0e7eb22e07cea935216170d1f34..39c91e1ddb310322c7d20f82afccd68f4a9a616d 100644 (file)
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -313,7 +313,7 @@ else
 LIBPYTHON3_EXTENSIONS_SRCS-y += $(LIBPYTHON3_SRC)/Modules/_blake2/impl/blake2b-ref.c
 LIBPYTHON3_EXTENSIONS_SRCS-y += $(LIBPYTHON3_SRC)/Modules/_blake2/impl/blake2s-ref.c
 endif
-#LIBPYTHON3_EXTENSIONS_SRCS-y += $(LIBPYTHON3_SRC)/Modules/_bz2module.c
+LIBPYTHON3_EXTENSIONS_SRCS-$(CONFIG_LIBPYTHON3_EXTENSION_BZIP2) += $(LIBPYTHON3_SRC)/Modules/_bz2module.c
 LIBPYTHON3_EXTENSIONS_SRCS-y += $(LIBPYTHON3_SRC)/Modules/cjkcodecs/_codecs_cn.c
 LIBPYTHON3_EXTENSIONS_SRCS-y += $(LIBPYTHON3_SRC)/Modules/cjkcodecs/_codecs_hk.c
 LIBPYTHON3_EXTENSIONS_SRCS-y += $(LIBPYTHON3_SRC)/Modules/cjkcodecs/_codecs_iso2022.c

diff --git a/modules_config.c b/modules_config.c
index 9e408dc4862aafd8914eae71f51deed7e48a336c..7772d003cc3e42c8729fa258b1ce9c1ba1e9e507 100644 (file)
--- a/modules_config.c
+++ b/modules_config.c
@@ -215,7 +215,9 @@ struct _inittab _PyImport_Inittab[] = {
     {"binascii", PyInit_binascii},
     {"_bisect", PyInit__bisect},
     {"_blake2", PyInit__blake2},
-//    {"_bz2", PyInit__bz2},
+#if CONFIG_LIBPYTHON3_EXTENSION_BZIP2
+    {"_bz2", PyInit__bz2},
+#endif
     {"cmath", PyInit_cmath},
     {"_codecs", PyInit__codecs},
     {"_collections", PyInit__collections},