##// END OF EJS Templates
errors: catch urllib errors specifically instead of using safehasattr()...
errors: catch urllib errors specifically instead of using safehasattr() Before this patch, we would catch `IOError` and `OSError` and check if the instance had a `.code` member (indicates `HTTPError`) or a `.reason` member (indicates the more generic `URLError`). It seems to me that can simply catch those exception specifically instead, so that's what this code does. The existing code is from fbe8834923c5 (commands: report http exceptions nicely, 2005-06-17), so I suspect it's just that there was no `urllib2` (where `URLError` lives) back then. The old code mentioned `SSLError` in a comment. The new code does *not* try to catch that. The documentation for `ssl.SSLError` says that it has a `.reason` property, but `python -c 'import ssl; print(dir(ssl.SSLError("foo", Exception("bar"))))` doesn't mention that property on either Python 2 or Python 3 on my system. It also seems that `sslutil` is pretty careful about converting `ssl.SSLError` to `error.Abort`. It also is carefult to not assume that instances of the exception have a `.reason`. So I at least don't want to catch `ssl.SSLError` and handle it the same way as `URLError` because that would likely result in a crash. I also wonder if we don't need to handle it at all (because `sslutil` might handle all the cases). It's now early in the release cycle, so perhaps we can just see how it goes? Differential Revision: https://phab.mercurial-scm.org/D9318

File last commit:

r44085:53607fd3 stable
r46442:ae00e170 default
Show More
mpatchbuild.py
40 lines | 1.0 KiB | text/x-python | PythonLexer
Yuya Nishihara
cffi: rename build scripts...
r32505 from __future__ import absolute_import
import cffi
import os
ffi = cffi.FFI()
Augie Fackler
formatting: blacken the codebase...
r43346 mpatch_c = os.path.join(
Manuel Jacob
cffi: fix build on Python 3...
r44085 os.path.join(os.path.dirname(__file__), '..', 'mpatch.c')
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
cleanup: fix some latent open(path).read() et al calls we previously missed...
r36966 with open(mpatch_c) as f:
Augie Fackler
formatting: blacken the codebase...
r43346 ffi.set_source(
Manuel Jacob
cffi: fix build on Python 3...
r44085 "mercurial.cffi._mpatch", f.read(), include_dirs=["mercurial"]
Augie Fackler
formatting: blacken the codebase...
r43346 )
ffi.cdef(
"""
Yuya Nishihara
cffi: rename build scripts...
r32505
struct mpatch_frag {
int start, end, len;
const char *data;
};
struct mpatch_flist {
struct mpatch_frag *base, *head, *tail;
};
extern "Python" struct mpatch_flist* cffi_get_next_item(void*, ssize_t);
int mpatch_decode(const char *bin, ssize_t len, struct mpatch_flist** res);
ssize_t mpatch_calcsize(size_t len, struct mpatch_flist *l);
void mpatch_lfree(struct mpatch_flist *a);
static int mpatch_apply(char *buf, const char *orig, size_t len,
struct mpatch_flist *l);
struct mpatch_flist *mpatch_fold(void *bins,
struct mpatch_flist* (*get_next_item)(void*, ssize_t),
ssize_t start, ssize_t end);
Augie Fackler
formatting: blacken the codebase...
r43346 """
)
Yuya Nishihara
cffi: rename build scripts...
r32505
if __name__ == '__main__':
ffi.compile()