diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 979197be0c9..e17d73f174c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2007-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* progmodes/python.el (python-mode): Skip comments when parsing.
+
 	* vc-arch.el (vc-with-current-file-buffer): New macro.
 	(vc-arch-file-source-p): Use it to avoid infloop.
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 226d4bdc62d..1709428a611 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2225,6 +2225,7 @@ with skeleton expansions for compound statement templates.
 				   ;;  . python-font-lock-syntactic-face-function)
 				   ))
   (set (make-local-variable 'parse-sexp-lookup-properties) t)
+  (set (make-local-variable 'parse-sexp-ignore-comments) t)
   (set (make-local-variable 'comment-start) "# ")
   (set (make-local-variable 'indent-line-function) #'python-indent-line)
   (set (make-local-variable 'indent-region-function) #'python-indent-region)