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

[nobody at svn.erp5.org]

Author: daniele
Date: Fri Apr 16 11:59:27 2010
New Revision: 34613

URL: http://svn.erp5.org?rev=34613&view=rev
Log:
Change 'method' argument given at generateNewId, this argument is now 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=34613&r1=34612&r2=34613&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py [utf8] Fri Apr 16 11:59:27 2010
@@ -127,9 +127,12 @@
     # The only case where the id is unused (because the new object is not added
     # to its parent) is when a temp object is created inside a non-temp object.
     if id is None and (temp_container or not temp_object):
-      new_id = str(container.generateNewId( id_group=id_group,
-                                            default=default,
-                                            method=method))
+      new_id_kw = {}
+      if method is not None:
+        new_id_kw['method'] = method
+      new_id = str(container.generateNewId(id_group=id_group,
+                                           default=default,
+                                           **new_id_kw))
     else:
       new_id = str(id)
 
@@ -254,8 +257,11 @@
       while self.hasContent(my_id):
         my_id = idGenerator()
     else:
+      new_id_kw = {}
+      if method is not None:
+        new_id_kw['method'] = method
       my_id = str(self.portal_ids.generateNewId(id_generator='document',
-                  id_group=id_group, default=default, method=method ))
+                  id_group=id_group, default=default, **new_id_kw))
     return my_id
 
   security.declareProtected(Permissions.View, 'hasContent')