[Erp5-report] r29861 - in /erp5/trunk/products/ERP5: Document/ mixin/

[nobody at svn.erp5.org]

Author: jp
Date: Tue Oct 20 17:48:29 2009
New Revision: 29861

URL: http://svn.erp5.org?rev=29861&view=rev
Log:
Moved more imports and methods from Document to cached_convertable

Modified:
    erp5/trunk/products/ERP5/Document/Document.py
    erp5/trunk/products/ERP5/mixin/cached_convertable.py

Modified: erp5/trunk/products/ERP5/Document/Document.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Document.py?rev=29861&r1=29860&r2=29861&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Document.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Document.py [utf8] Tue Oct 20 17:48:29 2009
@@ -42,7 +42,7 @@
 from Products.ERP5Type.Base import WorkflowMethod
 from Products.ERP5Type.TransactionalVariable import getTransactionalVariable
 from Products.ERP5Type.ExtensibleTraversable import ExtensibleTraversableMixIn
-from Products.ERP5Type.Cache import getReadOnlyTransactionCache, DEFAULT_CACHE_SCOPE
+from Products.ERP5Type.Cache import getReadOnlyTransactionCache
 from Products.ERP5.Document.Url import UrlMixIn
 from Products.ERP5.Tool.ContributionTool import MAX_REPEAT
 from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod
@@ -61,11 +61,6 @@
 VALID_ORDER_KEY_LIST = ('user_login', 'content', 'file_name', 'input')
 # these property ids are unchangable
 FIXED_PROPERTY_IDS =  ('id', 'uid', 'rid', 'sid')
-
-def makeSortedTuple(kw):
-  items = kw.items()
-  items.sort()
-  return tuple(items)
 
 class SnapshotMixin:
   """

Modified: erp5/trunk/products/ERP5/mixin/cached_convertable.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/cached_convertable.py?rev=29861&r1=29860&r2=29861&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/cached_convertable.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/cached_convertable.py [utf8] Tue Oct 20 17:48:29 2009
@@ -33,6 +33,11 @@
 from Products.ERP5Type import Permissions
 from Products.CMFCore.utils import getToolByName
 from Products.ERP5Type.Cache import DEFAULT_CACHE_SCOPE
+
+def makeSortedTuple(kw):
+  items = kw.items()
+  items.sort()
+  return tuple(items)
 
 class CachedConvertableMixin:
   """