Hello community,
here is the log from the commit of package python-Chameleon for
openSUSE:Factory checked in at 2019-04-02 09:22:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Chameleon (Old)
and /work/SRC/openSUSE:Factory/.python-Chameleon.new.25356 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Chameleon"
Tue Apr 2 09:22:30 2019 rev:7 rq:690341 version:3.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Chameleon/python-Chameleon.changes
2019-03-22 15:01:32.077780063 +0100
+++
/work/SRC/openSUSE:Factory/.python-Chameleon.new.25356/python-Chameleon.changes
2019-04-02 09:22:41.488725465 +0200
@@ -1,0 +2,6 @@
+Mon Apr 1 12:59:13 UTC 2019 - Tomáš Chvátal <[email protected]>
+
+- Update to 3.6.1:
+ * Fix limited search expression for illegal double hyphens in HTML comments
to fix issue #289.
+
+-------------------------------------------------------------------
Old:
----
Chameleon-3.6.tar.gz
LICENSE.txt
New:
----
Chameleon-3.6.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Chameleon.spec ++++++
--- /var/tmp/diff_new_pack.QORWlv/_old 2019-04-02 09:22:42.024725825 +0200
+++ /var/tmp/diff_new_pack.QORWlv/_new 2019-04-02 09:22:42.028725828 +0200
@@ -18,15 +18,13 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-Chameleon
-Version: 3.6
+Version: 3.6.1
Release: 0
Summary: Fast HTML/XML Template Compiler
License: BSD-3-Clause AND BSD-4-Clause AND Python-2.0 AND ZPL-2.1
Group: Development/Languages/Python
URL: https://github.com/malthe/chameleon
Source:
https://files.pythonhosted.org/packages/source/C/Chameleon/Chameleon-%{version}.tar.gz
-# https://github.com/malthe/chameleon/pull/288
-Source1:
https://raw.githubusercontent.com/malthe/chameleon/master/LICENSE.txt
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -43,7 +41,6 @@
%prep
%setup -q -n Chameleon-%{version}
-cp %{SOURCE1} .
%build
%python_build
@@ -51,7 +48,7 @@
%install
%python_install
# Don't ship testsuite
-%python_expand rm -rvf %{buildroot}%{$python_sitelib}/chameleon/tests
+%python_expand rm -r %{buildroot}%{$python_sitelib}/chameleon/tests
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
++++++ Chameleon-3.6.tar.gz -> Chameleon-3.6.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Chameleon-3.6/LICENSE.txt
new/Chameleon-3.6.1/LICENSE.txt
--- old/Chameleon-3.6/LICENSE.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/Chameleon-3.6.1/LICENSE.txt 2017-07-12 15:00:56.000000000 +0200
@@ -0,0 +1,185 @@
+The majority of the code in Chameleon is supplied under this license:
+
+ A copyright notice accompanies this license document that identifies
+ the copyright holders.
+
+ 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 accompanying
+ copyright notice, this list of conditions, and the following
+ disclaimer.
+
+ 2. Redistributions in binary form must reproduce the accompanying
+ copyright notice, this list of conditions, and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ 3. Names of the copyright holders must not be used to endorse or
+ promote products derived from this software without prior
+ written permission from the copyright holders.
+
+ 4. 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 THE COPYRIGHT HOLDERS ``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 THE COPYRIGHT
+ HOLDERS 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.
+
+Portions of the code in Chameleon are supplied under the ZPL (headers
+within individiual files indicate that these portions are licensed
+under the ZPL):
+
+ Zope Public License (ZPL) Version 2.1
+ -------------------------------------
+
+ A copyright notice accompanies this license document that
+ identifies the copyright holders.
+
+ 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
+ accompanying copyright notice, this list of conditions,
+ and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the accompanying
+ copyright notice, this list of conditions, and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+ 3. Names of the copyright holders must not be used to
+ endorse or promote products derived from this software
+ without prior written permission from the copyright
+ holders.
+
+ 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 the copyright
+ holders. Use of them is covered by separate agreement
+ with the copyright holders.
+
+ 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 THE COPYRIGHT HOLDERS ``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 THE COPYRIGHT HOLDERS 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.
+
+Portions of the code in Chameleon are supplied under the BSD license
+(headers within individiual files indicate that these portions are
+licensed under this license):
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of 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 of the author may not be used to endorse or promote
+ products derived from this software without specific prior
+ written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ 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 THE AUTHOR 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.
+
+
+Portions of the code in Chameleon are supplied under the Python
+License (headers within individiual files indicate that these portions
+are licensed under this license):
+
+ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+ --------------------------------------------
+
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee") accessing and
+ otherwise using this software ("Python") in source or binary form and
+ its associated documentation.
+
+ 2. Subject to the terms and conditions of this License Agreement, PSF
+ hereby grants Licensee a nonexclusive, royalty-free, world-wide
+ license to reproduce, analyze, test, perform and/or display publicly,
+ prepare derivative works, distribute, and otherwise use Python
+ alone or in any derivative version, provided, however, that PSF's
+ License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+ 2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved"
+ are retained in Python alone or in any derivative version prepared
+ by Licensee.
+
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Python or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief summary of
+ the changes made to Python.
+
+ 4. PSF is making Python available to Licensee on an "AS IS"
+ basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+ FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+ A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF and
+ Licensee. This License Agreement does not grant permission to use PSF
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+
+ 8. By copying, installing or otherwise using Python, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Chameleon-3.6/MANIFEST.in
new/Chameleon-3.6.1/MANIFEST.in
--- old/Chameleon-3.6/MANIFEST.in 2017-07-12 15:00:56.000000000 +0200
+++ new/Chameleon-3.6.1/MANIFEST.in 2019-04-01 09:54:52.000000000 +0200
@@ -1,2 +1,3 @@
recursive-include src/chameleon/tests/inputs *
recursive-include src/chameleon/tests/outputs *
+include LICENSE.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Chameleon-3.6/PKG-INFO new/Chameleon-3.6.1/PKG-INFO
--- old/Chameleon-3.6/PKG-INFO 2019-02-19 14:26:30.000000000 +0100
+++ new/Chameleon-3.6.1/PKG-INFO 2019-04-01 09:56:05.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: Chameleon
-Version: 3.6
+Version: 3.6.1
Summary: Fast HTML/XML Template Compiler.
Home-page: https://chameleon.readthedocs.io
Author: Malthe Borch
@@ -36,6 +36,12 @@
Changes
=======
+ 3.6.1 (2019-04-01)
+ ------------------
+
+ - Fix limited search expression for illegal double hyphens in HTML
+ comments to fix issue #289.
+
3.6 (2019-02-19)
----------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Chameleon-3.6/setup.py new/Chameleon-3.6.1/setup.py
--- old/Chameleon-3.6/setup.py 2019-02-19 14:26:12.000000000 +0100
+++ new/Chameleon-3.6.1/setup.py 2019-04-01 09:55:50.000000000 +0200
@@ -1,4 +1,4 @@
-__version__ = '3.6'
+__version__ = '3.6.1'
import os
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Chameleon-3.6/src/Chameleon.egg-info/PKG-INFO
new/Chameleon-3.6.1/src/Chameleon.egg-info/PKG-INFO
--- old/Chameleon-3.6/src/Chameleon.egg-info/PKG-INFO 2019-02-19
14:26:29.000000000 +0100
+++ new/Chameleon-3.6.1/src/Chameleon.egg-info/PKG-INFO 2019-04-01
09:56:03.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: Chameleon
-Version: 3.6
+Version: 3.6.1
Summary: Fast HTML/XML Template Compiler.
Home-page: https://chameleon.readthedocs.io
Author: Malthe Borch
@@ -36,6 +36,12 @@
Changes
=======
+ 3.6.1 (2019-04-01)
+ ------------------
+
+ - Fix limited search expression for illegal double hyphens in HTML
+ comments to fix issue #289.
+
3.6 (2019-02-19)
----------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Chameleon-3.6/src/Chameleon.egg-info/SOURCES.txt
new/Chameleon-3.6.1/src/Chameleon.egg-info/SOURCES.txt
--- old/Chameleon-3.6/src/Chameleon.egg-info/SOURCES.txt 2019-02-19
14:26:29.000000000 +0100
+++ new/Chameleon-3.6.1/src/Chameleon.egg-info/SOURCES.txt 2019-04-01
09:56:03.000000000 +0200
@@ -1,3 +1,4 @@
+LICENSE.txt
MANIFEST.in
README.rst
setup.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Chameleon-3.6/src/chameleon/parser.py
new/Chameleon-3.6.1/src/chameleon/parser.py
--- old/Chameleon-3.6/src/chameleon/parser.py 2019-02-04 14:48:52.000000000
+0100
+++ new/Chameleon-3.6.1/src/chameleon/parser.py 2019-04-01 09:54:52.000000000
+0200
@@ -10,7 +10,7 @@
from .namespaces import XML_NS
from .tokenize import Token
-match_double_hyphen = re.compile(r'--(?!>)')
+match_double_hyphen = re.compile(r'--(?!(-)*>)')
match_tag_prefix_and_name = re.compile(
r'^(?P<prefix></?)(?P<name>([^:\n\r ]+:)?[^ \n\t\r>/]+)'
r'(?P<suffix>(?P<space>\s*)/?>)?',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Chameleon-3.6/src/chameleon/tests/test_parser.py
new/Chameleon-3.6.1/src/chameleon/tests/test_parser.py
--- old/Chameleon-3.6/src/chameleon/tests/test_parser.py 2017-07-12
15:00:56.000000000 +0200
+++ new/Chameleon-3.6.1/src/chameleon/tests/test_parser.py 2019-04-01
09:54:52.000000000 +0200
@@ -10,6 +10,17 @@
class ParserTest(TestCase):
+ def test_comment_double_hyphen_parsing(self):
+ from ..parser import match_double_hyphen
+
+ self.assertFalse(match_double_hyphen.match('->'))
+ self.assertFalse(match_double_hyphen.match('-->'))
+ self.assertFalse(match_double_hyphen.match('--->'))
+ self.assertFalse(match_double_hyphen.match('---->'))
+ self.assertFalse(match_double_hyphen.match('- >'))
+
+ self.assertTrue(match_double_hyphen.match('-- >'))
+
def test_sample_files(self):
import os
import traceback
