Index: python.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/python.el,v
retrieving revision 1.102
diff -u -r1.102 python.el
--- python.el	7 Dec 2009 20:06:31 -0000	1.102
+++ python.el	28 Dec 2009 19:50:30 -0000
@@ -106,9 +106,9 @@
     (,(rx symbol-start "None" symbol-end)	; see § Keywords in 2.5 manual
      . font-lock-constant-face)
     ;; Definitions
-    (,(rx symbol-start (group "class") (1+ space) (group (1+ (or word ?_))))
+    (,(rx symbol-start (group "class") (? (1+ space) (group (1+ (or word ?_)))))
      (1 font-lock-keyword-face) (2 font-lock-type-face))
-    (,(rx symbol-start (group "def") (1+ space) (group (1+ (or word ?_))))
+    (,(rx symbol-start (group "def") (? (1+ space) (group (1+ (or word ?_)))))
      (1 font-lock-keyword-face) (2 font-lock-function-name-face))
     ;; Top-level assignments are worth highlighting.
     (,(rx line-start (group (1+ (or word ?_))) (0+ space) "=")