@@ -3023,53 +3023,53 @@ def test_no_data(self):
3023
3023
b = s .pack (2 , 0 )
3024
3024
c = s .pack (3 , 0 )
3025
3025
3026
- self .assertEqual (b'' , zipfile ._strip_extra (a , (self .ZIP64_EXTRA ,)))
3027
- self .assertEqual (b , zipfile ._strip_extra (b , (self .ZIP64_EXTRA ,)))
3026
+ self .assertEqual (b'' , zipfile ._Extra . strip (a , (self .ZIP64_EXTRA ,)))
3027
+ self .assertEqual (b , zipfile ._Extra . strip (b , (self .ZIP64_EXTRA ,)))
3028
3028
self .assertEqual (
3029
- b + b"z" , zipfile ._strip_extra (b + b"z" , (self .ZIP64_EXTRA ,)))
3029
+ b + b"z" , zipfile ._Extra . strip (b + b"z" , (self .ZIP64_EXTRA ,)))
3030
3030
3031
- self .assertEqual (b + c , zipfile ._strip_extra (a + b + c , (self .ZIP64_EXTRA ,)))
3032
- self .assertEqual (b + c , zipfile ._strip_extra (b + a + c , (self .ZIP64_EXTRA ,)))
3033
- self .assertEqual (b + c , zipfile ._strip_extra (b + c + a , (self .ZIP64_EXTRA ,)))
3031
+ self .assertEqual (b + c , zipfile ._Extra . strip (a + b + c , (self .ZIP64_EXTRA ,)))
3032
+ self .assertEqual (b + c , zipfile ._Extra . strip (b + a + c , (self .ZIP64_EXTRA ,)))
3033
+ self .assertEqual (b + c , zipfile ._Extra . strip (b + c + a , (self .ZIP64_EXTRA ,)))
3034
3034
3035
3035
def test_with_data (self ):
3036
3036
s = struct .Struct ("<HH" )
3037
3037
a = s .pack (self .ZIP64_EXTRA , 1 ) + b"a"
3038
3038
b = s .pack (2 , 2 ) + b"bb"
3039
3039
c = s .pack (3 , 3 ) + b"ccc"
3040
3040
3041
- self .assertEqual (b"" , zipfile ._strip_extra (a , (self .ZIP64_EXTRA ,)))
3042
- self .assertEqual (b , zipfile ._strip_extra (b , (self .ZIP64_EXTRA ,)))
3041
+ self .assertEqual (b"" , zipfile ._Extra . strip (a , (self .ZIP64_EXTRA ,)))
3042
+ self .assertEqual (b , zipfile ._Extra . strip (b , (self .ZIP64_EXTRA ,)))
3043
3043
self .assertEqual (
3044
- b + b"z" , zipfile ._strip_extra (b + b"z" , (self .ZIP64_EXTRA ,)))
3044
+ b + b"z" , zipfile ._Extra . strip (b + b"z" , (self .ZIP64_EXTRA ,)))
3045
3045
3046
- self .assertEqual (b + c , zipfile ._strip_extra (a + b + c , (self .ZIP64_EXTRA ,)))
3047
- self .assertEqual (b + c , zipfile ._strip_extra (b + a + c , (self .ZIP64_EXTRA ,)))
3048
- self .assertEqual (b + c , zipfile ._strip_extra (b + c + a , (self .ZIP64_EXTRA ,)))
3046
+ self .assertEqual (b + c , zipfile ._Extra . strip (a + b + c , (self .ZIP64_EXTRA ,)))
3047
+ self .assertEqual (b + c , zipfile ._Extra . strip (b + a + c , (self .ZIP64_EXTRA ,)))
3048
+ self .assertEqual (b + c , zipfile ._Extra . strip (b + c + a , (self .ZIP64_EXTRA ,)))
3049
3049
3050
3050
def test_multiples (self ):
3051
3051
s = struct .Struct ("<HH" )
3052
3052
a = s .pack (self .ZIP64_EXTRA , 1 ) + b"a"
3053
3053
b = s .pack (2 , 2 ) + b"bb"
3054
3054
3055
- self .assertEqual (b"" , zipfile ._strip_extra (a + a , (self .ZIP64_EXTRA ,)))
3056
- self .assertEqual (b"" , zipfile ._strip_extra (a + a + a , (self .ZIP64_EXTRA ,)))
3055
+ self .assertEqual (b"" , zipfile ._Extra . strip (a + a , (self .ZIP64_EXTRA ,)))
3056
+ self .assertEqual (b"" , zipfile ._Extra . strip (a + a + a , (self .ZIP64_EXTRA ,)))
3057
3057
self .assertEqual (
3058
- b"z" , zipfile ._strip_extra (a + a + b"z" , (self .ZIP64_EXTRA ,)))
3058
+ b"z" , zipfile ._Extra . strip (a + a + b"z" , (self .ZIP64_EXTRA ,)))
3059
3059
self .assertEqual (
3060
- b + b"z" , zipfile ._strip_extra (a + a + b + b"z" , (self .ZIP64_EXTRA ,)))
3060
+ b + b"z" , zipfile ._Extra . strip (a + a + b + b"z" , (self .ZIP64_EXTRA ,)))
3061
3061
3062
- self .assertEqual (b , zipfile ._strip_extra (a + a + b , (self .ZIP64_EXTRA ,)))
3063
- self .assertEqual (b , zipfile ._strip_extra (a + b + a , (self .ZIP64_EXTRA ,)))
3064
- self .assertEqual (b , zipfile ._strip_extra (b + a + a , (self .ZIP64_EXTRA ,)))
3062
+ self .assertEqual (b , zipfile ._Extra . strip (a + a + b , (self .ZIP64_EXTRA ,)))
3063
+ self .assertEqual (b , zipfile ._Extra . strip (a + b + a , (self .ZIP64_EXTRA ,)))
3064
+ self .assertEqual (b , zipfile ._Extra . strip (b + a + a , (self .ZIP64_EXTRA ,)))
3065
3065
3066
3066
def test_too_short (self ):
3067
- self .assertEqual (b"" , zipfile ._strip_extra (b"" , (self .ZIP64_EXTRA ,)))
3068
- self .assertEqual (b"z" , zipfile ._strip_extra (b"z" , (self .ZIP64_EXTRA ,)))
3067
+ self .assertEqual (b"" , zipfile ._Extra . strip (b"" , (self .ZIP64_EXTRA ,)))
3068
+ self .assertEqual (b"z" , zipfile ._Extra . strip (b"z" , (self .ZIP64_EXTRA ,)))
3069
3069
self .assertEqual (
3070
- b"zz" , zipfile ._strip_extra (b"zz" , (self .ZIP64_EXTRA ,)))
3070
+ b"zz" , zipfile ._Extra . strip (b"zz" , (self .ZIP64_EXTRA ,)))
3071
3071
self .assertEqual (
3072
- b"zzz" , zipfile ._strip_extra (b"zzz" , (self .ZIP64_EXTRA ,)))
3072
+ b"zzz" , zipfile ._Extra . strip (b"zzz" , (self .ZIP64_EXTRA ,)))
3073
3073
3074
3074
3075
3075
if __name__ == "__main__" :
0 commit comments