##// END OF EJS Templates
interfaces: mark a few dirstate methods abstract...
interfaces: mark a few dirstate methods abstract I'm not sure what's going on here, but when enabling pytype checking on this package, it spits out the following errors: File "/mnt/c/Users/Matt/hg/mercurial/interfaces/dirstate.py", line 136, in changing_parents: bad return type [bad-return-type] Expected: Iterator Actually returned: None Attributes of protocol Iterator are not implemented on None: __next__ File "/mnt/c/Users/Matt/hg/mercurial/interfaces/dirstate.py", line 145, in changing_files: bad return type [bad-return-type] Expected: Iterator Actually returned: None Attributes of protocol Iterator are not implemented on None: __next__ I guess technically that's true, because these methods only have a doc comment, and don't explicitly return something or unconditionally raise an error. The strange thing is that both before and after this change, the *.pyi file that is generated is unchanged, and contains: def changing_files(self, repo) -> contextlib._GeneratorContextManager: ... def changing_parents(self, repo) -> contextlib._GeneratorContextManager: ... I'm not sure if the `@abstractmethod` should be the most inner or most outer decoration. We'll roll the dice with being the innermost, because that's how `@abstractproperty` says it should be used in conjunction with `@property`. We should probably make all of the methods without an actual body abstract, like was done for some `mercurial.wireprototypes` classes in fd200f5bcaea. But let's hold off for now and do that enmass later.

File last commit:

