[z3-checkins] r27052 - z3/jsonserver/branch/merge/concatresource/compression/thirdparty

[reebalazs at codespeak.net]

Author: reebalazs
Date: Wed May 10 20:55:57 2006
New Revision: 27052

Modified:
   z3/jsonserver/branch/merge/concatresource/compression/thirdparty/LICENSE
   z3/jsonserver/branch/merge/concatresource/compression/thirdparty/packer.py
Log:
Change license of packer.py

Modified: z3/jsonserver/branch/merge/concatresource/compression/thirdparty/LICENSE
==============================================================================
--- z3/jsonserver/branch/merge/concatresource/compression/thirdparty/LICENSE	(original)
+++ z3/jsonserver/branch/merge/concatresource/compression/thirdparty/LICENSE	Wed May 10 20:55:57 2006
@@ -1,8 +1,25 @@
 
-packer.py is originally licensed under GNU GPL
+packer.py is released under the MIT license.
+
+# packer.py
+#
+# Copyright (c) 2006 Florian Schulze <florian.schulze at gmx.net>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
 
-# ------------------------------------------------------------------------------
-# used with permission by Florian Schulze, 
-# originally from 
-#   https://svn.plone.org/svn/plone/ResourceRegistries/trunk/tools/packer.py
-# ------------------------------------------------------------------------------

Modified: z3/jsonserver/branch/merge/concatresource/compression/thirdparty/packer.py
==============================================================================
--- z3/jsonserver/branch/merge/concatresource/compression/thirdparty/packer.py	(original)
+++ z3/jsonserver/branch/merge/concatresource/compression/thirdparty/packer.py	Wed May 10 20:55:57 2006
@@ -1,12 +1,29 @@
-
-# ------------------------------------------------------------------------------
-# used with permission by Florian Schulze, 
-# originally from 
-#   https://svn.plone.org/svn/plone/ResourceRegistries/trunk/tools/packer.py
-# ------------------------------------------------------------------------------
+#
+# packer.py
+#
+# Copyright (c) 2006 Florian Schulze <florian.schulze at gmx.net>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
 
 import re
 
+
 class KeywordMapper:
     def __init__(self, regexp, encoder):
         if isinstance(regexp, (str, unicode)):