Merge pull request #7 from Wilfred/import_position_again

Wilfred · web-flow · commit a6f63cf7ed93 · 2018-03-08T17:52:17.000Z
Fix import position
diff --git a/pyimport.el b/pyimport.el
@@ -138,7 +138,7 @@ To terminate the loop early, throw 'break."
                 (when (and (not (looking-at "\n"))
                            (not (looking-at "#"))
                            (not (looking-at "\""))
-                           (or (not string-comment-p) t))
+                           (not string-comment-p))
                   (setq insert-pos (point))
                   (throw 'found nil)))))
           (insert line "\n"))))))
diff --git a/test/pyimport-test.el b/test/pyimport-test.el
@@ -163,11 +163,11 @@
 (ert-deftest pyimport-insert-import-module-docstring ()
   "Test inserting an import when the module starts with a docstring."
   (with-temp-buffer
-    (insert "\"\"\"hello world.\n\n\"\"\"\n\nfrom bar import y")
+    (insert "\"\"\"hello world.\nfoo bar.\n\n\"\"\"\n\nfrom bar import y")
     (pyimport--insert-import "from foo import x")
     (should
      (equal (buffer-string)
-            "\"\"\"hello world.\n\n\"\"\"\n\nfrom foo import x\nfrom bar import y"))))
+            "\"\"\"hello world.\nfoo bar.\n\n\"\"\"\n\nfrom foo import x\nfrom bar import y"))))
 
 (ert-deftest pyimport-extract-simple-import ()
   (should
