[Erp5-report] r18231 - /erp5/trunk/products/ERP5Type/Core/Folder.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Dec 11 14:38:55 2007
New Revision: 18231

URL: http://svn.erp5.org?rev=18231&view=rev
Log:
* passing DomainSelection instance as selection_domain or selection_report is deprecated.

Modified:
    erp5/trunk/products/ERP5Type/Core/Folder.py

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=18231&r1=18230&r2=18231&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py Tue Dec 11 14:38:55 2007
@@ -305,10 +305,20 @@
     # We do not have conflicting parent uid values
     delete_parent_uid = 0
     if kw.has_key('selection_domain'):
-      if kw['selection_domain'].asDomainDict().has_key('parent'):
+      if not isinstance(kw['selection_domain'], dict):
+        warnings.warn("To pass a DomainSelection instance is deprecated.\n"
+                      "Please use a domain dict instead.",
+                      DeprecationWarning)
+        kw['selection_domain'] = kw['selection_domain'].asDomainDict()
+      if kw['selection_domain'].has_key('parent'):
         delete_parent_uid = 1
     if kw.has_key('selection_report'):
-      if kw['selection_report'].asDomainDict().has_key('parent'):
+      if not isinstance(kw['selection_report'], dict):
+        warnings.warn("To pass a DomainSelection instance is deprecated.\n"
+                      "Please use a domain dict instead.",
+                      DeprecationWarning)
+        kw['selection_report'] = kw['selection_report'].asDomainDict()
+      if kw['selection_report'].has_key('parent'): 
         delete_parent_uid = 1
     if delete_parent_uid:
       del kw['parent_uid']