From: Guido van Rossum <guido@python.org>
Date: Mon, 16 Mar 1992 18:30:24 +0000 (+0000)
Subject: Change the order in which Floatnumber and Intnumber are tried
X-Git-Tag: v0.9.8~478
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10d10ffb1b3c5d508b1f345ee40b19024e2514cc;p=thirdparty%2FPython%2Fcpython.git

Change the order in which Floatnumber and Intnumber are tried
so it will correctly recognize floats.
Fix the test program so it works again.
---

diff --git a/Lib/tokenize.py b/Lib/tokenize.py
index 6b3d991a960c..bd047f860d40 100644
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -22,7 +22,7 @@ Exponent = '[eE][-+]?[0-9]+'
 Pointfloat = '\([0-9]+\.[0-9]*\|\.[0-9]+\)\(' + Exponent + '\)?'
 Expfloat = '[0-9]+' + Exponent
 Floatnumber = Pointfloat + '\|' + Expfloat
-Number = Intnumber + '\|' + Floatnumber
+Number = Floatnumber + '\|' + Intnumber
 
 String = '\'\(\\\\.\|[^\\\n\']\)*\''
 
@@ -39,7 +39,8 @@ try:
 	save_syntax = regex.set_syntax(0) # Use default syntax
 	tokenprog = regex.compile(Token)
 finally:
-	dummy = regex.set_syntax(save_syntax) # Restore original syntax
+	if save_syntax != 0:
+		dummy = regex.set_syntax(save_syntax) # Restore original syntax
 
 
 def test(file):