[Erp5-report] r38667 nicolas.dumazet - in /erp5/trunk/products/ERP5Type: Dynamic/ patches/

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Mon Sep 27 16:05:29 2010
New Revision: 38667

URL: http://svn.erp5.org?rev=38667&view=rev
Log:
delay imports to avoid circular imports

Modified:
    erp5/trunk/products/ERP5Type/Dynamic/portaltypeclass.py
    erp5/trunk/products/ERP5Type/patches/getSite.py

Modified: erp5/trunk/products/ERP5Type/Dynamic/portaltypeclass.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Dynamic/portaltypeclass.py?rev=38667&r1=38666&r2=38667&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Dynamic/portaltypeclass.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Dynamic/portaltypeclass.py [utf8] Mon Sep 27 16:05:29 2010
@@ -6,7 +6,7 @@ import sys
 import inspect
 from types import ModuleType
 
-from Products.ERP5Type.patches.getSite import getSite
+from zope.site.hooks import getSite
 from Products.ERP5Type.Globals import InitializeClass
 from Products.ERP5Type.Utils import setDefaultClassProperties
 

Modified: erp5/trunk/products/ERP5Type/patches/getSite.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/getSite.py?rev=38667&r1=38666&r2=38667&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/getSite.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/getSite.py [utf8] Mon Sep 27 16:05:29 2010
@@ -1,4 +1,3 @@
-from Products.ERP5Type.Dynamic.portaltypeclass import synchronizeDynamicModules
 from Products.ERP5Type import Globals
 module_name = 'zope.site.hooks'
 try:
@@ -38,5 +37,6 @@ hooks.getSite = getSite
 last_cookie_value = None
 def setSite(site=None):
   _setSite(site)
+  from Products.ERP5Type.Dynamic.portaltypeclass import synchronizeDynamicModules
   synchronizeDynamicModules(site)
 hooks.setSite = setSite