[Python-checkins] cpython (merge 3.6 -> default): merge 3.6

[benjamin.peterson]

https://hg.python.org/cpython/rev/ca6984a784a9
changeset:   103953:ca6984a784a9
parent:      103948:2d7d7d1f14d5
parent:      103952:d2f86d9c53b9
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 18 23:44:15 2016 -0700
summary:
  merge 3.6

files:
  Parser/tokenizer.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -1025,7 +1025,7 @@
                 else {
                     tok->done = E_OK;
                     tok->inp = strchr(tok->buf, '\0');
-                    done = tok->inp[-1] == '\n';
+                    done = tok->inp == tok->buf || tok->inp[-1] == '\n';
                 }
             }
             else {

-- 
Repository URL: https://hg.python.org/cpython