[Erp5-report] r43759 kazuhiko - in /erp5/trunk/products: ERP5/Document/ ERP5Type/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Feb 25 16:04:18 2011
New Revision: 43759

URL: http://svn.erp5.org?rev=43759&view=rev
Log:
no longer use legacy API in WebSite.

Modified:
    erp5/trunk/products/ERP5/Document/WebSite.py
    erp5/trunk/products/ERP5Type/ExtensibleTraversable.py

Modified: erp5/trunk/products/ERP5/Document/WebSite.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/WebSite.py?rev=43759&r1=43758&r2=43759&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/WebSite.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/WebSite.py [utf8] Fri Feb 25 16:04:18 2011
@@ -35,6 +35,7 @@ from Products.ERP5Type.Globals import ge
 from Persistence import Persistent
 from ZPublisher import BeforeTraverse
 from ZPublisher.HTTPRequest import HTTPRequest
+from warnings import warn
 
 WEBSITE_KEY = 'web_site_value'
 WEBSITE_LANGUAGE_KEY = 'web_site_language'
@@ -163,7 +164,7 @@ class WebSite(WebSection):
         return self
 
     # Static Language Selection support
-    def _getExtensibleContent(self, request, name):
+    def getExtensibleContent(self, request, name):
       language_list = self.getAvailableLanguageList()
       if language_list and self.isStaticLanguageSelection():
         # Interprete names which could be a language
@@ -176,6 +177,14 @@ class WebSite(WebSection):
           return self.asContext(id=name)
       return WebSection.getExtensibleContent(self, request, name)
 
+    def _getExtensibleContent(self, request, name):
+      """
+      Legacy API
+      """
+      warn("_getExtensibleContent() function is deprecated. Use getExtensibleContent() instead.", \
+            DeprecationWarning, stacklevel=2)
+      return self.getExtensibleContent(request, name)
+
     # Virtual Hosting Support
     security.declarePrivate( 'manage_beforeDelete' )
     def manage_beforeDelete(self, item, container):

Modified: erp5/trunk/products/ERP5Type/ExtensibleTraversable.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/ExtensibleTraversable.py?rev=43759&r1=43758&r2=43759&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/ExtensibleTraversable.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/ExtensibleTraversable.py [utf8] Fri Feb 25 16:04:18 2011
@@ -40,7 +40,7 @@ class ExtensibleTraversableMixIn:
       except KeyError:
         pass
 
-      document = self._getExtensibleContent(request, name)
+      document = self.getExtensibleContent(request, name)
       if document is not None:
         return aq_base(document).__of__(self)