Author: Manuel Jacob <[email protected]>
Branch:
Changeset: r76421:1e9ff6a329e8
Date: 2015-03-16 22:39 +0100
http://bitbucket.org/pypy/pypy/changeset/1e9ff6a329e8/
Log: Don't reraise CompilationError as ImportError in rpython.rlib.rzlib.
This was a bit annoying if rffi_platform.configure_external_library
failed for reasons other than missing zlib headers because it masked
the actual error. I also changed all places which expected rzlib to
raise ImportError. If I missed something or you disagree with this
change, feel free to back it out.
diff --git a/pypy/module/zipimport/test/test_zipimport_deflated.py
b/pypy/module/zipimport/test/test_zipimport_deflated.py
--- a/pypy/module/zipimport/test/test_zipimport_deflated.py
+++ b/pypy/module/zipimport/test/test_zipimport_deflated.py
@@ -14,7 +14,7 @@
def setup_class(cls):
try:
import rpython.rlib.rzlib
- except ImportError:
+ except CompilationError:
py.test.skip("zlib not available, cannot test compressed zipfiles")
cls.make_class()
cls.w_BAD_ZIP = cls.space.wrap(BAD_ZIP)
diff --git a/rpython/rlib/rzipfile.py b/rpython/rlib/rzipfile.py
--- a/rpython/rlib/rzipfile.py
+++ b/rpython/rlib/rzipfile.py
@@ -8,7 +8,7 @@
try:
from rpython.rlib import rzlib
-except (ImportError, CompilationError):
+except CompilationError:
rzlib = None
crc_32_tab = [
diff --git a/rpython/rlib/rzlib.py b/rpython/rlib/rzlib.py
--- a/rpython/rlib/rzlib.py
+++ b/rpython/rlib/rzlib.py
@@ -22,13 +22,10 @@
includes=['zlib.h'],
testonly_libraries = testonly_libraries
)
-try:
- eci = rffi_platform.configure_external_library(
- libname, eci,
- [dict(prefix='zlib-'),
- ])
-except CompilationError:
- raise ImportError("Could not find a zlib library")
+eci = rffi_platform.configure_external_library(
+ libname, eci,
+ [dict(prefix='zlib-'),
+ ])
constantnames = '''
diff --git a/rpython/rlib/test/test_rzipfile.py
b/rpython/rlib/test/test_rzipfile.py
--- a/rpython/rlib/test/test_rzipfile.py
+++ b/rpython/rlib/test/test_rzipfile.py
@@ -9,7 +9,7 @@
try:
from rpython.rlib import rzlib
-except ImportError, e:
+except CompilationError as e:
py.test.skip("zlib not installed: %s " % (e, ))
class BaseTestRZipFile(BaseRtypingTest):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
