[CMF-checkins] CVS: CMF/CMFCore - FSDTMLMethod.py:1.16.4.1 FSPageTemplate.py:1.18.18.2 FSPropertiesObject.py:1.15.12.1 FSZSQLMethod.py:1.3.26.1

[Tres Seaver]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv12135/CMFCore

Modified Files:
      Tag: CMF-1_4-branch
	FSDTMLMethod.py FSPageTemplate.py FSPropertiesObject.py 
	FSZSQLMethod.py 
Log Message:
 - Merge fix for collector #185 from head.

=== CMF/CMFCore/FSDTMLMethod.py 1.16 => 1.16.4.1 ===
--- CMF/CMFCore/FSDTMLMethod.py:1.16	Mon Mar 24 00:03:08 2003
+++ CMF/CMFCore/FSDTMLMethod.py	Mon Sep  1 12:02:34 2003
@@ -81,7 +81,7 @@
 
     def _readFile(self, reparse):
         fp = expandpath(self._filepath)
-        file = open(fp, 'rb')
+        file = open(fp, 'r')    # not 'rb', as this is a text file!
         try:
             data = file.read()
         finally:


=== CMF/CMFCore/FSPageTemplate.py 1.18.18.1 => 1.18.18.2 ===
--- CMF/CMFCore/FSPageTemplate.py:1.18.18.1	Mon Aug  4 16:07:34 2003
+++ CMF/CMFCore/FSPageTemplate.py	Mon Sep  1 12:02:34 2003
@@ -81,7 +81,7 @@
 
     def _readFile(self, reparse):
         fp = expandpath(self._filepath)
-        file = open(fp, 'rb')
+        file = open(fp, 'r')    # not 'rb', as this is a text file!
         try: 
             data = file.read()
         finally: 


=== CMF/CMFCore/FSPropertiesObject.py 1.15 => 1.15.12.1 ===
--- CMF/CMFCore/FSPropertiesObject.py:1.15	Thu Jan 23 09:31:12 2003
+++ CMF/CMFCore/FSPropertiesObject.py	Mon Sep  1 12:02:34 2003
@@ -90,7 +90,7 @@
 
         fp = expandpath(self._filepath)
 
-        file = open(fp, 'rb')
+        file = open(fp, 'r')    # not 'rb', as this is a text file!
         try:
             lines = file.readlines()
         finally:


=== CMF/CMFCore/FSZSQLMethod.py 1.3 => 1.3.26.1 ===
--- CMF/CMFCore/FSZSQLMethod.py:1.3	Thu Aug  1 15:05:11 2002
+++ CMF/CMFCore/FSZSQLMethod.py	Mon Sep  1 12:02:34 2003
@@ -72,7 +72,7 @@
 
     def _readFile(self, reparse):
         fp = expandpath(self._filepath)
-        file = open(fp, 'rb')
+        file = open(fp, 'r')    # not 'rb', as this is a text file!
         try:
             data = file.read()
         finally: file.close()