more diff-friendly disabling xz

youknowone · youknowone · commit f5400faa6c15 · 2025-05-06T14:30:40.000+09:00
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
@@ -392,10 +392,13 @@ def __init__(self, name, mode, comptype, fileobj, bufsize,
 
             elif comptype == "xz":
                 try:
-                    # TODO: RUSTPYTHON remove underscore
-                    import lzma_
+                    import lzma
                 except ImportError:
                     raise CompressionError("lzma module is not available") from None
+
+                # XXX: RUSTPYTHON; xz is not supported yet
+                raise CompressionError("lzma module is not available") from None
+
                 if mode == "r":
                     self.dbuf = b""
                     self.cmp = lzma.LZMADecompressor()
@@ -1924,11 +1927,13 @@ def xzopen(cls, name, mode="r", fileobj=None, preset=None, **kwargs):
             raise ValueError("mode must be 'r', 'w' or 'x'")
 
         try:
-            # TODO: RUSTPYTHON remove underscore
-            from lzma_ import LZMAFile, LZMAError
+            from lzma import LZMAFile, LZMAError
         except ImportError:
             raise CompressionError("lzma module is not available") from None
 
+        # XXX: RUSTPYTHON; xz is not supported yet
+        raise CompressionError("lzma module is not available") from None
+
         fileobj = LZMAFile(fileobj or name, mode, preset=preset)
 
         try:
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
@@ -494,11 +494,11 @@ def requires_bz2(reason='requires bz2'):
     return unittest.skipUnless(bz2, reason)
 
 def requires_lzma(reason='requires lzma'):
-    # try:
-        # import lzma
-    # except ImportError:
-        # lzma = None
-    # TODO: RUSTPYTHON
+    try:
+        import lzma
+    except ImportError:
+        lzma = None
+    # XXX: RUSTPYTHON; xz is not supported yet
     lzma = None
     return unittest.skipUnless(lzma, reason)
 
