[Erp5-report] r39205 jm - /erp5/trunk/products/ERP5Type/patches/FSZSQLMethod.py

[nobody at svn.erp5.org]

Author: jm
Date: Fri Oct 15 00:40:44 2010
New Revision: 39205

URL: http://svn.erp5.org?rev=39205&view=rev
Log:
Revert r39200 (which does not work with CMF 1.5)

Modified:
    erp5/trunk/products/ERP5Type/patches/FSZSQLMethod.py

Modified: erp5/trunk/products/ERP5Type/patches/FSZSQLMethod.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/FSZSQLMethod.py?rev=39205&r1=39204&r2=39205&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/FSZSQLMethod.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/FSZSQLMethod.py [utf8] Fri Oct 15 00:40:44 2010
@@ -7,14 +7,15 @@
 #
 
 from Products.CMFCore.FSZSQLMethod import FSZSQLMethod
+from Products.CMFCore.utils import expandpath
 from Products.ZSQLMethods.SQL import SQL
 
 def FSZSQLMethod_readFile(self, reparse):
-    file = open(self._filepath, 'r') # not 'rb', as this is a text file!
+    fp = expandpath(self._filepath)
+    file = open(fp, 'r')    # not 'rb', as this is a text file!
     try:
         data = file.read()
-    finally:
-        file.close()
+    finally: file.close()
 
     RESPONSE = {}
     RESPONSE['BODY'] = data