[Erp5-report] r27960 - in /erp5/trunk/products/ERP5Type/Tool: CacheTool.py MemcachedTool.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Mon Jul  6 11:12:57 2009
New Revision: 27960

URL: http://svn.erp5.org?rev=27960&view=rev
Log:
revert r27925 as scheme is not required and this modification is too brutal

Modified:
    erp5/trunk/products/ERP5Type/Tool/CacheTool.py
    erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py

Modified: erp5/trunk/products/ERP5Type/Tool/CacheTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Tool/CacheTool.py?rev=27960&r1=27959&r2=27960&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Tool/CacheTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Tool/CacheTool.py [utf8] Mon Jul  6 11:12:57 2009
@@ -86,7 +86,7 @@
           if getattr(cp, 'getSpecialiseValue', None) is not None:
             memcached_plugin = cp.getSpecialiseValue()
             if memcached_plugin is not None:
-              server = memcached_plugin.getUrlString('')[len('memcached://'):]
+              server = memcached_plugin.getUrlString('')
               init_dict = {
                 'server': server,
                 'server_max_key_length': memcached_plugin.getServerMaxKeyLength(),

Modified: erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py?rev=27960&r1=27959&r2=27960&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Tool/MemcachedTool.py [utf8] Mon Jul  6 11:12:57 2009
@@ -282,8 +282,7 @@
         memcached_plugin = self.restrictedTraverse(plugin_path, None)
         if memcached_plugin is None:
           raise ValueError, 'Memcached Plugin does not exists: %r' % (plugin_path,)
-        url_string = memcached_plugin.getUrlString('')[len('memcached://'):]
-        dictionary = MemcachedDict((url_string,),
+        dictionary = MemcachedDict((memcached_plugin.getUrlString(''),),
                    server_max_key_length=memcached_plugin.getServerMaxKeyLength(),
                    server_max_value_length=memcached_plugin.getServerMaxValueLength())
         memcached_dict_pool.memcached_dict = dictionary