mirror of https://github.com/python/cpython
Merge heads
This commit is contained in:
commit
9c17ff91f3
2
.hgeol
2
.hgeol
|
@ -38,6 +38,8 @@ Lib/test/xmltestdata/* = BIN
|
||||||
|
|
||||||
Lib/venv/scripts/nt/* = BIN
|
Lib/venv/scripts/nt/* = BIN
|
||||||
|
|
||||||
|
Lib/test/coding20731.py = BIN
|
||||||
|
|
||||||
# All other files (which presumably are human-editable) are "native".
|
# All other files (which presumably are human-editable) are "native".
|
||||||
# This must be the last rule!
|
# This must be the last rule!
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
#coding:latin1
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ from test.support import TESTFN, unlink, unload
|
||||||
import importlib
|
import importlib
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
import subprocess
|
||||||
|
|
||||||
class SourceEncodingTest(unittest.TestCase):
|
class SourceEncodingTest(unittest.TestCase):
|
||||||
|
|
||||||
|
@ -58,6 +59,14 @@ class SourceEncodingTest(unittest.TestCase):
|
||||||
# two bytes in common with the UTF-8 BOM
|
# two bytes in common with the UTF-8 BOM
|
||||||
self.assertRaises(SyntaxError, eval, b'\xef\xbb\x20')
|
self.assertRaises(SyntaxError, eval, b'\xef\xbb\x20')
|
||||||
|
|
||||||
|
def test_20731(self):
|
||||||
|
sub = subprocess.Popen([sys.executable,
|
||||||
|
os.path.join(os.path.dirname(__file__),
|
||||||
|
'coding20731.py')],
|
||||||
|
stderr=subprocess.PIPE)
|
||||||
|
err = sub.communicate()[1]
|
||||||
|
self.assertEquals(err, b'')
|
||||||
|
|
||||||
def test_error_message(self):
|
def test_error_message(self):
|
||||||
compile(b'# -*- coding: iso-8859-15 -*-\n', 'dummy', 'exec')
|
compile(b'# -*- coding: iso-8859-15 -*-\n', 'dummy', 'exec')
|
||||||
compile(b'\xef\xbb\xbf\n', 'dummy', 'exec')
|
compile(b'\xef\xbb\xbf\n', 'dummy', 'exec')
|
||||||
|
|
|
@ -8,6 +8,9 @@ What's New in Python 3.4.1?
|
||||||
Core and Builtins
|
Core and Builtins
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
|
- Issue #20731: Properly position in source code files even if they
|
||||||
|
are opened in text mode. Patch by Serhiy Storchaka.
|
||||||
|
|
||||||
- Issue #20637: Key-sharing now also works for instance dictionaries of
|
- Issue #20637: Key-sharing now also works for instance dictionaries of
|
||||||
subclasses. Patch by Peter Ingebretson.
|
subclasses. Patch by Peter Ingebretson.
|
||||||
|
|
||||||
|
|
|
@ -498,9 +498,13 @@ fp_setreadl(struct tok_state *tok, const char* enc)
|
||||||
|
|
||||||
fd = fileno(tok->fp);
|
fd = fileno(tok->fp);
|
||||||
/* Due to buffering the file offset for fd can be different from the file
|
/* Due to buffering the file offset for fd can be different from the file
|
||||||
* position of tok->fp. */
|
* position of tok->fp. If tok->fp was opened in text mode on Windows,
|
||||||
|
* its file position counts CRLF as one char and can't be directly mapped
|
||||||
|
* to the file offset for fd. Instead we step back one byte and read to
|
||||||
|
* the end of line.*/
|
||||||
pos = ftell(tok->fp);
|
pos = ftell(tok->fp);
|
||||||
if (pos == -1 || lseek(fd, (off_t)pos, SEEK_SET) == (off_t)-1) {
|
if (pos == -1 ||
|
||||||
|
lseek(fd, (off_t)(pos > 0 ? pos - 1 : pos), SEEK_SET) == (off_t)-1) {
|
||||||
PyErr_SetFromErrnoWithFilename(PyExc_OSError, NULL);
|
PyErr_SetFromErrnoWithFilename(PyExc_OSError, NULL);
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
@ -513,6 +517,12 @@ fp_setreadl(struct tok_state *tok, const char* enc)
|
||||||
Py_XDECREF(tok->decoding_readline);
|
Py_XDECREF(tok->decoding_readline);
|
||||||
readline = _PyObject_GetAttrId(stream, &PyId_readline);
|
readline = _PyObject_GetAttrId(stream, &PyId_readline);
|
||||||
tok->decoding_readline = readline;
|
tok->decoding_readline = readline;
|
||||||
|
if (pos > 0) {
|
||||||
|
if (PyObject_CallObject(readline, NULL) == NULL) {
|
||||||
|
readline = NULL;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
Py_XDECREF(stream);
|
Py_XDECREF(stream);
|
||||||
|
|
Loading…
Reference in New Issue