diff options
author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2015-01-23 19:36:54 +0000 |
---|---|---|
committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2015-01-23 19:36:54 +0000 |
commit | 8fa7954e4ef26dcf377019236cc2171fb8be8355 (patch) | |
tree | a1e6fd2f3384fb9656a70174a65ea0a04ffd4861 /Python/traceback.c | |
parent | a2f7d2bf741a71f23cbf154cc292e610086f431f (diff) | |
parent | c8962fe46dc4b0bfa761087a8e095e0fb001fb34 (diff) | |
download | cpython-8fa7954e4ef26dcf377019236cc2171fb8be8355.tar.gz |
Closes #23202: pyvenv documentation updated to match its behavior.
Diffstat (limited to 'Python/traceback.c')
-rw-r--r-- | Python/traceback.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Python/traceback.c b/Python/traceback.c index c2aba522bf..e3adc96ae8 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -231,7 +231,7 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject * } strcpy(namebuf, PyBytes_AS_STRING(path)); Py_DECREF(path); - if (strlen(namebuf) != len) + if (strlen(namebuf) != (size_t)len) continue; /* v contains '\0' */ if (len > 0 && namebuf[len-1] != SEP) namebuf[len++] = SEP; @@ -575,15 +575,16 @@ dump_ascii(int fd, PyObject *text) ch = PyUnicode_READ(kind, data, i); else ch = wstr[i]; - if (ch < 128) { + if (' ' <= ch && ch <= 126) { + /* printable ASCII character */ char c = (char)ch; write(fd, &c, 1); } - else if (ch < 0xff) { + else if (ch <= 0xff) { PUTS(fd, "\\x"); dump_hexadecimal(fd, ch, 2); } - else if (ch < 0xffff) { + else if (ch <= 0xffff) { PUTS(fd, "\\u"); dump_hexadecimal(fd, ch, 4); } @@ -678,7 +679,7 @@ write_thread_id(int fd, PyThreadState *tstate, int is_current) PUTS(fd, "Current thread 0x"); else PUTS(fd, "Thread 0x"); - dump_hexadecimal(fd, (unsigned long)tstate->thread_id, sizeof(long)*2); + dump_hexadecimal(fd, (unsigned long)tstate->thread_id, sizeof(unsigned long)*2); PUTS(fd, " (most recent call first):\n"); } |