[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/File - File.py:1.1.2.4.4.1 FileChunk.py:1.1.2.1.4.1 FileEdit.py:1.1.2.1.4.1 FileFields.py:1.1.2.1.4.1 IFile.py:1.1.2.1.4.1 NaiveFile.py:1.1.2.2.4.1 __init__.py:1.1.2.1.4.1 edit.pt:1.1.2.1.4.1 file.zcml:1.1.2.1.4.1
Gary Poster
garyposter@earthlink.net
Tue, 2 Apr 2002 21:02:30 -0500
Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/File
In directory cvs.zope.org:/tmp/cvs-serv22457/lib/python/Zope/App/OFS/Content/File
Modified Files:
Tag: gary-pre_create_views-branch
File.py FileChunk.py FileEdit.py FileFields.py IFile.py
NaiveFile.py __init__.py edit.pt file.zcml
Log Message:
license check; merge with current Zope-3x branch; small updates
=== Zope3/lib/python/Zope/App/OFS/Content/File/File.py 1.1.2.4 => 1.1.2.4.4.1 ===
=== Zope3/lib/python/Zope/App/OFS/Content/File/FileChunk.py 1.1.2.1 => 1.1.2.1.4.1 ===
#
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -8,7 +8,7 @@
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
#
##############################################################################
"""
=== Zope3/lib/python/Zope/App/OFS/Content/File/FileEdit.py 1.1.2.1 => 1.1.2.1.4.1 ===
#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
#
##############################################################################
"""
=== Zope3/lib/python/Zope/App/OFS/Content/File/FileFields.py 1.1.2.1 => 1.1.2.1.4.1 ===
-#
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
"""
$Id$
=== Zope3/lib/python/Zope/App/OFS/Content/File/IFile.py 1.1.2.1 => 1.1.2.1.4.1 ===
#
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -8,7 +8,7 @@
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
#
##############################################################################
"""
=== Zope3/lib/python/Zope/App/OFS/Content/File/NaiveFile.py 1.1.2.2 => 1.1.2.2.4.1 ===
#
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
-# Version 1.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
+#
##############################################################################
"""
=== Zope3/lib/python/Zope/App/OFS/Content/File/__init__.py 1.1.2.1 => 1.1.2.1.4.1 ===
-#
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 1.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-##############################################################################
+##############################################################################
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
"""
$Id$
=== Zope3/lib/python/Zope/App/OFS/Content/File/edit.pt 1.1.2.1 => 1.1.2.1.4.1 ===
- <p tal:content="here/msg"
- tal:condition="python: hasattr(here, 'msg')">
+ <p tal:content="context/msg"
+ tal:condition="python: hasattr(context, 'msg')">
Message will go here.
</p>
- <p tal:content="container/description">
+ <p tal:content="view/description">
Description of the Form.
</p>
@@ -38,7 +38,7 @@
<table class="EditTable">
<tbody>
- <tr tal:repeat="fieldView python:container.getFieldViews(request)">
+ <tr tal:repeat="fieldView python:view.getFieldViews(request)">
<th class="EditAttributeName"
tal:content="python: fieldView.getContext().getValue('title')">Title</th>
<td class="EditAttributeValue"
=== Zope3/lib/python/Zope/App/OFS/Content/File/file.zcml 1.1.2.1 => 1.1.2.1.4.1 ===
title="Add Naive Files" />
- <zmi:provideClass name=".NaiveFile."
- permission_id="Zope.AddNaiveFiles"
- title="Naive File"
- description="This is a simple file" />
+ <zmi:factoryFromClass name="NaiveFile"
+ class=".NaiveFile."
+ permission_id="Zope.AddNaiveFiles"
+ title="Naive File"
+ description="This is a simple file" />
<security:protectClass name=".NaiveFile."
permission_id="Zope.View" />
@@ -22,10 +23,11 @@
<security:permission permission_id="Zope.AddFiles" title="Add Files" />
- <zmi:provideClass name=".File."
- permission_id="Zope.AddFiles"
- title="File"
- description="A File" />
+ <zmi:factoryFromClass name="File"
+ class=".File."
+ permission_id="Zope.AddFiles"
+ title="File"
+ description="A File" />
<security:protectClass name=".File."
permission_id="Zope.View" />