From 09b3a92c136bb064bf445677fd761467f0198df8 Mon Sep 17 00:00:00 2001
From: Rob Ruana <robruana@magfest.org>
Date: Sun, 23 Sep 2018 16:24:00 -0400
Subject: [PATCH] Updates pockets.inspect.import_star() so that it returns a
 map of attrs instead of setting them on the module

---
 pockets/inspect.py   | 27 ++++++++++++---------------
 pockets/iterators.py |  2 +-
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/pockets/inspect.py b/pockets/inspect.py
index 55aeae7..d948223 100644
--- a/pockets/inspect.py
+++ b/pockets/inspect.py
@@ -139,7 +139,9 @@ def hoist_submodules(package, extend_all=True):
     module = resolve(package)
     hoisted_attrs = []
     for submodule in import_submodules(module):
-        hoisted_attrs.extend(import_star(module, submodule))
+        for attr_name, attr in import_star(submodule).items():
+            hoisted_attrs.append(attr_name)
+            setattr(module, attr_name, attr)
 
     if extend_all:
         if getattr(module, '__all__', None) is None:
@@ -150,34 +152,29 @@ def hoist_submodules(package, extend_all=True):
     return hoisted_attrs
 
 
-def import_star(to_module, from_module):
+def import_star(module):
     """
-    Imports all exported attributes of `from_module` into `to_module`.
+    Imports all exported attributes of `module` and returns them in a `dict`.
 
     Note:
-        This only considers attributes exported by `__all__`. If `from_module`
+        This only considers attributes exported by `__all__`. If `module`
         does not define `__all__`, then nothing is imported.
 
     Effectively does::
 
-        from from_module import *
+        from module import *
 
     Args:
-        to_module (str or module): The module into which the attributes
-            are imported.
-        from_module (str or module): The module from which a wildcard import
+        module (str or module): The module from which a wildcard import
             should be done.
 
     Returns:
-        list: List of all imported attribute names.
+        dict: Map of all imported attributes.
 
     """
-    to_module = resolve(to_module)
-    from_module = resolve(from_module)
-    attrs = getattr(from_module, '__all__', [])
-    for attr in attrs:
-        setattr(to_module, attr, getattr(from_module, attr))
-    return attrs
+    module = resolve(module)
+    attrs = getattr(module, '__all__', [])
+    return dict([(attr, getattr(module, attr)) for attr in attrs])
 
 
 def import_submodules(package):
diff --git a/pockets/iterators.py b/pockets/iterators.py
index 2f5c5bc..8b6710d 100644
--- a/pockets/iterators.py
+++ b/pockets/iterators.py
@@ -42,7 +42,7 @@ class iterpeek(object):
 
     See Also:
         `iterpeek` can operate as a drop in replacement for the built-in
-        `iter <http://docs.python.org/2/library/functions.html#iter>`_
+        `iter <https://docs.python.org/3/library/functions.html#iter>`_
         function.
 
     Attributes: