| hg-reviewers |
This is a generally useful function. Having it on the url module
will make it more accessible outside of the HTTP peers.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| n = 0 | n = 0 | ||||
| for i in pycompat.xrange(0, len(value), valuelen): | for i in pycompat.xrange(0, len(value), valuelen): | ||||
| n += 1 | n += 1 | ||||
| result.append((fmt % str(n), pycompat.strurl(value[i:i + valuelen]))) | result.append((fmt % str(n), pycompat.strurl(value[i:i + valuelen]))) | ||||
| return result | return result | ||||
| def _wraphttpresponse(resp): | |||||
| """Wrap an HTTPResponse with common error handlers. | |||||
| This ensures that any I/O from any consumer raises the appropriate | |||||
| error and messaging. | |||||
| """ | |||||
| origread = resp.read | |||||
| class readerproxy(resp.__class__): | |||||
| def read(self, size=None): | |||||
| try: | |||||
| return origread(size) | |||||
| except httplib.IncompleteRead as e: | |||||
| # e.expected is an integer if length known or None otherwise. | |||||
| if e.expected: | |||||
| got = len(e.partial) | |||||
| total = e.expected + got | |||||
| msg = _('HTTP request error (incomplete response; ' | |||||
| 'expected %d bytes got %d)') % (total, got) | |||||
| else: | |||||
| msg = _('HTTP request error (incomplete response)') | |||||
| raise error.PeerTransportError( | |||||
| msg, | |||||
| hint=_('this may be an intermittent network failure; ' | |||||
| 'if the error persists, consider contacting the ' | |||||
| 'network or server operator')) | |||||
| except httplib.HTTPException as e: | |||||
| raise error.PeerTransportError( | |||||
| _('HTTP request error (%s)') % e, | |||||
| hint=_('this may be an intermittent network failure; ' | |||||
| 'if the error persists, consider contacting the ' | |||||
| 'network or server operator')) | |||||
| resp.__class__ = readerproxy | |||||
| class _multifile(object): | class _multifile(object): | ||||
| def __init__(self, *fileobjs): | def __init__(self, *fileobjs): | ||||
| for f in fileobjs: | for f in fileobjs: | ||||
| if not util.safehasattr(f, 'length'): | if not util.safehasattr(f, 'length'): | ||||
| raise ValueError( | raise ValueError( | ||||
| '_multifile only supports file objects that ' | '_multifile only supports file objects that ' | ||||
| 'have a length but this one does not:', type(f), f) | 'have a length but this one does not:', type(f), f) | ||||
| self._fileobjs = fileobjs | self._fileobjs = fileobjs | ||||
| raise IOError(None, inst) | raise IOError(None, inst) | ||||
| finally: | finally: | ||||
| if ui.debugflag and ui.configbool('devel', 'debug.peer-request'): | if ui.debugflag and ui.configbool('devel', 'debug.peer-request'): | ||||
| code = res.code if res else -1 | code = res.code if res else -1 | ||||
| dbg(line % ' finished in %.4f seconds (%d)' | dbg(line % ' finished in %.4f seconds (%d)' | ||||
| % (util.timer() - start, code)) | % (util.timer() - start, code)) | ||||
| # Insert error handlers for common I/O failures. | # Insert error handlers for common I/O failures. | ||||
| _wraphttpresponse(res) | urlmod.wrapresponse(res) | ||||
| return res | return res | ||||
| class RedirectedRepoError(error.RepoError): | class RedirectedRepoError(error.RepoError): | ||||
| def __init__(self, msg, respurl): | def __init__(self, msg, respurl): | ||||
| super(RedirectedRepoError, self).__init__(msg) | super(RedirectedRepoError, self).__init__(msg) | ||||
| self.respurl = respurl | self.respurl = respurl | ||||
| if u.scheme: | if u.scheme: | ||||
| u.scheme = u.scheme.lower() | u.scheme = u.scheme.lower() | ||||
| url_, authinfo = u.authinfo() | url_, authinfo = u.authinfo() | ||||
| else: | else: | ||||
| path = util.normpath(os.path.abspath(url_)) | path = util.normpath(os.path.abspath(url_)) | ||||
| url_ = 'file://' + pycompat.bytesurl(urlreq.pathname2url(path)) | url_ = 'file://' + pycompat.bytesurl(urlreq.pathname2url(path)) | ||||
| authinfo = None | authinfo = None | ||||
| return opener(ui, authinfo).open(pycompat.strurl(url_), data) | return opener(ui, authinfo).open(pycompat.strurl(url_), data) | ||||
| def wrapresponse(resp): | |||||
| """Wrap a response object with common error handlers. | |||||
| This ensures that any I/O from any consumer raises the appropriate | |||||
| error and messaging. | |||||
| """ | |||||
| origread = resp.read | |||||
| class readerproxy(resp.__class__): | |||||
| def read(self, size=None): | |||||
| try: | |||||
| return origread(size) | |||||
| except httplib.IncompleteRead as e: | |||||
| # e.expected is an integer if length known or None otherwise. | |||||
| if e.expected: | |||||
| got = len(e.partial) | |||||
| total = e.expected + got | |||||
| msg = _('HTTP request error (incomplete response; ' | |||||
| 'expected %d bytes got %d)') % (total, got) | |||||
| else: | |||||
| msg = _('HTTP request error (incomplete response)') | |||||
| raise error.PeerTransportError( | |||||
| msg, | |||||
| hint=_('this may be an intermittent network failure; ' | |||||
| 'if the error persists, consider contacting the ' | |||||
| 'network or server operator')) | |||||
| except httplib.HTTPException as e: | |||||
| raise error.PeerTransportError( | |||||
| _('HTTP request error (%s)') % e, | |||||
| hint=_('this may be an intermittent network failure; ' | |||||
| 'if the error persists, consider contacting the ' | |||||
| 'network or server operator')) | |||||
| resp.__class__ = readerproxy | |||||