修复打包脚本兼容性

SeaHOH · Sep 13, 2022 · a251745 · a251745
1 parent dbd6290
commit a251745
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/pack_portable.py b/pack_portable.py
@@ -6,7 +6,6 @@
 import re
 import io
 import sys
-import gzip
 import stat
 import json
 import zlib
@@ -22,6 +21,11 @@
 except ImportError:
     from pkg_resources import packaging, parse_version
 
+try:
+    from gzip import _GzipReader, BadGzipFile
+except ImportError:
+    BadGzipFile = OSError
+
 
 sitecustomize = b'''\
 import os
@@ -314,7 +318,7 @@ def write_cb(self, data):
             if self.f.tell() and not self.accept_ranges:
                 self.new_file()
             if self.fgzip is None and bool(CEG(self.headers)):
-                self.fgzip = gzip._GzipReader(self.f)
+                self.fgzip = _GzipReader(self.f)
                 self.fungzip = io.BytesIO()
         if self.fgzip:
             offset = self.f.tell()
@@ -328,7 +332,7 @@ def write_cb(self, data):
                 offset = self.f.tell()
                 try:
                     data = self.fgzip.read(sys.maxsize)
-                except (EOFError, gzip.BadGzipFile):
+                except (EOFError, BadGzipFile):
                     if offset == 0:
                         self.fgzip._rewind()
                     elif self.fgzip._decompressor.eof: