[Python-checkins] cpython (merge 3.4 -> 3.5): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/72cb2698387e
changeset:   103951:72cb2698387e
branch:      3.5
parent:      103946:2a9e0e869ca7
parent:      103949:ccfea26e6582
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 18 23:43:18 2016 -0700
summary:
  merge 3.4

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