changeset:   103952:d2f86d9c53b9
branch:      3.6
parent:      103947:dad511cd2fd0
parent:      103951:72cb2698387e
user:        Benjamin Peterson <benjamin@python.org>
date:        Sun Sep 18 23:44:02 2016 -0700
files:       Lib/test/test_dictviews.py Misc/NEWS Objects/dictobject.c Parser/tokenizer.c
description:
merge 3.5 (#24022)


diff -r dad511cd2fd0 -r d2f86d9c53b9 Parser/tokenizer.c
--- a/Parser/tokenizer.c	Sun Sep 18 21:46:08 2016 -0700
+++ b/Parser/tokenizer.c	Sun Sep 18 23:44:02 2016 -0700
@@ -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 {