From 34162872b1119df31288dadc9fda2390119d4e27 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Sun, 12 Oct 2014 08:16:34 -0700
Subject: [PATCH] moduzlib: Integrate into the system.

---
 py/builtin.h                     | 1 +
 py/builtintables.c               | 3 +++
 py/mpconfig.h                    | 4 ++++
 py/py.mk                         | 1 +
 py/qstrdefs.h                    | 5 +++++
 tests/extmod/zlibd_decompress.py | 2 +-
 unix/mpconfigport.h              | 2 +-
 7 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/py/builtin.h b/py/builtin.h
index 526157fbcd..5a68609aee 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -89,5 +89,6 @@ extern struct _dummy_t mp_sys_stderr_obj;
 // extmod modules
 extern const mp_obj_module_t mp_module_uctypes;
 extern const mp_obj_module_t mp_module_zlibd;
+extern const mp_obj_module_t mp_module_uzlib;
 extern const mp_obj_module_t mp_module_ujson;
 extern const mp_obj_module_t mp_module_ure;
diff --git a/py/builtintables.c b/py/builtintables.c
index 1fd60d8177..5a7a303f9b 100644
--- a/py/builtintables.c
+++ b/py/builtintables.c
@@ -206,6 +206,9 @@ STATIC const mp_map_elem_t mp_builtin_module_table[] = {
 #if MICROPY_PY_ZLIBD
     { MP_OBJ_NEW_QSTR(MP_QSTR_zlibd), (mp_obj_t)&mp_module_zlibd },
 #endif
+#if MICROPY_PY_UZLIB
+    { MP_OBJ_NEW_QSTR(MP_QSTR_uzlib), (mp_obj_t)&mp_module_uzlib },
+#endif
 #if MICROPY_PY_UJSON
     { MP_OBJ_NEW_QSTR(MP_QSTR_ujson), (mp_obj_t)&mp_module_ujson },
 #endif
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 92b61d0e12..fa5f682cf1 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -390,6 +390,10 @@ typedef double mp_float_t;
 #define MICROPY_PY_ZLIBD (0)
 #endif
 
+#ifndef MICROPY_PY_UZLIB
+#define MICROPY_PY_UZLIB (0)
+#endif
+
 #ifndef MICROPY_PY_UJSON
 #define MICROPY_PY_UJSON (0)
 #endif
diff --git a/py/py.mk b/py/py.mk
index e74d557e41..9e5d918b43 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -114,6 +114,7 @@ PY_O_BASENAME = \
 	../extmod/modzlibd.o \
 	../extmod/modujson.o \
 	../extmod/modure.o \
+	../extmod/moduzlib.o \
 
 # prepend the build destination prefix to the py object files
 PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME))
diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index eb99e1b3d7..a67cd92b83 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -468,6 +468,11 @@ Q(zlibd)
 Q(decompress)
 #endif
 
+#if MICROPY_PY_UZLIB
+Q(uzlib)
+Q(decompress)
+#endif
+
 #if MICROPY_PY_UJSON
 Q(ujson)
 Q(dumps)
diff --git a/tests/extmod/zlibd_decompress.py b/tests/extmod/zlibd_decompress.py
index db96108322..64df6da2ef 100644
--- a/tests/extmod/zlibd_decompress.py
+++ b/tests/extmod/zlibd_decompress.py
@@ -1,7 +1,7 @@
 try:
     import zlib
 except ImportError:
-    import zlibd as zlib
+    import uzlib as zlib
 
 PATTERNS = [
     # Packed results produced by CPy's zlib.compress()
diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h
index bbd100d5f8..f188d5feff 100644
--- a/unix/mpconfigport.h
+++ b/unix/mpconfigport.h
@@ -55,7 +55,7 @@
 #define MICROPY_PY_GC_COLLECT_RETVAL (1)
 
 #define MICROPY_PY_UCTYPES          (1)
-#define MICROPY_PY_ZLIBD            (1)
+#define MICROPY_PY_UZLIB            (1)
 #define MICROPY_PY_UJSON            (1)
 #define MICROPY_PY_URE              (1)