Re: python-find-imports fails on multi-line import statements

From: Dave Love <fx@gnu.org>
To: "Michael Droettboom" <mike@droettboom.com>
Cc: bug-gnu-emacs@gnu.org
Subject: Re: python-find-imports fails on multi-line import statements
Date: Sat, 08 Sep 2007 12:54:42 +0100	[thread overview]
Message-ID: <msejh92wzh.fsf@marvin.smb.man.ac.uk> (raw)
In-Reply-To: <7b2578730709071059k1ed3a09dj26eaebc633d0b294@mail.gmail.com> (Michael Droettboom's message of "Fri\, 7 Sep 2007 13\:59\:53 -0400")

[-- Attachment #1: Type: text/plain, Size: 342 bytes --]

"Michael Droettboom" <mike@droettboom.com> writes:

> I imagine this can be fixed by tinkering with the regular
> expressions/filtering in python-find-imports, but I'm not much of an
> emacs lisp hacker.

Yes, I was sloppy.  Thanks.  It's fixed in
http://www.loveshack.ukfsn.org/emacs/python-21.el.  Perhaps this will
apply to your version:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 678 bytes --]

--- python-21.el	2007/08/30 22:22:45	1.47
+++ python-21.el	2007/09/08 11:44:55	1.48
@@ -1935,9 +1935,13 @@
 	(goto-char (point-min))
 	(while (re-search-forward "^import\\>\\|^from\\>" nil t)
 	  (unless (syntax-ppss-context (syntax-ppss))
-	    (push (buffer-substring (line-beginning-position)
-				    (line-beginning-position 2))
-		  lines)))
+	    (let ((start (line-beginning-position)))
+	      ;; Skip over continued lines.
+	      (while (and (eq ?\\ (char-before (line-end-position)))
+			  (= 0 (forward-line 1)))
+		t)
+	      (push (buffer-substring start (line-beginning-position 2))
+		    lines))))
 	(setq python-imports
 	      (if lines
 		  (apply #'concat

[-- Attachment #3: Type: text/plain, Size: 149 bytes --]

_______________________________________________
bug-gnu-emacs mailing list
bug-gnu-emacs@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs
