From 5e66914fa2de38c35dbb7692b1bd64e54fa523af Mon Sep 17 00:00:00 2001
From: Mambu38 <tomvig38@gmail.com>
Date: Wed, 15 May 2019 12:58:48 +0200
Subject: [PATCH 1/2] Added pyimport support

---
 modules/lang/python/config.el   | 15 +++++++++++++++
 modules/lang/python/packages.el |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index 3ccbd46f1..ecea8d652 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -206,3 +206,18 @@ called.")
   (add-to-list 'global-mode-string
                '(conda-env-current-name (" conda:" conda-env-current-name " "))
                'append))
+
+
+;; Import managements
+(def-package! pyimport
+  :after python
+  :init
+  (map! :after python
+        :map 'python-mode-map
+        :localleader
+        (:prefix ("i" . "insert")
+          :desc "Missing imports" "m" #'pyimport-insert-missing)
+        (:prefix ("r" . "remove")
+          :desc "Unused imports" "r" #'pyimport-remove-unused)
+        )
+  )
diff --git a/modules/lang/python/packages.el b/modules/lang/python/packages.el
index 3ffc2308c..e43655be6 100644
--- a/modules/lang/python/packages.el
+++ b/modules/lang/python/packages.el
@@ -20,3 +20,6 @@
 ;; Testing frameworks
 (package! nose)
 (package! python-pytest)
+
+;; Import managements
+(package! pyimport)

From 7a252b6a470f77e874bfe52de8b8d849c62ea4e4 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <accounts@v0.io>
Date: Tue, 28 May 2019 17:02:10 -0400
Subject: [PATCH 2/2] Refactor pyimport def-package! block

---
 modules/lang/python/config.el | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index ecea8d652..688bf5bb1 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -94,6 +94,17 @@ called.")
         "u" #'anaconda-mode-find-references))
 
 
+(def-package! pyimport
+  :after python
+  :config
+  (map! :map python-mode-map
+        :localleader
+        (:prefix ("i" . "insert")
+          :desc "Missing imports" "m" #'pyimport-insert-missing)
+        (:prefix ("r" . "remove")
+          :desc "Unused imports" "r" #'pyimport-remove-unused)))
+
+
 (def-package! nose
   :commands nose-mode
   :preface (defvar nose-mode-map (make-sparse-keymap))
@@ -206,18 +217,3 @@ called.")
   (add-to-list 'global-mode-string
                '(conda-env-current-name (" conda:" conda-env-current-name " "))
                'append))
-
-
-;; Import managements
-(def-package! pyimport
-  :after python
-  :init
-  (map! :after python
-        :map 'python-mode-map
-        :localleader
-        (:prefix ("i" . "insert")
-          :desc "Missing imports" "m" #'pyimport-insert-missing)
-        (:prefix ("r" . "remove")
-          :desc "Unused imports" "r" #'pyimport-remove-unused)
-        )
-  )