Adhering to ZPL

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1090 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/README.txt b/README.txt
index 3d99411f2cbed328bf0efef4b9236fbe2fbb80ef..808be60a4a0ecd75868012bfa756ac55fb0f51de 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -33,6 +33,21 @@ BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
 
-The stylesheet included with this package has been copied from the Zope
-management interface and presumably belongs to Digital Creations.
+PageTemplates Licensing
+-----------------------
+
+Portions of this code (roundup.cgi.PageTemplates, roundup.cgi.TAL and
+roundup.cgi.ZTUtils) have been copied from Zope. They have been modified in
+the following manner:
+
+- removal of unit tests, Zope-specific code and support files from 
+  PageTemplates: PageTemplateFile.py, ZPythonExpr.py, ZRPythonExpr.py,
+  ZopePageTemplate.py, examples, help, tests, CHANGES.txt, HISTORY.txt,
+  version.txt and www. From TAL: DummyEngine.py, HISTORY.txt, CHANGES.txt,
+  benchmark, driver.py, markbench.py, ndiff.py, runtest.py, setpath.py,
+  tests and timer.py. From ZTUtils: SimpleTree.py, Zope.py, CHANGES.txt and
+  HISTORY.txt.
+- editing to remove dependencies on Zope modules (see files for change notes)
+
+The license for this code is in doc/ZPL.txt.
 

diff --git a/doc/ZPL.txt b/doc/ZPL.txt
new file mode 100644 (file)
index 0000000..44e0648
--- /dev/null
+++ b/doc/ZPL.txt
@@ -0,0 +1,59 @@
+Zope Public License (ZPL) Version 2.0
+-----------------------------------------------
+
+This software is Copyright (c) Zope Corporation (tm) and
+Contributors. All rights reserved.
+
+This license has been certified as open source. It has also
+been designated as GPL compatible by the Free Software
+Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the
+following conditions are met:
+
+1. Redistributions in source code must retain the above
+   copyright notice, this list of conditions, and the following
+   disclaimer.
+
+2. Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions, and the following
+   disclaimer in the documentation and/or other materials
+   provided with the distribution.
+
+3. The name Zope Corporation (tm) must not be used to
+   endorse or promote products derived from this software
+   without prior written permission from Zope Corporation.
+
+4. The right to distribute this software or to use it for
+   any purpose does not give you the right to use Servicemarks
+   (sm) or Trademarks (tm) of Zope Corporation. Use of them is
+   covered in a separate agreement (see
+   http://www.zope.com/Marks).
+
+5. If any files are modified, you must cause the modified
+   files to carry prominent notices stating that you changed
+   the files and the date of any change.
+
+Disclaimer
+
+  THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS''
+  AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+  NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+  NO EVENT SHALL ZOPE CORPORATION OR ITS CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+  DAMAGE.
+
+
+This software consists of contributions made by Zope
+Corporation and many individuals on behalf of Zope
+Corporation.  Specific attributions are listed in the
+accompanying credits file.

diff --git a/roundup/cgi/PageTemplates/Expressions.py b/roundup/cgi/PageTemplates/Expressions.py
index 636da675833edbd96b3afad7c4e48d50d1b1b661..ccfc6c733c6f2db0f4c03ed6dedb56fbd1a4f09b 100644 (file)
--- a/roundup/cgi/PageTemplates/Expressions.py
+++ b/roundup/cgi/PageTemplates/Expressions.py
@@ -15,9 +15,17 @@
 
 Page Template-specific implementation of TALES, with handlers
 for Python expressions, string literals, and paths.
+
+
+Modified for Roundup 0.5 release:
+
+- Removed all Zope-specific code (doesn't even try to import that stuff now)
+- Removed all Acquisition
+- Made traceback info more informative
+
 """
 
-__version__='$Revision: 1.2 $'[11:-2]
+__version__='$Revision: 1.3 $'[11:-2]
 
 import re, sys
 from TALES import Engine, CompilerError, _valid_name, NAME_RE, \

diff --git a/roundup/cgi/PageTemplates/PageTemplate.py b/roundup/cgi/PageTemplates/PageTemplate.py
index d30aa641908d92312794211b310d9920dfc84741..948d7a88449c796dce79ea764c981dc1b39602cd 100755 (executable)
--- a/roundup/cgi/PageTemplates/PageTemplate.py
+++ b/roundup/cgi/PageTemplates/PageTemplate.py
@@ -13,9 +13,15 @@
 """Page Template module
 
 HTML- and XML-based template objects using TAL, TALES, and METAL.
+
+
+Modified for Roundup 0.5 release:
+
+- changed imports to import from roundup.cgi
+
 """
 
-__version__='$Revision: 1.1 $'[11:-2]
+__version__='$Revision: 1.2 $'[11:-2]
 
 import sys
 

diff --git a/roundup/cgi/PageTemplates/PythonExpr.py b/roundup/cgi/PageTemplates/PythonExpr.py
index c0997703f45dd01387d7348564d214d3f26f8102..a8f06d516be4c943641806ba81ce772ff2d8d189 100644 (file)
--- a/roundup/cgi/PageTemplates/PythonExpr.py
+++ b/roundup/cgi/PageTemplates/PythonExpr.py
@@ -12,9 +12,14 @@
 ##############################################################################
 
 """Generic Python Expression Handler
+
+Modified for Roundup 0.5 release:
+
+- more informative traceback info
+
 """
 
-__version__='$Revision: 1.2 $'[11:-2]
+__version__='$Revision: 1.3 $'[11:-2]
 
 from TALES import CompilerError
 from string import strip, split, join, replace, lstrip

diff --git a/roundup/cgi/PageTemplates/TALES.py b/roundup/cgi/PageTemplates/TALES.py
index 33b6e9f0bb97cb9f39b0c62ca34e755278b2137b..94a61c3698c0e59e9146f61ba315392238c1038a 100644 (file)
--- a/roundup/cgi/PageTemplates/TALES.py
+++ b/roundup/cgi/PageTemplates/TALES.py
@@ -13,9 +13,13 @@
 """TALES
 
 An implementation of a generic TALES engine
+
+Modified for Roundup 0.5 release:
+
+- changed imports to import from roundup.cgi
 """
 
-__version__='$Revision: 1.1 $'[11:-2]
+__version__='$Revision: 1.2 $'[11:-2]
 
 import re, sys
 from roundup.cgi import ZTUtils

diff --git a/roundup/cgi/TAL/XMLParser.py b/roundup/cgi/TAL/XMLParser.py
index 98cc4d38bb53c5da0c2b827045297f09ff8e8a5e..e16869de1629ea8d25c1a32cb5b9a32a4d648910 100644 (file)
--- a/roundup/cgi/TAL/XMLParser.py
+++ b/roundup/cgi/TAL/XMLParser.py
@@ -13,6 +13,11 @@
 ##############################################################################
 """
 Generic expat-based XML parser base class.
+
+Modified for Roundup 0.5 release:
+
+- removed dependency on zLOG
+
 """
 
 class XMLParser:

diff --git a/roundup/cgi/ZTUtils/__init__.py b/roundup/cgi/ZTUtils/__init__.py
index f9eb32cdffd660a51471349157a92af9beb2178c..6ee1ca4a1c5c49810a96fdc80e8e3279fae86521 100644 (file)
--- a/roundup/cgi/ZTUtils/__init__.py
+++ b/roundup/cgi/ZTUtils/__init__.py
@@ -12,8 +12,12 @@
 ##############################################################################
 __doc__='''Package of template utility classes and functions.
 
-$Id: __init__.py,v 1.1 2002-09-05 00:37:09 richard Exp $'''
-__version__='$Revision: 1.1 $'[11:-2]
+Modified for Roundup 0.5 release:
+
+- removed Zope imports
+
+$Id: __init__.py,v 1.2 2002-09-07 22:42:47 richard Exp $'''
+__version__='$Revision: 1.2 $'[11:-2]
 
 from Batch import Batch
 from Iterator import Iterator