Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Lib/tarfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -555,10 +555,13 @@ def seek(self, pos=0):
"""
if pos - self.pos >= 0:
blocks, remainder = divmod(pos - self.pos, self.bufsize)
for i in xrange(blocks):
# Not xrange(): it takes a C long, which is 32 bits on Windows,
# and a header can declare a size that makes blocks huge.
while blocks > 0:
data = self.read(self.bufsize)
if not data:
break
blocks -= 1
self.read(remainder)
else:
raise StreamError("seeking backwards is not allowed")
Expand Down
11 changes: 10 additions & 1 deletion Lib/test/test_ssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -3318,7 +3318,16 @@ def make_server(sock):
sock, server_side=True, do_handshake_on_connect=False)
return server, weakref.ref(dispatch_ctx)

s1, s2 = [socket.socket(_sock=s) for s in socket.socketpair()]
if hasattr(socket, "socketpair"):
s1, s2 = [socket.socket(_sock=s) for s in socket.socketpair()]
else:
# 2.7 has no socketpair() on Windows; use a loopback TCP pair.
with closing(socket.socket()) as listener:
listener.bind((HOST, 0))
listener.listen(1)
s2 = socket.socket()
s2.connect(listener.getsockname())
s1 = listener.accept()[0]
self.addCleanup(s1.close)
self.addCleanup(s2.close)
server, dispatch_ref = make_server(s1)
Expand Down