Auto-merging (0, 874) /work/python-gzip to /mirror/python (base /mirror/python:870).
Patching locally against mirror source svn+ssh://pythondev@svn.python.org/python/trunk.
U   Lib/gzip.py
==== Patch <-> level 1
Source: 1c4461ae-50e6-f04b-a2bc-6cd768afb727:/work/python-gzip:874
Target: 6015fed2-1504-0410-9fe1-9d1591cc4771:/python/trunk:41427
        (svn+ssh://pythondev@svn.python.org/python/trunk)
Log:
 r873@spiff:  Fredrik | 2005-11-12 11:40:08 +0100
 new work directory
 
 r874@spiff:  Fredrik | 2005-11-12 11:53:26 +0100
 SF#1316069
 
 add whence argument to gzip.GzipFile.seek
 

=== Lib/gzip.py
==================================================================
--- Lib/gzip.py  (revision 41427)

+++ Lib/gzip.py  (patch - level 1)

@@ -363,7 +363,12 @@

         self.extrasize = 0
         self.offset = 0
 
-    def seek(self, offset):
+    def seek(self, offset, whence=0):
+        if whence:
+            if whence == 1:
+                offset = self.offset + offset
+            else:
+                raise ValueError('Seek from end not supported')
         if self.mode == WRITE:
             if offset < self.offset:
                 raise IOError('Negative seek in write mode')

==== BEGIN SVK PATCH BLOCK ====
Version: svk 1.03 (MSWin32)

eJyNks9r1EAUx1fYWiy0qCfxFGiKiqSdN5mZ/LAsK6VbqD8QWj26ZJOXbtg0CdnZrStz6Ip/gBcP
gpf+EZ49aP+S9g/Quwcn2W4VRBRCmOS993nf9+bbKfcftEG1WkSZQNTei0e+/yyQYX8NmDKFwiiR
eWlyleIYU9NWaX5gMpUFh6ijw3xUhtVBBuUByuqQhAOUrRZonDvDbdeIObam9gKZZ0PTq/FdWSKa
oOw2U227eromeGqIOlJjuyWOk2GSZ7q96zCdoLNBV+cFZt0yz6XWx4BRp02rWqLCNB9it4LrP21e
5VNTD1QXREmJoVY00bjHSa9mzevr3vyi/leiTrkE2fPGcZJq2VAxNg5eJ8V6Man7/JNFZ6w6GhRF
OulKfCUjTGVQ822qeEAY8TgPhNujMXqUYBjzyBMk1BFKTNfRy33aaEyPxXSaby02zsaN5rvdt8vf
0+aXK9tnkxs/oHO+0pwe357ePN29drK1/PnWzvnD1VPv+qerbxa+Pll4/7L5bXP5ZHHlw2bjIz1v
YhYi3L2jb+G3Hc6GnIkKmAeuEJHrMu72XOLYwuY8shFDIDbE9SbBBWWUrmO3h0USx75hdEqMymRg
KIMSwi0AC6gB4DPiE9e4T4CQJSPDI+MoLwfG5aKWjKWKw/7J4bZPxZyz11kFGwQRXlUfRJFx1K8G
M7STRoeYSUPmRn1bO/rV0dOtDxEHOlmrt1otqkxKZ77dr83n+8+zZIzlMEjXhNLWLwLZ187RntQf
o1ESmeCojUr7RjGR/TyzKvzMqqYtFISMCQjQ4gSFFRPWswLaCy0RRo5wg7jnUKd1j6q/0m11Ad6Q
5SgbzP1VsQUBHmNELeCEWYQBsbwYwfIi4B6EIXMc7W33vzT4f8zg6wl+AkJxSkY=
==== END SVK PATCH BLOCK ====