summaryrefslogtreecommitdiff
path: root/Parser
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-09-18 23:43:18 -0700
committerBenjamin Peterson <benjamin@python.org>2016-09-18 23:43:18 -0700
commit57bda335e1ec1e5dfa7972ad118f0a1e5f539ec6 (patch)
treeaf822fd1e3dc0ed133291a1d84bd863dfe662eed /Parser
parent7eb1becc2502723ebcdcc56972e41c03ef80d6af (diff)
parent26d998cfdd1f843a154e5398d09c0270fa17aa30 (diff)
downloadcpython-git-57bda335e1ec1e5dfa7972ad118f0a1e5f539ec6.tar.gz
merge 3.4
Diffstat (limited to 'Parser')
-rw-r--r--Parser/tokenizer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index eda1542b67..612cb23545 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -1025,7 +1025,7 @@ tok_nextc(struct tok_state *tok)
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 {