[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Image/tests - __init__.py:1.1.2.1.12.1 testImage.py:1.1.2.2.8.1 testImageData.py:1.1.2.2.10.1 testImageEdit.py:1.1.2.1.12.1

[Gary Poster]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Image/tests
In directory cvs.zope.org:/tmp/cvs-serv25583/lib/python/Zope/App/OFS/Image/tests

Modified Files:
      Tag: gary-pre_create_views-branch
	__init__.py testImage.py testImageData.py testImageEdit.py 
Log Message:
last commit bombed; trying again.

merged with Zope-3x branch (on my own branch; don't worry) to take advantage of Stephan's new code.  changed licenses with license utility (and thus five million commits).  Made a couple of presentational improvements.  Need to change job  board example to take advantage of this next.



=== Zope3/lib/python/Zope/App/OFS/Image/tests/__init__.py 1.1.2.1 => 1.1.2.1.12.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.
+# 
+##############################################################################


=== Zope3/lib/python/Zope/App/OFS/Image/tests/testImage.py 1.1.2.2 => 1.1.2.2.8.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.
+# 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.
-
+# 
+##############################################################################
 import unittest
 from Interface.Verify import verifyClass
 


=== Zope3/lib/python/Zope/App/OFS/Image/tests/testImageData.py 1.1.2.2 => 1.1.2.2.10.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 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/Image/tests/testImageEdit.py 1.1.2.1 => 1.1.2.1.12.1 ===
-# 
-# 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.
+# 
+##############################################################################
 import unittest, cStringIO
 
 from Zope.App.OFS.Image.ImageEdit import ImageEdit