src/sage/__init__.py: Move 'import zlib' to src/sage/cpython/__init__.py

sagemath · Sep 8, 2021 · f77a98e · f77a98e
1 parent 949d787
commit f77a98e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/sage/__init__.py b/src/sage/__init__.py
@@ -3,10 +3,6 @@
 # See https://trac.sagemath.org/ticket/29705
 
 import sys
-# Make sure that the correct zlib library is loaded. This is needed
-# to prevent the system zlib to be loaded instead of the Sage one.
-# See https://trac.sagemath.org/ticket/23122
-import zlib
 
 # IPython calls this when starting up
 def load_ipython_extension(*args):

diff --git a/src/sage/cpython/__init__.py b/src/sage/cpython/__init__.py
@@ -0,0 +1,9 @@
+# sage.cpython is an ordinary package, not a namespace package.
+
+# This package is imported very early, which is why workarounds/monkey-patching
+# are done in this file.
+
+# Make sure that the correct zlib library is loaded. This is needed
+# to prevent the system zlib to be loaded instead of the Sage one.
+# See https://trac.sagemath.org/ticket/23122
+import zlib as _zlib