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 6b3d991a960c570ef278ebbb89a72cbaaca44275..bd047f860d4050d81272d4f4c27b49dfd4ce3f63 100644 (file)
--- 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):