From 5216721a532c348bcc59a03c7ee206f2cb2ae497 Mon Sep 17 00:00:00 2001 From: Amaury Forgeot d'Arc Date: Thu, 24 Apr 2008 18:07:05 +0000 Subject: [PATCH] Issue2681: the literal 0o8 was wrongly accepted, and evaluated as float(0.0). This happened only when 8 is the first digit. Credits go to Lukas Meuser. --- Lib/test/test_compile.py | 2 +- Misc/NEWS | 3 +++ Parser/tokenizer.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py index e8695acc46..e2a0ebec07 100644 --- a/Lib/test/test_compile.py +++ b/Lib/test/test_compile.py @@ -183,7 +183,7 @@ if 1: for arg in ["077787", "0xj", "0x.", "0e", "090000000000000", "080000000000000", "000000000000009", "000000000000008", "0b42", "0BADCAFE", "0o123456789", "0b1.1", "0o4.2", - "0b101j2", "0o153j2", "0b100e1", "0o777e1"]: + "0b101j2", "0o153j2", "0b100e1", "0o777e1", "0o8", "0o78"]: self.assertRaises(SyntaxError, eval, arg) self.assertEqual(eval("0777"), 511) diff --git a/Misc/NEWS b/Misc/NEWS index 3930929267..52aee8026f 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ What's New in Python 2.6 alpha 3? Core and builtins ----------------- +- Issue #2681: The octal literal ``0o8`` was incorrecly acctepted. Now it + properly raises a SyntaxError. + - Patch #2617: Reserved -J and -X arguments for Jython, IronPython and other implementations of Python. diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c index 29fb114291..1d0a4aa3f2 100644 --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -1351,7 +1351,7 @@ tok_get(register struct tok_state *tok, char **p_start, char **p_end) else if (c == 'o' || c == 'O') { /* Octal */ c = tok_nextc(tok); - if (c < '0' || c > '8') { + if (c < '0' || c >= '8') { tok->done = E_TOKEN; tok_backup(tok, c); return ERRORTOKEN; -- 2.40.0