[Python-checkins] r42250 - in python/trunk: Lib/zipfile.py Misc/NEWS

[martin.v.loewis]

Author: martin.v.loewis
Date: Sun Feb  5 18:09:41 2006
New Revision: 42250

Modified:
   python/trunk/Lib/zipfile.py
   python/trunk/Misc/NEWS
Log:
Patch #1412872: zipfile: use correct system type on unixy systems.


Modified: python/trunk/Lib/zipfile.py
==============================================================================
--- python/trunk/Lib/zipfile.py	(original)
+++ python/trunk/Lib/zipfile.py	Sun Feb  5 18:09:41 2006
@@ -1,6 +1,6 @@
 "Read and write ZIP files."
 
-import struct, os, time
+import struct, os, time, sys
 import binascii
 
 try:
@@ -131,7 +131,11 @@
         self.compress_type = ZIP_STORED # Type of compression for the file
         self.comment = ""               # Comment for each file
         self.extra = ""                 # ZIP extra data
-        self.create_system = 0          # System which created ZIP archive
+        if sys.platform == 'win32':
+            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.extract_version = 20       # Version needed to extract archive
         self.reserved = 0               # Must be zero

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sun Feb  5 18:09:41 2006
@@ -358,6 +358,9 @@
 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 
   specifications, raises IOErrors when proxies for unsupported protocols
   are defined, and uses the https proxy on https redirections.