@@ -1655,13 +1655,12 @@ def gzopen(cls, name, mode="r", fileobj=None, compresslevel=9, **kwargs):
1655
1655
raise ValueError ("mode must be 'r', 'w' or 'x'" )
1656
1656
1657
1657
try :
1658
- import gzip
1659
- gzip .GzipFile
1660
- except (ImportError , AttributeError ):
1658
+ from gzip import GzipFile
1659
+ except ImportError :
1661
1660
raise CompressionError ("gzip module is not available" )
1662
1661
1663
1662
try :
1664
- fileobj = gzip . GzipFile (name , mode + "b" , compresslevel , fileobj )
1663
+ fileobj = GzipFile (name , mode + "b" , compresslevel , fileobj )
1665
1664
except OSError :
1666
1665
if fileobj is not None and mode == 'r' :
1667
1666
raise ReadError ("not a gzip file" )
@@ -1689,12 +1688,11 @@ def bz2open(cls, name, mode="r", fileobj=None, compresslevel=9, **kwargs):
1689
1688
raise ValueError ("mode must be 'r', 'w' or 'x'" )
1690
1689
1691
1690
try :
1692
- import bz2
1691
+ from bz2 import BZ2File
1693
1692
except ImportError :
1694
1693
raise CompressionError ("bz2 module is not available" )
1695
1694
1696
- fileobj = bz2 .BZ2File (fileobj or name , mode ,
1697
- compresslevel = compresslevel )
1695
+ fileobj = BZ2File (fileobj or name , mode , compresslevel = compresslevel )
1698
1696
1699
1697
try :
1700
1698
t = cls .taropen (name , mode , fileobj , ** kwargs )
@@ -1718,15 +1716,15 @@ def xzopen(cls, name, mode="r", fileobj=None, preset=None, **kwargs):
1718
1716
raise ValueError ("mode must be 'r', 'w' or 'x'" )
1719
1717
1720
1718
try :
1721
- import lzma
1719
+ from lzma import LZMAFile , LZMAError
1722
1720
except ImportError :
1723
1721
raise CompressionError ("lzma module is not available" )
1724
1722
1725
- fileobj = lzma . LZMAFile (fileobj or name , mode , preset = preset )
1723
+ fileobj = LZMAFile (fileobj or name , mode , preset = preset )
1726
1724
1727
1725
try :
1728
1726
t = cls .taropen (name , mode , fileobj , ** kwargs )
1729
- except (lzma . LZMAError , EOFError ):
1727
+ except (LZMAError , EOFError ):
1730
1728
fileobj .close ()
1731
1729
if mode == 'r' :
1732
1730
raise ReadError ("not an lzma file" )
0 commit comments