[pypy-svn] r46882 - in pypy/dist/pypy: module/zlib rlib

[arigo at codespeak.net]

Author: arigo
Date: Tue Sep 25 23:07:24 2007
New Revision: 46882

Modified:
   pypy/dist/pypy/module/zlib/__init__.py
   pypy/dist/pypy/rlib/rzlib.py
Log:
Expose some constants on the zlib module.
The list is the same as in CPython.


Modified: pypy/dist/pypy/module/zlib/__init__.py
==============================================================================
--- pypy/dist/pypy/module/zlib/__init__.py	(original)
+++ pypy/dist/pypy/module/zlib/__init__.py	Tue Sep 25 23:07:24 2007
@@ -4,6 +4,7 @@
 """
 
 from pypy.interpreter.mixedmodule import MixedModule
+from pypy.rlib import rzlib
 
 
 class Module(MixedModule):
@@ -14,8 +15,19 @@
         'decompressobj': 'interp_zlib.Decompress',
         'compress': 'interp_zlib.compress',
         'decompress': 'interp_zlib.decompress',
+        '__version__': 'space.wrap("1.0")',
         }
 
     appleveldefs = {
         'error': 'app_zlib.error',
         }
+
+
+for _name in """
+    MAX_WBITS  DEFLATED  DEF_MEM_LEVEL
+    Z_BEST_SPEED  Z_BEST_COMPRESSION  Z_DEFAULT_COMPRESSION
+    Z_FILTERED  Z_HUFFMAN_ONLY  Z_DEFAULT_STRATEGY
+    Z_FINISH  Z_NO_FLUSH  Z_SYNC_FLUSH  Z_FULL_FLUSH
+    ZLIB_VERSION
+    """.split():
+    Module.interpleveldefs[_name] = 'space.wrap(%r)' % (getattr(rzlib, _name),)

Modified: pypy/dist/pypy/rlib/rzlib.py
==============================================================================
--- pypy/dist/pypy/rlib/rzlib.py	(original)
+++ pypy/dist/pypy/rlib/rzlib.py	Tue Sep 25 23:07:24 2007
@@ -7,8 +7,10 @@
 constantnames = '''
     Z_OK  Z_STREAM_ERROR  Z_BUF_ERROR  Z_MEM_ERROR  Z_STREAM_END
     Z_DEFLATED  Z_DEFAULT_STRATEGY  Z_DEFAULT_COMPRESSION
-    Z_NO_FLUSH  Z_FINISH  Z_SYNC_FLUSH
+    Z_NO_FLUSH  Z_FINISH  Z_SYNC_FLUSH  Z_FULL_FLUSH
     MAX_WBITS  MAX_MEM_LEVEL
+    Z_BEST_SPEED  Z_BEST_COMPRESSION  Z_DEFAULT_COMPRESSION
+    Z_FILTERED  Z_HUFFMAN_ONLY  Z_DEFAULT_STRATEGY
     '''.split()
 
 class SimpleCConfig:
@@ -43,6 +45,7 @@
 
 # The following parameter is copied from zutil.h, version 0.95,
 # according to CPython's zlibmodule.c
+DEFLATED = Z_DEFLATED
 if MAX_MEM_LEVEL >= 8:
     DEF_MEM_LEVEL = 8
 else: