Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r96808:bc7aeb4d5987
Date: 2019-06-15 09:07 +0200
http://bitbucket.org/pypy/pypy/changeset/bc7aeb4d5987/
Log: merge heads
diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py
b/lib-python/2.7/distutils/sysconfig_pypy.py
--- a/lib-python/2.7/distutils/sysconfig_pypy.py
+++ b/lib-python/2.7/distutils/sysconfig_pypy.py
@@ -86,7 +86,7 @@
arch = platform.machine()
g['LDSHARED'] += ' -undefined dynamic_lookup'
g['CC'] += ' -arch %s' % (arch,)
- g['MACOSX_DEPLOYMENT_TARGET'] = 10.14
+ g['MACOSX_DEPLOYMENT_TARGET'] = '10.14'
global _config_vars
_config_vars = g
diff --git a/rpython/rlib/_rsocket_rffi.py b/rpython/rlib/_rsocket_rffi.py
--- a/rpython/rlib/_rsocket_rffi.py
+++ b/rpython/rlib/_rsocket_rffi.py
@@ -1426,10 +1426,10 @@
return rwin32.FormatError(errno)
def socket_strerror_unicode(errno):
- return rwin32.FormatErrorW(errno)[0]
+ return rwin32.FormatErrorW(errno)[0].decode('utf-8')
def gai_strerror_unicode(errno):
- return rwin32.FormatErrorW(errno)[0]
+ return rwin32.FormatErrorW(errno)[0].decode('utf-8')
def socket_strerror_utf8(errno):
return rwin32.FormatErrorW(errno)
diff --git a/rpython/rlib/rvmprof/src/shared/vmp_stack.c
b/rpython/rlib/rvmprof/src/shared/vmp_stack.c
--- a/rpython/rlib/rvmprof/src/shared/vmp_stack.c
+++ b/rpython/rlib/rvmprof/src/shared/vmp_stack.c
@@ -82,12 +82,6 @@
static PY_STACK_FRAME_T * _write_python_stack_entry(PY_STACK_FRAME_T * frame,
void ** result, int * depth, int max_depth)
{
- int len;
- int addr;
- int j;
- uint64_t line;
- char *lnotab;
-
#ifndef RPYTHON_VMPROF // pypy does not support line profiling
if (vmp_profiles_python_lines()) {
// In the line profiling mode we save a line number for every frame.
@@ -99,27 +93,8 @@
// NOTE: the profiling overhead can be reduced by storing co_lnotab in
the dump and
// moving this computation to the reader instead of doing it here.
- lnotab = PyStr_AS_STRING(frame->f_code->co_lnotab);
-
- if (lnotab != NULL) {
- line = (uint64_t)frame->f_lineno;
- addr = 0;
-
- len = (int)PyStr_GET_SIZE(frame->f_code->co_lnotab);
-
- for (j = 0; j < len; j += 2) {
- addr += lnotab[j];
- if (addr > frame->f_lasti) {
- break;
- }
- line += lnotab[j+1];
- }
- result[*depth] = (void*) line;
- *depth = *depth + 1;
- } else {
- result[*depth] = (void*) 0;
- *depth = *depth + 1;
- }
+ result[*depth] = (void*) (int64_t) PyFrame_GetLineNumber(frame);
+ *depth = *depth + 1;
}
result[*depth] = (void*)CODE_ADDR_TO_UID(FRAME_CODE(frame));
*depth = *depth + 1;
diff --git a/rpython/rlib/rvmprof/test/test_file.py
b/rpython/rlib/rvmprof/test/test_file.py
--- a/rpython/rlib/rvmprof/test/test_file.py
+++ b/rpython/rlib/rvmprof/test/test_file.py
@@ -37,7 +37,7 @@
#
if no_matches:
print
- print 'The following file dit NOT match'
+ print 'The following file did NOT match'
for f in no_matches:
print ' ', f.relto(RVMPROF)
raise AssertionError("some files were updated on github, "
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
