mirror of https://github.com/python/cpython.git
Patch #1412872: zipfile: use correct system type on unixy systems.
This commit is contained in:
parent
55cd82fe0a
commit
0075690ced
|
@ -1,6 +1,6 @@
|
||||||
"Read and write ZIP files."
|
"Read and write ZIP files."
|
||||||
|
|
||||||
import struct, os, time
|
import struct, os, time, sys
|
||||||
import binascii
|
import binascii
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
@ -131,7 +131,11 @@ def __init__(self, filename="NoName", date_time=(1980,1,1,0,0,0)):
|
||||||
self.compress_type = ZIP_STORED # Type of compression for the file
|
self.compress_type = ZIP_STORED # Type of compression for the file
|
||||||
self.comment = "" # Comment for each file
|
self.comment = "" # Comment for each file
|
||||||
self.extra = "" # ZIP extra data
|
self.extra = "" # ZIP extra data
|
||||||
|
if sys.platform == 'win32':
|
||||||
self.create_system = 0 # System which created ZIP archive
|
self.create_system = 0 # System which created ZIP archive
|
||||||
|
else:
|
||||||
|
# Assume everything else is unix-y
|
||||||
|
self.create_system = 3 # System which created ZIP archive
|
||||||
self.create_version = 20 # Version which created ZIP archive
|
self.create_version = 20 # Version which created ZIP archive
|
||||||
self.extract_version = 20 # Version needed to extract archive
|
self.extract_version = 20 # Version needed to extract archive
|
||||||
self.reserved = 0 # Must be zero
|
self.reserved = 0 # Must be zero
|
||||||
|
|
|
@ -358,6 +358,9 @@ Extension Modules
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Patch #1412872: zipfile now sets the creator system to 3 (Unix)
|
||||||
|
unless the system is Win32.
|
||||||
|
|
||||||
- Patch #1349118: urllib now supports user:pass@ style proxy
|
- Patch #1349118: urllib now supports user:pass@ style proxy
|
||||||
specifications, raises IOErrors when proxies for unsupported protocols
|
specifications, raises IOErrors when proxies for unsupported protocols
|
||||||
are defined, and uses the https proxy on https redirections.
|
are defined, and uses the https proxy on https redirections.
|
||||||
|
|
Loading…
Reference in New Issue