# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1361787494 -3600
# Node ID d94d3a3ba5866d0c7348b612b0f63e79a3a8804b
# Parent  9064df1c2f9961fa69b211e1dd9fa117c1c3af59
[cwvreg] complete cw.web.uicfg cleanup callback (closes #2718217)

1dd655788ece introduced insufficient backward compat support

When cubes directly import uicfg from cubicweb.web (or uihelper) this
also creates a reference in the parent cubicweb.web namespace. This
must be cleaned up as reloaded cubes will take back this reference and
the old versions of its appobjects.

diff -r 9064df1c2f99 -r d94d3a3ba586 cwvreg.py
--- a/cwvreg.py	Thu Feb 28 11:19:36 2013 +0100
+++ b/cwvreg.py	Mon Feb 25 11:18:14 2013 +0100
@@ -210,16 +210,25 @@
 from yams.constraints import BASE_CONVERTERS
 
 from cubicweb import (CW_SOFTWARE_ROOT, ETYPE_NAME_MAP, CW_EVENT_MANAGER,
-                      Binary, UnknownProperty, UnknownEid)
+                      onevent, Binary, UnknownProperty, UnknownEid)
 from cubicweb.predicates import (implements, appobject_selectable,
                                  _reset_is_instance_cache)
 
-# backward compat: those modules are now refering to app objects in
-# cw.web.views.uicfg and import * from backward compat. On registry reload, we
-# should pop those modules from the cache so references are properly updated on
-# subsequent reload
-CW_EVENT_MANAGER.bind('before-registry-reload', partial(sys.modules.pop, 'cubicweb.web.uicfg', None))
-CW_EVENT_MANAGER.bind('before-registry-reload', partial(sys.modules.pop, 'cubicweb.web.uihelper', None))
+
+@onevent('before-registry-reload')
+def cleanup_uicfg_compat():
+    """ backward compat: those modules are now refering to app objects in
+    cw.web.views.uicfg and import * from backward compat. On registry reload, we
+    should pop those modules from the cache so references are properly updated on
+    subsequent reload
+    """
+    if 'cubicweb.web' in sys.modules:
+        if getattr(sys.modules['cubicweb.web'], 'uicfg', None):
+            del sys.modules['cubicweb.web'].uicfg
+        if getattr(sys.modules['cubicweb.web'], 'uihelper', None):
+            del sys.modules['cubicweb.web'].uihelper
+    sys.modules.pop('cubicweb.web.uicfg', None)
+    sys.modules.pop('cubicweb.web.uihelper', None)
 
 def use_interfaces(obj):
     """return interfaces required by the given object by searching for