Correctly remove 'import foo.bar as bar'.

Wilfred · Wilfred · commit 307549c65288 · 2017-03-03T15:22:33.000Z
diff --git a/pyimport.el b/pyimport.el
@@ -245,7 +245,13 @@ on line number LINE, remove VAR (e.g. 'baz')."
 
       (cond
        ;; If it's just 'import foo' or 'import foo.bar', just remove it.
-       ((looking-at (rx "import " (1+ (not (any space))) line-end))
+       ((looking-at (rx "import"
+                        (+ space)
+                        (+ (or (syntax word) (syntax symbol) (syntax punctuation)))
+                        (0+ space)
+                        (? "as" (+ space) (+ (or (syntax word) (syntax symbol))))
+                        (0+ space)
+                        line-end))
         (pyimport--delete-current-line))
 
        ;; Otherwise, it's '... import foo' or '... import foo as bar'
diff --git a/test/pyimport-test.el b/test/pyimport-test.el
@@ -40,6 +40,14 @@
     (should
      (equal (buffer-string) ""))))
 
+(ert-deftest remove-import-as-alias ()
+  "Ensure we remove imports correctly when there are aliases."
+  (with-temp-buffer
+    (insert "import foo.bar as bar")
+    (pyimport--remove-import 1 "bar")
+    (should
+     (equal (buffer-string) ""))))
+
 (ert-deftest remove-on-line-first ()
   "We should remove the first occurrence, if present."
   (with-temp-buffer
