Fix types

Author: jonashaag

pandas/conftest.py

@@ -44,9 +44,11 @@
 )
 
 try:
-    import zstandard as zstd
+    import zstandard as zstd  # noqa: F401
+
+    have_zstd = True
 except ImportError:
-    zstd = None
+    have_zstd = False
 
 import pandas.util._test_decorators as td
 
@@ -271,15 +273,17 @@ def other_closed(request):
     return request.param
 
 
-@pytest.fixture(params=[None, "gzip", "bz2", "zip", "xz"] + (["zstd"] if zstd else []))
+@pytest.fixture(
+    params=[None, "gzip", "bz2", "zip", "xz"] + (["zstd"] if have_zstd else [])
+)
 def compression(request):
     """
     Fixture for trying common compression types in compression tests.
     """
     return request.param
 
 
-@pytest.fixture(params=["gzip", "bz2", "zip", "xz"] + (["zstd"] if zstd else []))
+@pytest.fixture(params=["gzip", "bz2", "zip", "xz"] + (["zstd"] if have_zstd else []))
 def compression_only(request):
     """
     Fixture for trying common compression types in compression tests excluding

pandas/tests/io/xml/test_xml.py

@@ -14,8 +14,10 @@
 
 try:
     from zstandard import ZstdError
+
+    have_zstd = True
 except ImportError:
-    ZstdError = None
+    have_zstd = False
 
 import pandas.util._test_decorators as td
 
@@ -1037,13 +1039,15 @@ def test_wrong_compression(parser, compression, compression_only):
     if actual_compression == attempted_compression:
         return
 
-    error_cls, error_str = {
+    errors = {
         "bz2": (OSError, "Invalid data stream"),
         "gzip": (OSError, "Not a gzipped file"),
         "xz": (LZMAError, "Input format not supported by decoder"),
         "zip": (BadZipFile, "File is not a zip file"),
-        "zstd": (ZstdError, "Unknown frame descriptor"),
-    }[attempted_compression]
+    }
+    if have_zstd:
+        errors["zstd"] = (ZstdError, "Unknown frame descriptor")
+    error_cls, error_str = errors[attempted_compression]
 
     with tm.ensure_clean() as path:
         geom_df.to_xml(path, parser=parser, compression=actual_compression)