changeset:   88373:875a514671dd
branch:      3.3
parent:      88370:fafac90b69c4
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Thu Jan 09 20:12:49 2014 +0200
files:       Lib/test/test_traceback.py Parser/tokenizer.c
description:
Do not reset the line number because we already set file position to correct
value.

(fixes error in patch for issue #18960)


diff -r fafac90b69c4 -r 875a514671dd Lib/test/test_traceback.py
--- a/Lib/test/test_traceback.py	Thu Jan 09 11:10:30 2014 -0600
+++ b/Lib/test/test_traceback.py	Thu Jan 09 20:12:49 2014 +0200
@@ -146,6 +146,10 @@
                     text, charset, 4)
             do_test("#!shebang\n# coding: {0}\n".format(charset),
                     text, charset, 5)
+            do_test(" \t\f\n# coding: {0}\n".format(charset),
+                    text, charset, 5)
+        # Issue #18960: coding spec should has no effect
+        do_test("0\n# coding: GBK\n", "h\xe9 ho", 'utf-8', 5)
 
 
 class TracebackFormatTests(unittest.TestCase):
diff -r fafac90b69c4 -r 875a514671dd Parser/tokenizer.c
--- a/Parser/tokenizer.c	Thu Jan 09 11:10:30 2014 -0600
+++ b/Parser/tokenizer.c	Thu Jan 09 20:12:49 2014 +0200
@@ -514,14 +514,6 @@
     readline = _PyObject_GetAttrId(stream, &PyId_readline);
     tok->decoding_readline = readline;
 
-    /* The file has been reopened; parsing will restart from
-     * the beginning of the file, we have to reset the line number.
-     * But this function has been called from inside tok_nextc() which
-     * will increment lineno before it returns. So we set it -1 so that
-     * the next call to tok_nextc() will start with tok->lineno == 0.
-     */
-    tok->lineno = -1;
-
   cleanup:
     Py_XDECREF(stream);
     Py_XDECREF(io);