Merge pull request #733 from izaid/various

Made registry loading happening in dynd rather than dynd.nd

Author: izaid

dynd/__init__.py

@@ -19,3 +19,7 @@
     '__libdynd_version__', '__version__', '__libdynd_git_sha1__', '__git_sha1__',
     'annotate', 'test', 'load'
 ]
+
+from .nd.registry import propagate_all
+
+propagate_all()

dynd/nd/__init__.py

@@ -15,7 +15,4 @@
 inf = float('inf')
 nan = float('nan')
 
-from .registry import publish_callables
 from . import functional
-
-publish_callables()

dynd/nd/registry.pxd

@@ -1,4 +1,8 @@
+from libcpp.map cimport map
+from libcpp.pair cimport pair
+from libcpp.string cimport string
 
+from ..cpp.callable cimport callable
 from ..cpp.registry cimport registered, registry_entry
 
-cdef extern _publish_callables(registry_entry &entry)
+cdef extern void propagate(registry_entry *entry)

dynd/nd/registry.pyx

@@ -5,44 +5,36 @@ import sys
 
 from cython.operator cimport dereference
 
-from ..cpp.callable cimport callable, registered, registry_entry
-from ..cpp.registry cimport registered, registry_entry
-from ..cpp.config cimport load
-
 from ..config cimport translate_exception
 from .callable cimport wrap
 from .array cimport _registry_assign_init as assign_init
 
 assign_init()
 
-from libcpp.map cimport map
-from libcpp.pair cimport pair
-from libcpp.string cimport string
-
 from cython.operator import preincrement
 
-cdef void add_one(registry_entry *parent_entry, const char *name, registry_entry *entry) with gil:
+cdef void update(registry_entry *parent_entry, const char *name, registry_entry *entry) with gil:
     if (entry.is_namespace()):
         try:
             new_mod = sys.modules[entry.path()]
         except KeyError:
             new_mod = imp.new_module(entry.path())
             sys.modules[entry.path()] = new_mod
-        _publish_callables(dereference(entry))
+        propagate(entry)
         if (not parent_entry.path().empty()):
             mod = sys.modules[parent_entry.path()]
             setattr(mod, name, new_mod)
     else:
         mod = sys.modules[parent_entry.path()]
         setattr(mod, name, wrap(entry.value()))
 
-cdef _publish_callables(registry_entry &entry):
-    entry.observe(&add_one)
+cdef void propagate(registry_entry *entry):
+    entry.observe(update)
 
     cdef map[string, registry_entry].iterator it = entry.begin()
     while (it != entry.end()):
-        add_one(&entry, dereference(it).first.c_str(), &dereference(it).second)
+        update(entry, dereference(it).first.c_str(), &dereference(it).second)
         preincrement(it)
 
-def publish_callables():
-    return _publish_callables(registered())
+def propagate_all():
+    return propagate(&registered())