[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/File - File.py:1.1.2.6 NaiveFile.py:1.1.2.4

[Shane Hathaway]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/File
In directory cvs.zope.org:/tmp/cvs-serv20835/lib/python/Zope/App/OFS/Content/File

Modified Files:
      Tag: Zope-3x-branch
	File.py NaiveFile.py 
Log Message:
Merged Zope3-Server-Branch.


=== Zope3/lib/python/Zope/App/OFS/Content/File/File.py 1.1.2.5 => 1.1.2.6 ===
 
 
-    def __init__(self, data=None, contentType=None):
+    def __init__(self, data='', contentType=None):
         """ """
 
         self.setData(data)


=== Zope3/lib/python/Zope/App/OFS/Content/File/NaiveFile.py 1.1.2.3 => 1.1.2.4 ===
 
 
-    def __init__(self, data=None, contentType=None):
+    def __init__(self, data='', contentType=None):
         """ """
 
         self.setData(data)