Merge with 3.2 #6528 None, True, False are keywords in 3.x. Patch by R. Serwy.

Lib/idlelib/ColorDelegator.py

@@ -15,7 +15,8 @@ def any(name, alternates):
 def make_pat():
     kw = r"\b" + any("KEYWORD", keyword.kwlist) + r"\b"
     builtinlist = [str(name) for name in dir(builtins)
-                                        if not name.startswith('_')]
+                                        if not name.startswith('_') and \
+                                        name not in keyword.kwlist]
     # self.file = open("file") :
     # 1st 'file' colorized normal, 2nd as builtin, 3rd as string
     builtin = r"([^.'\"\\#]\b|^)" + any("BUILTIN", builtinlist) + r"\b"

Lib/idlelib/configDialog.py

@@ -199,7 +199,7 @@ class ConfigDialog(Toplevel):
             ("'string'",'string'),('\n  var1 = ','normal'),("'selected'",'hilite'),
             ('\n  var2 = ','normal'),("'found'",'hit'),
             ('\n  var3 = ','normal'),('list', 'builtin'), ('(','normal'),
-            ('None', 'builtin'),(')\n\n','normal'),
+            ('None', 'keyword'),(')\n\n','normal'),
             (' error ','error'),(' ','normal'),('cursor |','cursor'),
             ('\n ','normal'),('shell','console'),(' ','normal'),('stdout','stdout'),
             (' ','normal'),('stderr','stderr'),('\n','normal'))