# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1269948499 -7200
# Node ID ea66c4aabb47b954f3bc6bf3652e34ad2c1bd46e
# Parent  dc448c9ad9ddc25431f4fcf21006bd695a370929
[appobject imports] don't include __init__ in package's name. See comment for more info

diff -r dc448c9ad9dd -r ea66c4aabb47 vregistry.py
--- a/vregistry.py	Tue Mar 30 13:27:30 2010 +0200
+++ b/vregistry.py	Tue Mar 30 13:28:19 2010 +0200
@@ -48,7 +48,21 @@
             subfiles = [join(fileordir, fname) for fname in listdir(fileordir)]
             _toload_info(subfiles, extrapath, _toload)
         elif fileordir[-3:] == '.py':
-            modname = '.'.join(modpath_from_file(fileordir, extrapath))
+            modpath = modpath_from_file(fileordir, extrapath)
+            # omit '__init__' from package's name to avoid loading that module
+            # once for each name when it is imported by some other appobject
+            # module. This supposes import in modules are done as::
+            #
+            #   from package import something
+            #
+            # not::
+            #
+            #  from package.__init__ import something
+            #
+            # which seems quite correct.
+            if modpath[-1] == '__init__':
+                modpath.pop()
+            modname = '.'.join(modpath)
             _toload[0][modname] = fileordir
             _toload[1].append((fileordir, modname))
     return _toload