r52772:1a640aa2 default
r53328:2c8c46c3 default
Show More
keepalive.py
693 lines | 22.1 KiB | text/x-python | PythonLexer
Vadim Gelfer
http client: support persistent connections....
r2435 # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
Martin Geisler
Remove FSF mailing address from GPL headers...
r15782 # License along with this library; if not, see
# <http://www.gnu.org/licenses/>.
Vadim Gelfer
http client: support persistent connections....
r2435
# This file is part of urlgrabber, a high-level cross-protocol url-grabber
# Copyright 2002-2004 Michael D. Stenner, Ryan Tomayko
Benoit Boissinot
fix for digest auth when using keepalive.py...
r4026 # Modified by Benoit Boissinot:
# - fix for digest auth (inspired from urllib2.py @ Python v2.4)
Dirkjan Ochtman
python 2.6 compatibility: compatibility wrappers for hash functions
r6470 # Modified by Dirkjan Ochtman:
# - import md5 function from a local util module
Augie Fackler
keepalive: handle broken pipes gracefully during large POSTs
r9726 # Modified by Augie Fackler:
# - add safesend method and use it to prevent broken pipe errors
# on large POST requests
Benoit Boissinot
fix for digest auth when using keepalive.py...
r4026
Vadim Gelfer
http client: support persistent connections....
r2435 """An HTTP handler for urllib2 that supports HTTP 1.1 and keepalive.
>>> import urllib2
>>> from keepalive import HTTPHandler
>>> keepalive_handler = HTTPHandler()
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 >>> opener = urlreq.buildopener(keepalive_handler)
>>> urlreq.installopener(opener)
Vadim Gelfer
clean up trailing white space.
r2600 >>>
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 >>> fo = urlreq.urlopen('http://www.python.org')
Vadim Gelfer
http client: support persistent connections....
r2435
If a connection to a given host is requested, and all of the existing
connections are still in use, another connection will be opened. If
the handler tries to use an existing connection but it fails in some
way, it will be closed and removed from the pool.
To remove the handler, simply re-run build_opener with no arguments, and
install that opener.
You can explicitly close connections by using the close_connection()
method of the returned file-like object (described below) or you can
use the handler methods:
close_connection(host)
close_all()
open_connections()
NOTE: using the close_connection and close_all methods of the handler
should be done with care when using multiple threads.
* there is nothing that prevents another thread from creating new
connections immediately after connections are closed
* no checks are done to prevent in-use connections from being closed
>>> keepalive_handler.close_all()
EXTRA ATTRIBUTES AND METHODS
Upon a status of 200, the object returned has a few additional
attributes and methods, which should not be used if you want to
remain consistent with the normal urllib2-returned objects:
close_connection() - close the connection to the host
readlines() - you know, readlines()
Mads Kiilerich
fix trivial spelling errors
r17424 status - the return status (i.e. 404)
reason - english translation of status (i.e. 'File not found')
Vadim Gelfer
http client: support persistent connections....
r2435
If you want the best of both worlds, use this inside an
AttributeError-catching try:
>>> try: status = fo.status
>>> except AttributeError: status = None
Unfortunately, these are ONLY there if status == 200, so it's not
easy to distinguish between non-200 responses. The reason is that
urllib2 tries to do clever things with error codes 301, 302, 401,
and 407, and it wraps the object upon return.
"""
Alexis S. L. Carvalho
Update keepalive.py to current CVS version of urlgrabber....
r2444 # $Id: keepalive.py,v 1.14 2006/04/04 21:00:32 mstenner Exp $
Vadim Gelfer
http client: support persistent connections....
r2435
Matt Harbison
typing: add `from __future__ import annotations` to most files...
r52756 from __future__ import annotations
Gregory Szorc
keepalive: use absolute_import
r27507
Gregory Szorc
keepalive: use collections.defaultdict for host map...
r41453 import collections
Augie Fackler
cleanup: replace uses of util.(md5|sha1|sha256|sha512) with hashlib.\1...
r29341 import hashlib
Vadim Gelfer
http client: support persistent connections....
r2435 import socket
Gregory Szorc
keepalive: use absolute_import
r27507 import sys
Pulkit Goyal
keepalive: switch from thread to threading module...
r29456 import threading
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883
Gregory Szorc
keepalive: add more context to bad status line errors...
r34309 from .i18n import _
Joerg Sonnenberger
node: import symbols explicitly...
r46729 from .node import hex
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 from . import (
Augie Fackler
keepalive: python 3 portability tweaks...
r34428 pycompat,
Augie Fackler
cleanup: use urllibcompat for renamed methods on urllib request objects...
r34467 urllibcompat,
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 util,
)
Augie Fackler
formatting: blacken the codebase...
r43346 from .utils import procutil
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883
Pulkit Goyal
py3: conditionalize httplib import...
r29455 httplib = util.httplib
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 urlerr = util.urlerr
urlreq = util.urlreq
Vadim Gelfer
http client: support persistent connections....
r2435
DEBUG = None
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
py3: use class X: instead of class X(object):...
r49801 class ConnectionManager:
Vadim Gelfer
http client: support persistent connections....
r2435 """
The connection manager must be able to:
* keep track of all existing
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """
Augie Fackler
formatting: blacken the codebase...
r43346
Vadim Gelfer
http client: support persistent connections....
r2435 def __init__(self):
Pulkit Goyal
keepalive: switch from thread to threading module...
r29456 self._lock = threading.Lock()
Augie Fackler
formatting: blacken the codebase...
r43346 self._hostmap = collections.defaultdict(list) # host -> [connection]
self._connmap = {} # map connections to host
self._readymap = {} # map connection to ready state
Vadim Gelfer
http client: support persistent connections....
r2435
def add(self, host, connection, ready):
self._lock.acquire()
try:
self._hostmap[host].append(connection)
self._connmap[connection] = host
self._readymap[connection] = ready
finally:
self._lock.release()
def remove(self, connection):
self._lock.acquire()
try:
try:
host = self._connmap[connection]
except KeyError:
pass
else:
del self._connmap[connection]
del self._readymap[connection]
self._hostmap[host].remove(connection)
Alex Gaynor
style: never put multiple statements on one line...
r34436 if not self._hostmap[host]:
del self._hostmap[host]
Vadim Gelfer
http client: support persistent connections....
r2435 finally:
self._lock.release()
def set_ready(self, connection, ready):
Matt Mackall
many, many trivial check-code fixups
r10282 try:
self._readymap[connection] = ready
except KeyError:
pass
Vadim Gelfer
clean up trailing white space.
r2600
Vadim Gelfer
http client: support persistent connections....
r2435 def get_ready_conn(self, host):
conn = None
self._lock.acquire()
try:
Gregory Szorc
keepalive: use collections.defaultdict for host map...
r41453 for c in self._hostmap[host]:
if self._readymap[c]:
Gregory Szorc
keepalive: track ready state with a bool...
r41454 self._readymap[c] = False
Gregory Szorc
keepalive: use collections.defaultdict for host map...
r41453 conn = c
break
Vadim Gelfer
http client: support persistent connections....
r2435 finally:
self._lock.release()
return conn
def get_all(self, host=None):
if host:
Gregory Szorc
keepalive: use collections.defaultdict for host map...
r41453 return list(self._hostmap[host])
Vadim Gelfer
http client: support persistent connections....
r2435 else:
Matt Harbison
keepalive: ensure `close_all()` actually closes all cached connections...
r50436 return dict(
{h: list(conns) for (h, conns) in self._hostmap.items()}
)
Vadim Gelfer
http client: support persistent connections....
r2435
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
py3: use class X: instead of class X(object):...
r49801 class KeepAliveHandler:
Cédric Krier
url: allow to configure timeout on http connection...
r40079 def __init__(self, timeout=None):
Vadim Gelfer
http client: support persistent connections....
r2435 self._cm = ConnectionManager()
Cédric Krier
url: allow to configure timeout on http connection...
r40079 self._timeout = timeout
Gregory Szorc
keepalive: track request count and bytes sent...
r40068 self.requestscount = 0
self.sentbytescount = 0
Vadim Gelfer
clean up trailing white space.
r2600
Vadim Gelfer
http client: support persistent connections....
r2435 #### Connection Management
def open_connections(self):
"""return a list of connected hosts and the number of connections
to each. [('foo.com:80', 2), ('bar.org', 1)]"""
return [(host, len(li)) for (host, li) in self._cm.get_all().items()]
def close_connection(self, host):
"""close connection(s) to <host>
host is the host:port spec, as in 'www.cnn.com:8080' as passed in.
no error occurs if there is no connection to that host."""
for h in self._cm.get_all(host):
self._cm.remove(h)
h.close()
Vadim Gelfer
clean up trailing white space.
r2600
Vadim Gelfer
http client: support persistent connections....
r2435 def close_all(self):
"""close all open connections"""
Gregory Szorc
keepalive: remove pycompat.iteritems()...
r49779 for host, conns in self._cm.get_all().items():
Vadim Gelfer
http client: support persistent connections....
r2435 for h in conns:
self._cm.remove(h)
h.close()
Vadim Gelfer
clean up trailing white space.
r2600
Vadim Gelfer
http client: support persistent connections....
r2435 def _request_closed(self, request, host, connection):
Mads Kiilerich
help: fix some instances of 'the the'
r17251 """tells us that this request is now closed and that the
Vadim Gelfer
http client: support persistent connections....
r2435 connection is ready for another request"""
Gregory Szorc
keepalive: track ready state with a bool...
r41454 self._cm.set_ready(connection, True)
Vadim Gelfer
http client: support persistent connections....
r2435
def _remove_connection(self, host, connection, close=0):
Matt Mackall
many, many trivial check-code fixups
r10282 if close:
connection.close()
Vadim Gelfer
http client: support persistent connections....
r2435 self._cm.remove(connection)
Vadim Gelfer
clean up trailing white space.
r2600
Vadim Gelfer
http client: support persistent connections....
r2435 #### Transaction Execution
def http_open(self, req):
return self.do_open(HTTPConnection, req)
def do_open(self, http_class, req):
Augie Fackler
cleanup: use urllibcompat for renamed methods on urllib request objects...
r34467 host = urllibcompat.gethost(req)
Vadim Gelfer
http client: support persistent connections....
r2435 if not host:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 raise urlerr.urlerror(b'no host given')
Vadim Gelfer
http client: support persistent connections....
r2435
try:
h = self._cm.get_ready_conn(host)
while h:
r = self._reuse_connection(h, req, host)
# if this response is non-None, then it worked and we're
# done. Break out, skipping the else block.
Matt Mackall
many, many trivial check-code fixups
r10282 if r:
break
Vadim Gelfer
http client: support persistent connections....
r2435
# connection is bad - possibly closed by server
# discard it and ask for the next free connection
h.close()
self._cm.remove(h)
h = self._cm.get_ready_conn(host)
else:
# no (working) free connections were found. Create a new one.
Cédric Krier
url: allow to configure timeout on http connection...
r40079 h = http_class(host, timeout=self._timeout)
Matt Mackall
many, many trivial check-code fixups
r10282 if DEBUG:
Augie Fackler
formatting: blacken the codebase...
r43346 DEBUG.info(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"creating new connection to %s (%d)", host, id(h)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
keepalive: track ready state with a bool...
r41454 self._cm.add(host, h, False)
Vadim Gelfer
http client: support persistent connections....
r2435 self._start_transaction(h, req)
r = h.getresponse()
Gregory Szorc
keepalive: add more context to bad status line errors...
r34309 # The string form of BadStatusLine is the status line. Add some context
# to make the error message slightly more useful.
except httplib.BadStatusLine as err:
Augie Fackler
keepalive: python 3 portability tweaks...
r34428 raise urlerr.urlerror(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b'bad HTTP status line: %s') % pycompat.sysbytes(err.line)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except (socket.error, httplib.HTTPException) as err:
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 raise urlerr.urlerror(err)
Vadim Gelfer
clean up trailing white space.
r2600
Augie Fackler
keepalive: work around slight deficiency in vcr...
r39685 # If not a persistent connection, don't try to reuse it. Look
# for this using getattr() since vcr doesn't define this
# attribute, and in that case always close the connection.
Gregory Szorc
py3: stop normalizing 2nd argument of *attr() to unicode...
r43373 if getattr(r, 'will_close', True):
Matt Mackall
many, many trivial check-code fixups
r10282 self._cm.remove(h)
Vadim Gelfer
http client: support persistent connections....
r2435
Matt Mackall
many, many trivial check-code fixups
r10282 if DEBUG:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 DEBUG.info(b"STATUS: %s, %s", r.status, r.reason)
Vadim Gelfer
http client: support persistent connections....
r2435 r._handler = self
r._host = host
r._url = req.get_full_url()
r._connection = h
r.code = r.status
Alexis S. L. Carvalho
Update keepalive.py to current CVS version of urlgrabber....
r2444 r.headers = r.msg
r.msg = r.reason
Vadim Gelfer
clean up trailing white space.
r2600
Augie Fackler
keepalive: discard legacy Python support for error handling...
r30487 return r
Vadim Gelfer
http client: support persistent connections....
r2435
def _reuse_connection(self, h, req, host):
"""start the transaction with a re-used connection
return a response object (r) upon success or None on failure.
This DOES not close or remove bad connections in cases where
it returns. However, if an unexpected exception occurs, it
will close and remove the connection before re-raising.
"""
try:
self._start_transaction(h, req)
r = h.getresponse()
# note: just because we got something back doesn't mean it
# worked. We'll check the version below, too.
except (socket.error, httplib.HTTPException):
r = None
Augie Fackler
formatting: blacken the codebase...
r43346 except: # re-raises
Vadim Gelfer
http client: support persistent connections....
r2435 # adding this block just in case we've missed
# something we will still raise the exception, but
# lets try and close the connection and remove it
# first. We previously got into a nasty loop
# where an exception was uncaught, and so the
# connection stayed open. On the next try, the
Mads Kiilerich
fix trivial spelling errors
r17424 # same exception was raised, etc. The trade-off is
Vadim Gelfer
http client: support persistent connections....
r2435 # that it's now possible this call will raise
# a DIFFERENT exception
Matt Mackall
many, many trivial check-code fixups
r10282 if DEBUG:
Augie Fackler
formatting: blacken the codebase...
r43346 DEBUG.error(
Martin von Zweigbergk
cleanup: join string literals that are already on one line...
r43387 b"unexpected exception - closing connection to %s (%d)",
Augie Fackler
formatting: blacken the codebase...
r43346 host,
id(h),
)
Vadim Gelfer
http client: support persistent connections....
r2435 self._cm.remove(h)
h.close()
raise
Vadim Gelfer
clean up trailing white space.
r2600
Vadim Gelfer
http client: support persistent connections....
r2435 if r is None or r.version == 9:
# httplib falls back to assuming HTTP 0.9 if it gets a
# bad header back. This is most likely to happen if
# the socket has been closed by the server since we
# last used the connection.
Matt Mackall
many, many trivial check-code fixups
r10282 if DEBUG:
Augie Fackler
formatting: blacken the codebase...
r43346 DEBUG.info(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"failed to re-use connection to %s (%d)", host, id(h)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Vadim Gelfer
http client: support persistent connections....
r2435 r = None
else:
Matt Mackall
many, many trivial check-code fixups
r10282 if DEBUG:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 DEBUG.info(b"re-using connection to %s (%d)", host, id(h))
Vadim Gelfer
http client: support persistent connections....
r2435
return r
def _start_transaction(self, h, req):
Augie Fackler
keepalive: use getattr to avoid AttributeErrors when vcr is in use...
r40415 oldbytescount = getattr(h, 'sentbytescount', 0)
Gregory Szorc
keepalive: track request count and bytes sent...
r40068
Patrick Mezard
keepalive: fix 4f13ed6ee544, reintroduce unredirected_hdrs...
r8233 # What follows mostly reimplements HTTPConnection.request()
Gregory Szorc
keepalive: send HTTP request headers in a deterministic order...
r31999 # except it adds self.parent.addheaders in the mix and sends headers
# in a deterministic order (to make testing easier).
headers = util.sortdict(self.parent.addheaders)
headers.update(sorted(req.headers.items()))
headers.update(sorted(req.unredirected_hdrs.items()))
headers = util.sortdict((n.lower(), v) for n, v in headers.items())
Patrick Mezard
keepalive: fix 4f13ed6ee544, reintroduce unredirected_hdrs...
r8233 skipheaders = {}
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 for n in ('host', 'accept-encoding'):
Patrick Mezard
keepalive: fix 4f13ed6ee544, reintroduce unredirected_hdrs...
r8233 if n in headers:
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 skipheaders['skip_' + n.replace('-', '_')] = 1
Vadim Gelfer
http client: support persistent connections....
r2435 try:
Augie Fackler
cleanup: use urllibcompat for renamed methods on urllib request objects...
r34467 if urllibcompat.hasdata(req):
data = urllibcompat.getdata(req)
John Mulligan
keepalive: honor urllib2 style get_method overrides...
r30922 h.putrequest(
Augie Fackler
formatting: blacken the codebase...
r43346 req.get_method(),
urllibcompat.getselector(req),
Matt Harbison
format: add many "missing" comma...
r52755 **skipheaders,
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 if 'content-type' not in headers:
Augie Fackler
formatting: blacken the codebase...
r43346 h.putheader(
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 'Content-type', 'application/x-www-form-urlencoded'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
cleanup: remove pointless r-prefixes on single-quoted strings...
r43906 if 'content-length' not in headers:
h.putheader('Content-length', '%d' % len(data))
Matt Mackall
keepalive: attempt to fix issue1003...
r8146 else:
John Mulligan
keepalive: honor urllib2 style get_method overrides...
r30922 h.putrequest(
Augie Fackler
formatting: blacken the codebase...
r43346 req.get_method(),
urllibcompat.getselector(req),
Matt Harbison
format: add many "missing" comma...
r52755 **skipheaders,
Augie Fackler
formatting: blacken the codebase...
r43346 )
Gregory Szorc
keepalive: remove useless parentheses around exception type
r28278 except socket.error as err:
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 raise urlerr.urlerror(err)
Patrick Mezard
keepalive: fix 4f13ed6ee544, reintroduce unredirected_hdrs...
r8233 for k, v in headers.items():
Matt Mackall
keepalive: attempt to fix issue1003...
r8146 h.putheader(k, v)
h.endheaders()
Augie Fackler
cleanup: use urllibcompat for renamed methods on urllib request objects...
r34467 if urllibcompat.hasdata(req):
Matt Mackall
keepalive: attempt to fix issue1003...
r8146 h.send(data)
Gregory Szorc
keepalive: track request count and bytes sent...
r40068 # This will fail to record events in case of I/O failure. That's OK.
self.requestscount += 1
Augie Fackler
keepalive: use getattr to avoid AttributeErrors when vcr is in use...
r40415 self.sentbytescount += getattr(h, 'sentbytescount', 0) - oldbytescount
Gregory Szorc
keepalive: track request count and bytes sent...
r40068
try:
self.parent.requestscount += 1
Augie Fackler
keepalive: use getattr to avoid AttributeErrors when vcr is in use...
r40415 self.parent.sentbytescount += (
Augie Fackler
formatting: blacken the codebase...
r43346 getattr(h, 'sentbytescount', 0) - oldbytescount
)
Gregory Szorc
keepalive: track request count and bytes sent...
r40068 except AttributeError:
pass
Augie Fackler
formatting: blacken the codebase...
r43346
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 class HTTPHandler(KeepAliveHandler, urlreq.httphandler):
Alexis S. L. Carvalho
httprepo: use separate handlers for HTTP and HTTPS...
r5983 pass
Augie Fackler
formatting: blacken the codebase...
r43346
Vadim Gelfer
http client: support persistent connections....
r2435 class HTTPResponse(httplib.HTTPResponse):
# we need to subclass HTTPResponse in order to
Joerg Sonnenberger
http: simplify
r52724 # 1) add close_connection() method
# 2) add geturl() method
Joerg Sonnenberger
http: reuse Python's implementation of read/readline/readinto...
r52722 # 3) add accounting for read(), readlines() and readinto()
Vadim Gelfer
clean up trailing white space.
r2600
Vadim Gelfer
http client: support persistent connections....
r2435 def __init__(self, sock, debuglevel=0, strict=0, method=None):
Augie Fackler
formatting: blacken the codebase...
r43346 httplib.HTTPResponse.__init__(
Gregory Szorc
keepalive: remove Python 2 support code...
r49750 self, sock, debuglevel=debuglevel, method=method
Augie Fackler
formatting: blacken the codebase...
r43346 )
Vadim Gelfer
http client: support persistent connections....
r2435 self.fileno = sock.fileno
self.code = None
Gregory Szorc
keepalive: track number of bytes received from an HTTP response...
r40069 self.receivedbytescount = 0
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._rbuf = b''
Vadim Gelfer
http client: support persistent connections....
r2435 self._rbufsize = 8096
Augie Fackler
formatting: blacken the codebase...
r43346 self._handler = None # inserted by the handler later
self._host = None # (same)
self._url = None # (same)
self._connection = None # (same)
Vadim Gelfer
http client: support persistent connections....
r2435
Gregory Szorc
keepalive: implement _close_conn() so closes are known...
r41486 # Python 2.7 has a single close() which closes the socket handle.
# This method was effectively renamed to _close_conn() in Python 3. But
# there is also a close(). _close_conn() is called by methods like
# read().
Vadim Gelfer
http client: support persistent connections....
r2435 def close(self):
if self.fp:
self.fp.close()
self.fp = None
if self._handler:
Augie Fackler
formatting: blacken the codebase...
r43346 self._handler._request_closed(
self, self._host, self._connection
)
Vadim Gelfer
http client: support persistent connections....
r2435
Gregory Szorc
keepalive: implement _close_conn() so closes are known...
r41486 def _close_conn(self):
self.close()
Vadim Gelfer
http client: support persistent connections....
r2435 def close_connection(self):
self._handler._remove_connection(self._host, self._connection, close=1)
self.close()
Vadim Gelfer
clean up trailing white space.
r2600
Vadim Gelfer
http client: support persistent connections....
r2435 def geturl(self):
return self._url
def read(self, amt=None):
Joerg Sonnenberger
http: reuse Python's implementation of read/readline/readinto...
r52722 data = super().read(amt)
Gregory Szorc
keepalive: track number of bytes received from an HTTP response...
r40069 self.receivedbytescount += len(data)
Joerg Sonnenberger
http: simplify
r52724 if self._connection is not None:
Augie Fackler
http: work around custom http client classes that refuse extra attrs...
r40478 self._connection.receivedbytescount += len(data)
Joerg Sonnenberger
http: simplify
r52724 if self._handler is not None:
Gregory Szorc
keepalive: track number of bytes received from an HTTP response...
r40069 self._handler.parent.receivedbytescount += len(data)
Joerg Sonnenberger
http: reuse Python's implementation of read/readline/readinto...
r52722 return data
Matt Mackall
keepalive: borrow code from newer httplib to patch ValueError (issue1088)
r7781
Matt Harbison
keepalive: fix a signature mismatch for a http.client.HTTPResponse subclass...
r52772 def readline(self, limit: int = -1):
data = super().readline(limit=limit)
Joerg Sonnenberger
http: reuse Python's implementation of read/readline/readinto...
r52722 self.receivedbytescount += len(data)
Joerg Sonnenberger
http: simplify
r52724 if self._connection is not None:
Joerg Sonnenberger
http: reuse Python's implementation of read/readline/readinto...
r52722 self._connection.receivedbytescount += len(data)
Joerg Sonnenberger
http: simplify
r52724 if self._handler is not None:
Joerg Sonnenberger
http: reuse Python's implementation of read/readline/readinto...
r52722 self._handler.parent.receivedbytescount += len(data)
return data
Vadim Gelfer
http client: support persistent connections....
r2435
Gregory Szorc
keepalive: implement readinto()...
r37313 def readinto(self, dest):
Joerg Sonnenberger
http: reuse Python's implementation of read/readline/readinto...
r52722 got = super().readinto(dest)
Gregory Szorc
keepalive: track number of bytes received from an HTTP response...
r40069 self.receivedbytescount += got
Joerg Sonnenberger
http: simplify
r52724 if self._connection is not None:
Joerg Sonnenberger
http: reuse Python's implementation of read/readline/readinto...
r52722 self._connection.receivedbytescount += got
Joerg Sonnenberger
http: simplify
r52724 if self._handler is not None:
Joerg Sonnenberger
http: reuse Python's implementation of read/readline/readinto...
r52722 self._handler.parent.receivedbytescount += got
Augie Fackler
keepalive: rewrite readinto() to not use read()...
r37605 return got
Gregory Szorc
keepalive: implement readinto()...
r37313
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
keepalive: handle broken pipes gracefully during large POSTs
r9726 def safesend(self, str):
"""Send `str' to the server.
Shamelessly ripped off from httplib to patch a bad behavior.
"""
# _broken_pipe_resp is an attribute we set in this function
# if the socket is closed while we're sending data but
# the server sent us a response before hanging up.
# In that case, we want to pretend to send the rest of the
# outgoing data, and then let the user use getresponse()
# (which we wrap) to get this last response before
# opening a new socket.
if getattr(self, '_broken_pipe_resp', None) is not None:
return
if self.sock is None:
if self.auto_open:
self.connect()
else:
Brodie Rao
cleanup: "raise SomeException()" -> "raise SomeException"
r16687 raise httplib.NotConnected
Augie Fackler
keepalive: handle broken pipes gracefully during large POSTs
r9726
# send the data to the server. if we get a broken pipe, then close
# the socket. we want to reconnect when somebody tries to send again.
#
# NOTE: we DO propagate the error, though, because we cannot simply
# ignore the error... the caller will know if they can retry.
if self.debuglevel > 0:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b"send:", repr(str))
Augie Fackler
keepalive: handle broken pipes gracefully during large POSTs
r9726 try:
Matt Mackall
many, many trivial check-code fixups
r10282 blocksize = 8192
Augie Fackler
keepalive: use safehasattr instead of hasattr
r14958 read = getattr(str, 'read', None)
if read is not None:
Matt Mackall
many, many trivial check-code fixups
r10282 if self.debuglevel > 0:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b"sending a read()able")
Augie Fackler
keepalive: use safehasattr instead of hasattr
r14958 data = read(blocksize)
Augie Fackler
keepalive: handle broken pipes gracefully during large POSTs
r9726 while data:
self.sock.sendall(data)
Gregory Szorc
keepalive: track request count and bytes sent...
r40068 self.sentbytescount += len(data)
Augie Fackler
keepalive: use safehasattr instead of hasattr
r14958 data = read(blocksize)
Augie Fackler
keepalive: handle broken pipes gracefully during large POSTs
r9726 else:
self.sock.sendall(str)
Gregory Szorc
keepalive: track request count and bytes sent...
r40068 self.sentbytescount += len(str)
Manuel Jacob
py3: catch BrokenPipeError instead of checking errno == EPIPE
r50199 except BrokenPipeError:
if self._HTTPConnection__state == httplib._CS_REQ_SENT:
self._broken_pipe_resp = None
self._broken_pipe_resp = self.getresponse()
reraise = False
else:
reraise = True
self.close()
Augie Fackler
keepalive: handle broken pipes gracefully during large POSTs
r9726 if reraise:
raise
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
keepalive: handle broken pipes gracefully during large POSTs
r9726 def wrapgetresponse(cls):
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """Wraps getresponse in cls with a broken-pipe sane version."""
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
keepalive: handle broken pipes gracefully during large POSTs
r9726 def safegetresponse(self):
# In safesend() we might set the _broken_pipe_resp
# attribute, in which case the socket has already
# been closed and we just need to give them the response
# back. Otherwise, we use the normal response path.
r = getattr(self, '_broken_pipe_resp', None)
if r is not None:
return r
return cls.getresponse(self)
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
keepalive: handle broken pipes gracefully during large POSTs
r9726 safegetresponse.__doc__ = cls.getresponse.__doc__
return safegetresponse
Vadim Gelfer
http client: support persistent connections....
r2435
Augie Fackler
formatting: blacken the codebase...
r43346
Vadim Gelfer
http client: support persistent connections....
r2435 class HTTPConnection(httplib.HTTPConnection):
Gregory Szorc
url: have httpsconnection inherit from our custom HTTPConnection...
r40067 # url.httpsconnection inherits from this. So when adding/removing
# attributes, be sure to audit httpsconnection() for unintended
# consequences.
Vadim Gelfer
http client: support persistent connections....
r2435 # use the modified response class
response_class = HTTPResponse
Augie Fackler
keepalive: handle broken pipes gracefully during large POSTs
r9726 send = safesend
getresponse = wrapgetresponse(httplib.HTTPConnection)
Gregory Szorc
keepalive: track request count and bytes sent...
r40068 def __init__(self, *args, **kwargs):
httplib.HTTPConnection.__init__(self, *args, **kwargs)
self.sentbytescount = 0
Gregory Szorc
keepalive: track number of bytes received from an HTTP response...
r40069 self.receivedbytescount = 0
Vadim Gelfer
clean up trailing white space.
r2600
Matt Harbison
keepalive: add `__repr__()` to the HTTPConnection class to ease debugging...
r50437 def __repr__(self):
base = super(HTTPConnection, self).__repr__()
local = "(unconnected)"
s = self.sock
if s:
try:
local = "%s:%d" % s.getsockname()
except OSError:
pass # Likely not connected
return "<%s: %s <--> %s:%d>" % (base, local, self.host, self.port)
Augie Fackler
formatting: blacken the codebase...
r43346
Vadim Gelfer
http client: support persistent connections....
r2435 #########################################################################
##### TEST FUNCTIONS
#########################################################################
def continuity(url):
Augie Fackler
cleanup: replace uses of util.(md5|sha1|sha256|sha512) with hashlib.\1...
r29341 md5 = hashlib.md5
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 format = b'%25s: %s'
Vadim Gelfer
clean up trailing white space.
r2600
Vadim Gelfer
http client: support persistent connections....
r2435 # first fetch the file with the normal http handler
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 opener = urlreq.buildopener()
urlreq.installopener(opener)
fo = urlreq.urlopen(url)
Vadim Gelfer
http client: support persistent connections....
r2435 foo = fo.read()
fo.close()
Mike Hommey
keepalive: fix how md5 is used...
r22505 m = md5(foo)
Joerg Sonnenberger
node: import symbols explicitly...
r46729 print(format % (b'normal urllib', hex(m.digest())))
Vadim Gelfer
http client: support persistent connections....
r2435
# now install the keepalive handler and try again
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 opener = urlreq.buildopener(HTTPHandler())
urlreq.installopener(opener)
Vadim Gelfer
http client: support persistent connections....
r2435
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 fo = urlreq.urlopen(url)
Vadim Gelfer
http client: support persistent connections....
r2435 foo = fo.read()
fo.close()
Mike Hommey
keepalive: fix how md5 is used...
r22505 m = md5(foo)
Joerg Sonnenberger
node: import symbols explicitly...
r46729 print(format % (b'keepalive read', hex(m.digest())))
Vadim Gelfer
http client: support persistent connections....
r2435
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 fo = urlreq.urlopen(url)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 foo = b''
Martin Geisler
check-code: flag 0/1 used as constant Boolean expression
r14494 while True:
Vadim Gelfer
http client: support persistent connections....
r2435 f = fo.readline()
Matt Mackall
many, many trivial check-code fixups
r10282 if f:
foo = foo + f
Alex Gaynor
style: never put multiple statements on one line...
r34436 else:
break
Vadim Gelfer
http client: support persistent connections....
r2435 fo.close()
Mike Hommey
keepalive: fix how md5 is used...
r22505 m = md5(foo)
Joerg Sonnenberger
node: import symbols explicitly...
r46729 print(format % (b'keepalive readline', hex(m.digest())))
Vadim Gelfer
http client: support persistent connections....
r2435
Augie Fackler
formatting: blacken the codebase...
r43346
Vadim Gelfer
http client: support persistent connections....
r2435 def comp(N, url):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b' making %i connections to:\n %s' % (N, url))
Vadim Gelfer
http client: support persistent connections....
r2435
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 procutil.stdout.write(b' first using the normal urllib handlers')
Vadim Gelfer
http client: support persistent connections....
r2435 # first use normal opener
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 opener = urlreq.buildopener()
urlreq.installopener(opener)
Vadim Gelfer
http client: support persistent connections....
r2435 t1 = fetch(N, url)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b' TIME: %.3f s' % t1)
Vadim Gelfer
http client: support persistent connections....
r2435
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 procutil.stdout.write(b' now using the keepalive handler ')
Vadim Gelfer
http client: support persistent connections....
r2435 # now install the keepalive handler and try again
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 opener = urlreq.buildopener(HTTPHandler())
urlreq.installopener(opener)
Vadim Gelfer
http client: support persistent connections....
r2435 t2 = fetch(N, url)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b' TIME: %.3f s' % t2)
print(b' improvement factor: %.2f' % (t1 / t2))
Vadim Gelfer
clean up trailing white space.
r2600
Augie Fackler
formatting: blacken the codebase...
r43346
Vadim Gelfer
http client: support persistent connections....
r2435 def fetch(N, url, delay=0):
import time
Augie Fackler
formatting: blacken the codebase...
r43346
Vadim Gelfer
http client: support persistent connections....
r2435 lens = []
starttime = time.time()
for i in range(N):
Matt Mackall
many, many trivial check-code fixups
r10282 if delay and i > 0:
time.sleep(delay)
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 fo = urlreq.urlopen(url)
Vadim Gelfer
http client: support persistent connections....
r2435 foo = fo.read()
fo.close()
lens.append(len(foo))
diff = time.time() - starttime
j = 0
for i in lens[1:]:
j = j + 1
if not i == lens[0]:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b"WARNING: inconsistent length on read %i: %i" % (j, i))
Vadim Gelfer
http client: support persistent connections....
r2435
return diff
Augie Fackler
formatting: blacken the codebase...
r43346
Vadim Gelfer
http client: support persistent connections....
r2435 def test_timeout(url):
global DEBUG
dbbackup = DEBUG
Augie Fackler
formatting: blacken the codebase...
r43346
Gregory Szorc
py3: use class X: instead of class X(object):...
r49801 class FakeLogger:
Matt Mackall
many, many trivial check-code fixups
r10282 def debug(self, msg, *args):
Gregory Szorc
keepalive: use print function
r27616 print(msg % args)
Augie Fackler
formatting: blacken the codebase...
r43346
Vadim Gelfer
http client: support persistent connections....
r2435 info = warning = error = debug
Augie Fackler
formatting: blacken the codebase...
r43346
Vadim Gelfer
http client: support persistent connections....
r2435 DEBUG = FakeLogger()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b" fetching the file to establish a connection")
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 fo = urlreq.urlopen(url)
Vadim Gelfer
http client: support persistent connections....
r2435 data1 = fo.read()
fo.close()
Vadim Gelfer
clean up trailing white space.
r2600
Vadim Gelfer
http client: support persistent connections....
r2435 i = 20
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b" waiting %i seconds for the server to close the connection" % i)
Vadim Gelfer
http client: support persistent connections....
r2435 while i > 0:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 procutil.stdout.write(b'\r %2i' % i)
Yuya Nishihara
procutil: bulk-replace util.std* to point to new module
r37137 procutil.stdout.flush()
Vadim Gelfer
http client: support persistent connections....
r2435 time.sleep(1)
i -= 1
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 procutil.stderr.write(b'\r')
Vadim Gelfer
http client: support persistent connections....
r2435
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b" fetching the file a second time")
timeless
pycompat: switch to util.urlreq/util.urlerr for py3 compat
r28883 fo = urlreq.urlopen(url)
Vadim Gelfer
http client: support persistent connections....
r2435 data2 = fo.read()
fo.close()
if data1 == data2:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b' data are identical')
Vadim Gelfer
http client: support persistent connections....
r2435 else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b' ERROR: DATA DIFFER')
Vadim Gelfer
http client: support persistent connections....
r2435
DEBUG = dbbackup
Vadim Gelfer
clean up trailing white space.
r2600
Vadim Gelfer
http client: support persistent connections....
r2435 def test(url, N=10):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b"performing continuity test (making sure stuff isn't corrupted)")
Vadim Gelfer
http client: support persistent connections....
r2435 continuity(url)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b'')
print(b"performing speed comparison")
Vadim Gelfer
http client: support persistent connections....
r2435 comp(N, url)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 print(b'')
print(b"performing dropped-connection check")
Vadim Gelfer
http client: support persistent connections....
r2435 test_timeout(url)
Vadim Gelfer
clean up trailing white space.
r2600
Augie Fackler
formatting: blacken the codebase...
r43346
Vadim Gelfer
http client: support persistent connections....
r2435 if __name__ == '__main__':
import time
Augie Fackler
formatting: blacken the codebase...
r43346
Vadim Gelfer
http client: support persistent connections....
r2435 try:
N = int(sys.argv[1])
url = sys.argv[2]
Brodie Rao
cleanup: replace naked excepts with more specific ones
r16688 except (IndexError, ValueError):
Manuel Jacob
py3: use str literal instead of bytes literal
r52687 print("%s <integer> <url>" % sys.argv[0])
Vadim Gelfer
http client: support persistent connections....
r2435 else:
test(url, N)