Removed obsolete comments about confused string refcount tricks (Jeremy

removed the tricks).

Changed the ENTER/LEAVE_ZLIB macros so as not to create a new block (a
new block is neither necessary nor helpful).

diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index b42309212f1010afa8bd197546ae6bd79ecc1d9c..f103879851e2bfec3dfee23414de3d42c0eff786 100644 (file)
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -23,11 +23,6 @@
    time-consuming functions where we need to worry about holding up
    other Python threads.
 
-   We don't need to worry about the string inputs being modified out
-   from underneath us, because string objects are immutable.  However,
-   we do need to make sure we take on ownership, so that the strings
-   are not deleted out from under us during a thread swap.
-
    N.B.
 
    Since ENTER_ZLIB and LEAVE_ZLIB only need to be called on functions
@@ -36,17 +31,17 @@
    there was an de/compress object-specific lock.  However, for the
    moment the ENTER_ZLIB and LEAVE_ZLIB calls are global for ALL
    de/compress objects.
-
  */
 
 static PyThread_type_lock zlib_lock = NULL; /* initialized on module load */
 
 #define ENTER_ZLIB \
-       { Py_BEGIN_ALLOW_THREADS PyThread_acquire_lock(zlib_lock, 1); \
-         Py_END_ALLOW_THREADS
+       Py_BEGIN_ALLOW_THREADS \
+       PyThread_acquire_lock(zlib_lock, 1); \
+       Py_END_ALLOW_THREADS
 
 #define LEAVE_ZLIB \
-       PyThread_release_lock(zlib_lock); }
+       PyThread_release_lock(zlib_lock);
 
 #else