mirror of
https://github.com/python/cpython
synced 2026-09-29 09:55:31 +03:00
Merged revisions 57778-58052 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r57820 | georg.brandl | 2007-08-31 08:59:27 +0200 (Fri, 31 Aug 2007) | 2 lines Document new shorthand notation for index entries. ........ r57827 | georg.brandl | 2007-08-31 10:47:51 +0200 (Fri, 31 Aug 2007) | 2 lines Fix subitem markup. ........ r57833 | martin.v.loewis | 2007-08-31 12:01:07 +0200 (Fri, 31 Aug 2007) | 1 line Mark registry components as 64-bit on Win64. ........ r57854 | bill.janssen | 2007-08-31 21:02:23 +0200 (Fri, 31 Aug 2007) | 1 line deprecate use of FakeSocket ........ r57855 | bill.janssen | 2007-08-31 21:02:46 +0200 (Fri, 31 Aug 2007) | 1 line remove mentions of socket.ssl in comments ........ r57856 | bill.janssen | 2007-08-31 21:03:31 +0200 (Fri, 31 Aug 2007) | 1 line remove use of non-existent SSLFakeSocket in apparently untested code ........ r57859 | martin.v.loewis | 2007-09-01 08:36:03 +0200 (Sat, 01 Sep 2007) | 3 lines Bug #1737210: Change Manufacturer of Windows installer to PSF. Will backport to 2.5. ........ r57865 | georg.brandl | 2007-09-01 09:51:24 +0200 (Sat, 01 Sep 2007) | 2 lines Fix RST link (backport from Py3k). ........ r57876 | georg.brandl | 2007-09-01 17:49:49 +0200 (Sat, 01 Sep 2007) | 2 lines Document sets' ">" and "<" operations (backport from py3k). ........ r57878 | skip.montanaro | 2007-09-01 19:40:03 +0200 (Sat, 01 Sep 2007) | 4 lines Added a note and examples to explain that re.split does not split on an empty pattern match. (issue 852532). ........ r57879 | walter.doerwald | 2007-09-01 20:18:09 +0200 (Sat, 01 Sep 2007) | 2 lines Fix wrong function names. ........ r57880 | walter.doerwald | 2007-09-01 20:34:05 +0200 (Sat, 01 Sep 2007) | 2 lines Fix typo. ........ r57889 | andrew.kuchling | 2007-09-01 22:31:59 +0200 (Sat, 01 Sep 2007) | 1 line Markup fix ........ r57892 | andrew.kuchling | 2007-09-01 22:43:36 +0200 (Sat, 01 Sep 2007) | 1 line Add various items ........ r57895 | andrew.kuchling | 2007-09-01 23:17:58 +0200 (Sat, 01 Sep 2007) | 1 line Wording change ........ r57896 | andrew.kuchling | 2007-09-01 23:18:31 +0200 (Sat, 01 Sep 2007) | 1 line Add more items ........ r57904 | ronald.oussoren | 2007-09-02 11:46:07 +0200 (Sun, 02 Sep 2007) | 3 lines Macosx: this patch ensures that the value of MACOSX_DEPLOYMENT_TARGET used by the Makefile is also used at configure-time. ........ r57925 | georg.brandl | 2007-09-03 09:16:46 +0200 (Mon, 03 Sep 2007) | 2 lines Fix #883466: don't allow Unicode as arguments to quopri and uu codecs. ........ r57936 | matthias.klose | 2007-09-04 01:33:04 +0200 (Tue, 04 Sep 2007) | 2 lines - Added support for linking the bsddb module against BerkeleyDB 4.6.x. ........ r57954 | mark.summerfield | 2007-09-04 10:16:15 +0200 (Tue, 04 Sep 2007) | 3 lines Added cross-references plus a note about dict & list shallow copying. ........ r57958 | martin.v.loewis | 2007-09-04 11:51:57 +0200 (Tue, 04 Sep 2007) | 3 lines Document that we rely on the OS to release the crypto context. Fixes #1626801. ........ r57960 | martin.v.loewis | 2007-09-04 15:13:14 +0200 (Tue, 04 Sep 2007) | 3 lines Patch #1388440: Add set_completion_display_matches_hook and get_completion_type to readline. ........ r57961 | martin.v.loewis | 2007-09-04 16:19:28 +0200 (Tue, 04 Sep 2007) | 3 lines Patch #1031213: Decode source line in SyntaxErrors back to its original source encoding. Will backport to 2.5. ........ r57972 | matthias.klose | 2007-09-04 20:17:36 +0200 (Tue, 04 Sep 2007) | 3 lines - Makefile.pre.in(buildbottest): Run an optional script pybuildbot.identify to include some information about the build environment. ........ r57973 | matthias.klose | 2007-09-04 21:05:38 +0200 (Tue, 04 Sep 2007) | 2 lines - Makefile.pre.in(buildbottest): Remove whitespace at eol. ........ r57975 | matthias.klose | 2007-09-04 22:46:02 +0200 (Tue, 04 Sep 2007) | 2 lines - Fix libffi configure for hppa*-*-linux* | parisc*-*-linux*. ........ r57980 | bill.janssen | 2007-09-05 02:46:27 +0200 (Wed, 05 Sep 2007) | 1 line SSL certificate distinguished names should be represented by tuples ........ r57985 | martin.v.loewis | 2007-09-05 08:39:17 +0200 (Wed, 05 Sep 2007) | 3 lines Patch #1105: Explain that one needs to build the solution to get dependencies right. ........ r57987 | armin.rigo | 2007-09-05 09:51:21 +0200 (Wed, 05 Sep 2007) | 4 lines PyDict_GetItem() returns a borrowed reference. There are probably a number of places that are open to attacks such as the following one, in bltinmodule.c:min_max(). ........ r57991 | martin.v.loewis | 2007-09-05 13:47:34 +0200 (Wed, 05 Sep 2007) | 3 lines Patch #786737: Allow building in a tree of symlinks pointing to a readonly source. ........ r57993 | georg.brandl | 2007-09-05 15:36:44 +0200 (Wed, 05 Sep 2007) | 2 lines Backport from Py3k: Bug #1684991: explain lookup semantics for __special__ methods (new-style classes only). ........ r58004 | armin.rigo | 2007-09-06 10:30:51 +0200 (Thu, 06 Sep 2007) | 4 lines Patch #1733973 by peaker: ptrace_enter_call() assumes no exception is currently set. This assumption is broken when throwing into a generator. ........ r58006 | armin.rigo | 2007-09-06 11:30:38 +0200 (Thu, 06 Sep 2007) | 4 lines PyDict_GetItem() returns a borrowed reference. This attack is against ceval.c:IMPORT_NAME, which calls an object (__builtin__.__import__) without holding a reference to it. ........ r58013 | georg.brandl | 2007-09-06 16:49:56 +0200 (Thu, 06 Sep 2007) | 2 lines Backport from 3k: #1116: fix reference to old filename. ........ r58021 | thomas.heller | 2007-09-06 22:26:20 +0200 (Thu, 06 Sep 2007) | 1 line Fix typo: c_float represents to C float type. ........ r58022 | skip.montanaro | 2007-09-07 00:29:06 +0200 (Fri, 07 Sep 2007) | 3 lines If this is correct for py3k branch and it's already in the release25-maint branch, seems like it ought to be on the trunk as well. ........ r58023 | gregory.p.smith | 2007-09-07 00:59:59 +0200 (Fri, 07 Sep 2007) | 4 lines Apply the fix from Issue1112 to make this test more robust and keep windows happy. ........ r58031 | brett.cannon | 2007-09-07 05:17:50 +0200 (Fri, 07 Sep 2007) | 4 lines Make uuid1 and uuid4 tests conditional on whether ctypes can be imported; implementation of either function depends on ctypes but uuid as a whole does not. ........ r58032 | brett.cannon | 2007-09-07 06:18:30 +0200 (Fri, 07 Sep 2007) | 6 lines Fix a crasher where Python code managed to infinitely recurse in C code without ever going back out to Python code in PyObject_Call(). Required introducing a static RuntimeError instance so that normalizing an exception there is no reliance on a recursive call that would put the exception system over the recursion check itself. ........ r58034 | thomas.heller | 2007-09-07 08:32:17 +0200 (Fri, 07 Sep 2007) | 1 line Add a 'c_longdouble' type to the ctypes module. ........ r58035 | thomas.heller | 2007-09-07 11:30:40 +0200 (Fri, 07 Sep 2007) | 1 line Remove unneeded #include. ........ r58036 | thomas.heller | 2007-09-07 11:33:24 +0200 (Fri, 07 Sep 2007) | 6 lines Backport from py3k branch: Add a workaround for a strange bug on win64, when _ctypes is compiled with the SDK compiler. This should fix the failing Lib\ctypes\test\test_as_parameter.py test. ........ r58037 | georg.brandl | 2007-09-07 16:14:40 +0200 (Fri, 07 Sep 2007) | 2 lines Fix a wrong indentation for sublists. ........ r58043 | georg.brandl | 2007-09-07 22:10:49 +0200 (Fri, 07 Sep 2007) | 2 lines #1095: ln -f doesn't work portably, fix in Makefile. ........ r58049 | skip.montanaro | 2007-09-08 02:34:17 +0200 (Sat, 08 Sep 2007) | 1 line be explicit about the actual location of the missing file ........
This commit is contained in:
Thomas Wouters
parent
4a625c33c1
commit
89d996e5c2
55 changed files with 660 additions and 126 deletions
|
|
@ -1104,7 +1104,7 @@ _type_ attribute.
|
|||
|
||||
*/
|
||||
|
||||
static char *SIMPLE_TYPE_CHARS = "cbBhHiIlLdfuzZqQPXOvt";
|
||||
static char *SIMPLE_TYPE_CHARS = "cbBhHiIlLdfuzZqQPXOvtD";
|
||||
|
||||
static PyObject *
|
||||
c_wchar_p_from_param(PyObject *type, PyObject *value)
|
||||
|
|
|
|||
|
|
@ -12,6 +12,29 @@
|
|||
|
||||
/* some functions handy for testing */
|
||||
|
||||
EXPORT(long double)testfunc_Ddd(double a, double b)
|
||||
{
|
||||
long double result = (long double)(a * b);
|
||||
printf("testfunc_Ddd(%p, %p)\n", &a, &b);
|
||||
printf("testfunc_Ddd(%g, %g)\n", a, b);
|
||||
return result;
|
||||
}
|
||||
|
||||
EXPORT(long double)testfunc_DDD(long double a, long double b)
|
||||
{
|
||||
long double result = a * b;
|
||||
printf("testfunc_DDD(%p, %p)\n", &a, &b);
|
||||
printf("testfunc_DDD(%Lg, %Lg)\n", a, b);
|
||||
return result;
|
||||
}
|
||||
|
||||
EXPORT(int)testfunc_iii(int a, int b)
|
||||
{
|
||||
int result = a * b;
|
||||
printf("testfunc_iii(%p, %p)\n", &a, &b);
|
||||
return result;
|
||||
}
|
||||
|
||||
EXPORT(int)myprintf(char *fmt, ...)
|
||||
{
|
||||
int result;
|
||||
|
|
@ -77,6 +100,14 @@ EXPORT(double) _testfunc_d_bhilfd(signed char b, short h, int i, long l, float f
|
|||
return (double)(b + h + i + l + f + d);
|
||||
}
|
||||
|
||||
EXPORT(long double) _testfunc_D_bhilfD(signed char b, short h, int i, long l, float f, long double d)
|
||||
{
|
||||
/* printf("_testfunc_d_bhilfd got %d %d %d %ld %f %f\n",
|
||||
b, h, i, l, f, d);
|
||||
*/
|
||||
return (long double)(b + h + i + l + f + d);
|
||||
}
|
||||
|
||||
EXPORT(char *) _testfunc_p_p(void *s)
|
||||
{
|
||||
return (char *)s;
|
||||
|
|
@ -391,6 +422,7 @@ EXPORT(PY_LONG_LONG) tf_q(PY_LONG_LONG c) { S; return c/3; }
|
|||
EXPORT(unsigned PY_LONG_LONG) tf_Q(unsigned PY_LONG_LONG c) { U; return c/3; }
|
||||
EXPORT(float) tf_f(float c) { S; return c/3; }
|
||||
EXPORT(double) tf_d(double c) { S; return c/3; }
|
||||
EXPORT(long double) tf_D(long double c) { S; return c/3; }
|
||||
|
||||
#ifdef MS_WIN32
|
||||
EXPORT(signed char) __stdcall s_tf_b(signed char c) { S; return c/3; }
|
||||
|
|
@ -405,6 +437,7 @@ EXPORT(PY_LONG_LONG) __stdcall s_tf_q(PY_LONG_LONG c) { S; return c/3; }
|
|||
EXPORT(unsigned PY_LONG_LONG) __stdcall s_tf_Q(unsigned PY_LONG_LONG c) { U; return c/3; }
|
||||
EXPORT(float) __stdcall s_tf_f(float c) { S; return c/3; }
|
||||
EXPORT(double) __stdcall s_tf_d(double c) { S; return c/3; }
|
||||
EXPORT(long double) __stdcall s_tf_D(long double c) { S; return c/3; }
|
||||
#endif
|
||||
/*******/
|
||||
|
||||
|
|
@ -420,6 +453,7 @@ EXPORT(PY_LONG_LONG) tf_bq(signed char x, PY_LONG_LONG c) { S; return c/3; }
|
|||
EXPORT(unsigned PY_LONG_LONG) tf_bQ(signed char x, unsigned PY_LONG_LONG c) { U; return c/3; }
|
||||
EXPORT(float) tf_bf(signed char x, float c) { S; return c/3; }
|
||||
EXPORT(double) tf_bd(signed char x, double c) { S; return c/3; }
|
||||
EXPORT(long double) tf_bD(signed char x, long double c) { S; return c/3; }
|
||||
EXPORT(void) tv_i(int c) { S; return; }
|
||||
|
||||
#ifdef MS_WIN32
|
||||
|
|
@ -435,6 +469,7 @@ EXPORT(PY_LONG_LONG) __stdcall s_tf_bq(signed char x, PY_LONG_LONG c) { S; retur
|
|||
EXPORT(unsigned PY_LONG_LONG) __stdcall s_tf_bQ(signed char x, unsigned PY_LONG_LONG c) { U; return c/3; }
|
||||
EXPORT(float) __stdcall s_tf_bf(signed char x, float c) { S; return c/3; }
|
||||
EXPORT(double) __stdcall s_tf_bd(signed char x, double c) { S; return c/3; }
|
||||
EXPORT(long double) __stdcall s_tf_bD(signed char x, long double c) { S; return c/3; }
|
||||
EXPORT(void) __stdcall s_tv_i(int c) { S; return; }
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -444,6 +444,7 @@ union result {
|
|||
#ifdef HAVE_LONG_LONG
|
||||
PY_LONG_LONG q;
|
||||
#endif
|
||||
long double D;
|
||||
double d;
|
||||
float f;
|
||||
void *p;
|
||||
|
|
|
|||
|
|
@ -977,6 +977,29 @@ Q_get_sw(void *ptr, Py_ssize_t size)
|
|||
*/
|
||||
|
||||
|
||||
static PyObject *
|
||||
D_set(void *ptr, PyObject *value, Py_ssize_t size)
|
||||
{
|
||||
long double x;
|
||||
|
||||
x = PyFloat_AsDouble(value);
|
||||
if (x == -1 && PyErr_Occurred()) {
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
" float expected instead of %s instance",
|
||||
value->ob_type->tp_name);
|
||||
return NULL;
|
||||
}
|
||||
memcpy(ptr, &x, sizeof(long double));
|
||||
_RET(value);
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
D_get(void *ptr, Py_ssize_t size)
|
||||
{
|
||||
long double val;
|
||||
memcpy(&val, ptr, sizeof(long double));
|
||||
return PyFloat_FromDouble(val);
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
d_set(void *ptr, PyObject *value, Py_ssize_t size)
|
||||
|
|
@ -1591,6 +1614,7 @@ static struct fielddesc formattable[] = {
|
|||
{ 'B', B_set, B_get, &ffi_type_uchar},
|
||||
{ 'c', c_set, c_get, &ffi_type_schar},
|
||||
{ 'd', d_set, d_get, &ffi_type_double, d_set_sw, d_get_sw},
|
||||
{ 'D', D_set, D_get, &ffi_type_longdouble},
|
||||
{ 'f', f_set, f_get, &ffi_type_float, f_set_sw, f_get_sw},
|
||||
{ 'h', h_set, h_get, &ffi_type_sshort, h_set_sw, h_get_sw},
|
||||
{ 'H', H_set, H_get, &ffi_type_ushort, H_set_sw, H_get_sw},
|
||||
|
|
@ -1673,6 +1697,7 @@ typedef struct { char c; int x; } s_int;
|
|||
typedef struct { char c; long x; } s_long;
|
||||
typedef struct { char c; float x; } s_float;
|
||||
typedef struct { char c; double x; } s_double;
|
||||
typedef struct { char c; long double x; } s_long_double;
|
||||
typedef struct { char c; char *x; } s_char_p;
|
||||
typedef struct { char c; void *x; } s_void_p;
|
||||
|
||||
|
|
@ -1684,6 +1709,8 @@ typedef struct { char c; void *x; } s_void_p;
|
|||
*/
|
||||
#define FLOAT_ALIGN (sizeof(s_float) - sizeof(float))
|
||||
#define DOUBLE_ALIGN (sizeof(s_double) - sizeof(double))
|
||||
#define LONGDOUBLE_ALIGN (sizeof(s_long_double) - sizeof(long double))
|
||||
|
||||
/* #define CHAR_P_ALIGN (sizeof(s_char_p) - sizeof(char*)) */
|
||||
#define VOID_P_ALIGN (sizeof(s_void_p) - sizeof(void*))
|
||||
|
||||
|
|
@ -1729,6 +1756,8 @@ ffi_type ffi_type_sint64 = { 8, LONG_LONG_ALIGN, FFI_TYPE_SINT64 };
|
|||
|
||||
ffi_type ffi_type_float = { sizeof(float), FLOAT_ALIGN, FFI_TYPE_FLOAT };
|
||||
ffi_type ffi_type_double = { sizeof(double), DOUBLE_ALIGN, FFI_TYPE_DOUBLE };
|
||||
ffi_type ffi_type_longdouble = { sizeof(long double), LONGDOUBLE_ALIGN,
|
||||
FFI_TYPE_LONGDOUBLE };
|
||||
|
||||
/* ffi_type ffi_type_longdouble */
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ union value {
|
|||
#ifdef HAVE_LONG_LONG
|
||||
PY_LONG_LONG ll;
|
||||
#endif
|
||||
long double D;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -283,6 +284,7 @@ struct tagPyCArgObject {
|
|||
#ifdef HAVE_LONG_LONG
|
||||
PY_LONG_LONG q;
|
||||
#endif
|
||||
long double D;
|
||||
double d;
|
||||
float f;
|
||||
void *p;
|
||||
|
|
|
|||
2
Modules/_ctypes/libffi/configure
vendored
2
Modules/_ctypes/libffi/configure
vendored
|
|
@ -3533,7 +3533,7 @@ x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TAR
|
|||
sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
|
||||
sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
|
||||
sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
|
||||
hppa-*-linux* | parisc-*-linux*) TARGET=PA; TARGETDIR=pa;;
|
||||
hppa*-*-linux* | parisc*-*-linux*) TARGET=PA; TARGETDIR=pa;;
|
||||
esac
|
||||
|
||||
if test $TARGETDIR = unknown; then
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TAR
|
|||
sh-*-linux* | sh[[34]]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
|
||||
sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
|
||||
sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
|
||||
hppa-*-linux* | parisc-*-linux*) TARGET=PA; TARGETDIR=pa;;
|
||||
hppa*-*-linux* | parisc*-*-linux*) TARGET=PA; TARGETDIR=pa;;
|
||||
esac
|
||||
|
||||
if test $TARGETDIR = unknown; then
|
||||
|
|
|
|||
|
|
@ -372,11 +372,20 @@ ptrace_enter_call(PyObject *self, void *key, PyObject *userObj)
|
|||
ProfilerEntry *profEntry;
|
||||
ProfilerContext *pContext;
|
||||
|
||||
/* In the case of entering a generator expression frame via a
|
||||
* throw (gen_send_ex(.., 1)), we may already have an
|
||||
* Exception set here. We must not mess around with this
|
||||
* exception, and some of the code under here assumes that
|
||||
* PyErr_* is its own to mess around with, so we have to
|
||||
* save and restore any current exception. */
|
||||
PyObject *last_type, *last_value, *last_tb;
|
||||
PyErr_Fetch(&last_type, &last_value, &last_tb);
|
||||
|
||||
profEntry = getEntry(pObj, key);
|
||||
if (profEntry == NULL) {
|
||||
profEntry = newProfilerEntry(pObj, key, userObj);
|
||||
if (profEntry == NULL)
|
||||
return;
|
||||
goto restorePyerr;
|
||||
}
|
||||
/* grab a ProfilerContext out of the free list */
|
||||
pContext = pObj->freelistProfilerContext;
|
||||
|
|
@ -389,10 +398,13 @@ ptrace_enter_call(PyObject *self, void *key, PyObject *userObj)
|
|||
malloc(sizeof(ProfilerContext));
|
||||
if (pContext == NULL) {
|
||||
pObj->flags |= POF_NOMEMORY;
|
||||
return;
|
||||
goto restorePyerr;
|
||||
}
|
||||
}
|
||||
initContext(pObj, pContext, profEntry);
|
||||
|
||||
restorePyerr:
|
||||
PyErr_Restore(last_type, last_value, last_tb);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -437,12 +437,15 @@ PySSL_issuer(PySSLObject *self)
|
|||
}
|
||||
|
||||
static PyObject *
|
||||
_create_dict_for_X509_NAME (X509_NAME *xname)
|
||||
_create_tuple_for_X509_NAME (X509_NAME *xname)
|
||||
{
|
||||
PyObject *pd = PyDict_New();
|
||||
PyObject *pt = NULL;
|
||||
PyObject *entry_tuple = NULL;
|
||||
int entry_count = X509_NAME_entry_count(xname);
|
||||
int index_counter;
|
||||
|
||||
if (pd == NULL)
|
||||
pt = PyTuple_New(entry_count);
|
||||
if (pt == NULL)
|
||||
return NULL;
|
||||
|
||||
for (index_counter = 0;
|
||||
|
|
@ -480,18 +483,20 @@ _create_dict_for_X509_NAME (X509_NAME *xname)
|
|||
Py_DECREF(name_obj);
|
||||
goto fail0;
|
||||
}
|
||||
if (PyDict_SetItem(pd, name_obj, value_obj) < 0) {
|
||||
entry_tuple = PyTuple_New(2);
|
||||
if (entry_tuple == NULL) {
|
||||
Py_DECREF(name_obj);
|
||||
Py_DECREF(value_obj);
|
||||
goto fail0;
|
||||
}
|
||||
Py_DECREF(name_obj);
|
||||
Py_DECREF(value_obj);
|
||||
PyTuple_SET_ITEM(entry_tuple, 0, name_obj);
|
||||
PyTuple_SET_ITEM(entry_tuple, 1, value_obj);
|
||||
PyTuple_SET_ITEM(pt, index_counter, entry_tuple);
|
||||
}
|
||||
return pd;
|
||||
return pt;
|
||||
|
||||
fail0:
|
||||
Py_XDECREF(pd);
|
||||
Py_XDECREF(pt);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
@ -520,7 +525,7 @@ PySSL_peercert(PySSLObject *self)
|
|||
if ((verification & SSL_VERIFY_PEER) == 0)
|
||||
return retval;
|
||||
|
||||
peer = _create_dict_for_X509_NAME(
|
||||
peer = _create_tuple_for_X509_NAME(
|
||||
X509_get_subject_name(self->peer_cert));
|
||||
if (peer == NULL)
|
||||
goto fail0;
|
||||
|
|
@ -530,7 +535,7 @@ PySSL_peercert(PySSLObject *self)
|
|||
}
|
||||
Py_DECREF(peer);
|
||||
|
||||
issuer = _create_dict_for_X509_NAME(
|
||||
issuer = _create_tuple_for_X509_NAME(
|
||||
X509_get_issuer_name(self->peer_cert));
|
||||
if (issuer == NULL)
|
||||
goto fail0;
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' |
|
|||
no) SHAREDMODS="$SHAREDMODS $file";;
|
||||
esac
|
||||
rule="$file: $objs"
|
||||
rule="$rule; \$(LDSHARED) $objs $libs $ExtraLibs -o $file"
|
||||
rule="$rule; \$(BLDSHARED) $objs $libs $ExtraLibs -o $file"
|
||||
echo "$rule" >>$rulesf
|
||||
done
|
||||
done
|
||||
|
|
|
|||
|
|
@ -6540,6 +6540,8 @@ typedef BOOL (WINAPI *CRYPTGENRANDOM)(HCRYPTPROV hProv, DWORD dwLen,\
|
|||
BYTE *pbBuffer );
|
||||
|
||||
static CRYPTGENRANDOM pCryptGenRandom = NULL;
|
||||
/* This handle is never explicitly released. Instead, the operating
|
||||
system will release it when the process terminates. */
|
||||
static HCRYPTPROV hCryptProv = 0;
|
||||
|
||||
static PyObject*
|
||||
|
|
|
|||
|
|
@ -198,12 +198,27 @@ set_hook(const char *funcname, PyObject **hook_var, PyObject *args)
|
|||
|
||||
/* Exported functions to specify hook functions in Python */
|
||||
|
||||
static PyObject *completion_display_matches_hook = NULL;
|
||||
static PyObject *startup_hook = NULL;
|
||||
|
||||
#ifdef HAVE_RL_PRE_INPUT_HOOK
|
||||
static PyObject *pre_input_hook = NULL;
|
||||
#endif
|
||||
|
||||
static PyObject *
|
||||
set_completion_display_matches_hook(PyObject *self, PyObject *args)
|
||||
{
|
||||
return set_hook("completion_display_matches_hook",
|
||||
&completion_display_matches_hook, args);
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(doc_set_completion_display_matches_hook,
|
||||
"set_completion_display_matches_hook([function]) -> None\n\
|
||||
Set or remove the completion display function.\n\
|
||||
The function is called as\n\
|
||||
function(substitution, [matches], longest_match_length)\n\
|
||||
once each time matches need to be displayed.");
|
||||
|
||||
static PyObject *
|
||||
set_startup_hook(PyObject *self, PyObject *args)
|
||||
{
|
||||
|
|
@ -245,6 +260,18 @@ static PyObject *begidx = NULL;
|
|||
static PyObject *endidx = NULL;
|
||||
|
||||
|
||||
/* Get the completion type for the scope of the tab-completion */
|
||||
static PyObject *
|
||||
get_completion_type(PyObject *self, PyObject *noarg)
|
||||
{
|
||||
return PyInt_FromLong(rl_completion_type);
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(doc_get_completion_type,
|
||||
"get_completion_type() -> int\n\
|
||||
Get the type of completion being attempted.");
|
||||
|
||||
|
||||
/* Get the beginning index for the scope of the tab-completion */
|
||||
|
||||
static PyObject *
|
||||
|
|
@ -557,6 +584,8 @@ static struct PyMethodDef readline_methods[] =
|
|||
METH_NOARGS, get_history_length_doc},
|
||||
{"set_completer", set_completer, METH_VARARGS, doc_set_completer},
|
||||
{"get_completer", get_completer, METH_NOARGS, doc_get_completer},
|
||||
{"get_completion_type", get_completion_type,
|
||||
METH_NOARGS, doc_get_completion_type},
|
||||
{"get_begidx", get_begidx, METH_NOARGS, doc_get_begidx},
|
||||
{"get_endidx", get_endidx, METH_NOARGS, doc_get_endidx},
|
||||
|
||||
|
|
@ -568,6 +597,8 @@ static struct PyMethodDef readline_methods[] =
|
|||
{"get_completer_delims", get_completer_delims,
|
||||
METH_NOARGS, doc_get_completer_delims},
|
||||
|
||||
{"set_completion_display_matches_hook", set_completion_display_matches_hook,
|
||||
METH_VARARGS, doc_set_completion_display_matches_hook},
|
||||
{"set_startup_hook", set_startup_hook,
|
||||
METH_VARARGS, doc_set_startup_hook},
|
||||
#ifdef HAVE_RL_PRE_INPUT_HOOK
|
||||
|
|
@ -631,6 +662,48 @@ on_pre_input_hook(void)
|
|||
#endif
|
||||
|
||||
|
||||
/* C function to call the Python completion_display_matches */
|
||||
|
||||
static void
|
||||
on_completion_display_matches_hook(char **matches,
|
||||
int num_matches, int max_length)
|
||||
{
|
||||
if (completion_display_matches_hook != NULL) {
|
||||
int i;
|
||||
PyObject *m, *s;
|
||||
PyObject *r;
|
||||
#ifdef WITH_THREAD
|
||||
PyGILState_STATE gilstate = PyGILState_Ensure();
|
||||
#endif
|
||||
m = PyList_New(num_matches);
|
||||
for (i = 0; i < num_matches; i++) {
|
||||
s = PyString_FromString(matches[i+1]);
|
||||
PyList_SetItem(m, i, s);
|
||||
}
|
||||
|
||||
r = PyObject_CallFunction(completion_display_matches_hook,
|
||||
"sOi", matches[0], m, max_length);
|
||||
|
||||
Py_DECREF(m);
|
||||
|
||||
if (r == NULL ||
|
||||
(r != Py_None && PyInt_AsLong(r) == -1 && PyErr_Occurred())) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
Py_DECREF(r);
|
||||
goto done;
|
||||
error:
|
||||
PyErr_Clear();
|
||||
Py_XDECREF(r);
|
||||
done:
|
||||
#ifdef WITH_THREAD
|
||||
PyGILState_Release(gilstate);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* C function to call the Python completer. */
|
||||
|
||||
static char *
|
||||
|
|
@ -708,6 +781,10 @@ setup_readline(void)
|
|||
rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
|
||||
rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
|
||||
/* Set our hook functions */
|
||||
#ifdef HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK
|
||||
rl_completion_display_matches_hook =
|
||||
(rl_compdisp_func_t *)on_completion_display_matches_hook;
|
||||
#endif
|
||||
rl_startup_hook = (Function *)on_startup_hook;
|
||||
#ifdef HAVE_RL_PRE_INPUT_HOOK
|
||||
rl_pre_input_hook = (Function *)on_pre_input_hook;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue