diff -Nru genshi-0.7/debian/changelog genshi-0.7/debian/changelog --- genshi-0.7/debian/changelog 2015-09-16 22:02:53.000000000 +0000 +++ genshi-0.7/debian/changelog 2017-06-29 18:21:48.000000000 +0000 @@ -1,3 +1,18 @@ +genshi (0.7-6) unstable; urgency=medium + + * Team upload. + + [ Ondřej Nový ] + * Fixed VCS URL (https) + + [ Scott Kitterman ] + * Genshi only supports binary extension for python3 3.3 and before (Closes: + #810108) + - Make python3-genshi arc:all + - Drop python3-all-dev build-depends + + -- Scott Kitterman Thu, 29 Jun 2017 14:21:48 -0400 + genshi (0.7-5) unstable; urgency=medium * debian/python3-genshi.pyremove: Re-added, but this time only to remove diff -Nru genshi-0.7/debian/control genshi-0.7/debian/control --- genshi-0.7/debian/control 2015-09-08 22:17:21.000000000 +0000 +++ genshi-0.7/debian/control 2017-06-29 18:21:48.000000000 +0000 @@ -7,15 +7,15 @@ dh-python, python-all-dev (>= 2.6.6-3~), python-setuptools (>= 0.6b3), - python3-all-dev, + python3-all, python3-setuptools Standards-Version: 3.9.6 X-Python-Version: >= 2.7 X-Python3-Version: >= 3.2 Testsuite: autopkgtest Homepage: http://genshi.edgewall.org/ -Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/genshi/trunk/ -Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/genshi/trunk/ +Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/genshi.git +Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/genshi.git Package: python-genshi Architecture: any @@ -30,8 +30,8 @@ This is the Python 2 version. Package: python3-genshi -Architecture: any -Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} +Architecture: all +Depends: ${misc:Depends}, ${python3:Depends} Suggests: doc-base, python-genshi-doc, python3-pkg-resources Description: Python XML-based template engine - Python 3.x Genshi is a Python library that provides an integrated set of diff -Nru genshi-0.7/debian/.git-dpm genshi-0.7/debian/.git-dpm --- genshi-0.7/debian/.git-dpm 1970-01-01 00:00:00.000000000 +0000 +++ genshi-0.7/debian/.git-dpm 2017-06-29 18:20:11.000000000 +0000 @@ -0,0 +1,11 @@ +# see git-dpm(1) from git-dpm package +fafbc4296902b2259c23d2ce55996b0127726b4f +fafbc4296902b2259c23d2ce55996b0127726b4f +7f2bd926dd94814add6162a31ed051ed3b6b56f8 +7f2bd926dd94814add6162a31ed051ed3b6b56f8 +genshi_0.7.orig.tar.gz +f34b762736d2814bcdea075f6b01b9de6c61aa61 +491579 +debianTag="debian/%e%v" +patchedTag="patched/%e%v" +upstreamTag="upstream/%e%u" diff -Nru genshi-0.7/debian/patches/fix_tests_failure_with_python27.patch genshi-0.7/debian/patches/fix_tests_failure_with_python27.patch --- genshi-0.7/debian/patches/fix_tests_failure_with_python27.patch 2013-12-12 16:55:35.000000000 +0000 +++ genshi-0.7/debian/patches/fix_tests_failure_with_python27.patch 2017-06-29 18:20:11.000000000 +0000 @@ -1,10 +1,21 @@ -Description: Skip test which still fails in Python 2.7.6. +From 7f3552a9373fadd2d37ff592769ba6c65755eea5 Mon Sep 17 00:00:00 2001 +From: SVN-Git Migration +Date: Thu, 8 Oct 2015 09:13:47 -0700 +Subject: Skip test which still fails in Python 2.7.6. + Author: Barry Warsaw , Arnaud Fontaine Bug: http://genshi.edgewall.org/ticket/500 +Patch-Name: fix_tests_failure_with_python27.patch +--- + genshi/filters/tests/test_html.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/genshi/filters/tests/test_html.py b/genshi/filters/tests/test_html.py +index 0c6cfe1..a8cfa04 100644 --- a/genshi/filters/tests/test_html.py +++ b/genshi/filters/tests/test_html.py -@@ -410,6 +410,7 @@ +@@ -410,6 +410,7 @@ class HTMLSanitizerTestCase(unittest.TestCase): html = HTML(u'&junk;') self.assertEquals('&junk;', (html | HTMLSanitizer()).render()) diff -Nru genshi-0.7/debian/patches/issue566.patch genshi-0.7/debian/patches/issue566.patch --- genshi-0.7/debian/patches/issue566.patch 2015-09-08 22:46:14.000000000 +0000 +++ genshi-0.7/debian/patches/issue566.patch 2017-06-29 18:20:11.000000000 +0000 @@ -1,11 +1,23 @@ -Description: Fix an IndexError preventing Genshi for uploading attachments in +From fafbc4296902b2259c23d2ce55996b0127726b4f Mon Sep 17 00:00:00 2001 +From: SVN-Git Migration +Date: Thu, 8 Oct 2015 09:13:49 -0700 +Subject: Fix an IndexError preventing Genshi for uploading attachments in + Trac for users with non-English language settings. Origin: http://genshi.edgewall.org/changeset/1243?format=diff&new=1243 Bug: http://genshi.edgewall.org/ticket/566 +Patch-Name: issue566.patch +--- + genshi/filters/i18n.py | 8 +++++++- + genshi/filters/tests/i18n.py | 12 ++++++++++++ + 2 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/genshi/filters/i18n.py b/genshi/filters/i18n.py +index dfb52b8..8f2d25c 100644 --- a/genshi/filters/i18n.py +++ b/genshi/filters/i18n.py -@@ -1048,7 +1048,13 @@ +@@ -1048,7 +1048,13 @@ class MessageBuffer(object): while parts: order, string = parts.pop(0) @@ -20,9 +32,11 @@ parts_counter[order].pop() for event in events: +diff --git a/genshi/filters/tests/i18n.py b/genshi/filters/tests/i18n.py +index 212d5f6..b36a30b 100644 --- a/genshi/filters/tests/i18n.py +++ b/genshi/filters/tests/i18n.py -@@ -928,6 +928,18 @@ +@@ -928,6 +928,18 @@ class MsgDirectiveTestCase(unittest.TestCase): """

""", tmpl.generate(first="FIRST", second="SECOND").render()) diff -Nru genshi-0.7/debian/patches/issue582.patch genshi-0.7/debian/patches/issue582.patch --- genshi-0.7/debian/patches/issue582.patch 2014-03-11 19:22:52.000000000 +0000 +++ genshi-0.7/debian/patches/issue582.patch 2017-06-29 18:20:11.000000000 +0000 @@ -1,11 +1,30 @@ -Description: Make genshi 0.7 compatible with Python 3.4. +From 554fa3428bea3039decfd9064b860c753b2637a1 Mon Sep 17 00:00:00 2001 +From: SVN-Git Migration +Date: Thu, 8 Oct 2015 09:13:48 -0700 +Subject: Make genshi 0.7 compatible with Python 3.4. + Origin: http://genshi.edgewall.org/changeset/1252?format=diff&new=1252 Bug: http://genshi.edgewall.org/ticket/582 Forwarded: not-needed +Patch-Name: issue582.patch +--- + doc/upgrade.txt | 8 ++--- + genshi/compat.py | 10 +++++- + genshi/filters/tests/test_html.py | 14 ++++++--- + genshi/template/astutil.py | 66 ++++++++++++++++++++++++++++----------- + genshi/template/eval.py | 37 +++++++++++++--------- + genshi/template/tests/eval.py | 23 ++++++++++++++ + run_benchmarks.sh | 31 ++++++++++++++++++ + setup.py | 6 +++- + 8 files changed, 151 insertions(+), 44 deletions(-) + create mode 100644 run_benchmarks.sh + +diff --git a/doc/upgrade.txt b/doc/upgrade.txt +index b240eda..ad4c080 100644 --- a/doc/upgrade.txt +++ b/doc/upgrade.txt -@@ -7,11 +7,11 @@ +@@ -7,11 +7,11 @@ Upgrading Genshi :depth: 2 .. sectnum:: @@ -21,9 +40,11 @@ The most noticable API change in the Genshi development version is that the default encoding in numerous places is now None (i.e. unicode) instead +diff --git a/genshi/compat.py b/genshi/compat.py +index 9787325..6574e39 100644 --- a/genshi/compat.py +++ b/genshi/compat.py -@@ -35,6 +35,15 @@ +@@ -35,6 +35,15 @@ else: 'Python 2 compatibility function. Not usable in Python 3.') @@ -39,14 +60,16 @@ # We need to differentiate between StringIO and BytesIO in places if IS_PYTHON2: -@@ -112,4 +121,3 @@ +@@ -112,4 +121,3 @@ except NameError: if not x: return False return True - +diff --git a/genshi/filters/tests/test_html.py b/genshi/filters/tests/test_html.py +index a8cfa04..7120988 100644 --- a/genshi/filters/tests/test_html.py +++ b/genshi/filters/tests/test_html.py -@@ -368,12 +368,16 @@ +@@ -368,12 +368,16 @@ def StyleSanitizer(): class HTMLSanitizerTestCase(unittest.TestCase): @@ -65,7 +88,7 @@ def test_sanitize_unchanged(self): html = HTML(u'fo
o') -@@ -417,10 +421,12 @@ +@@ -417,10 +421,12 @@ class HTMLSanitizerTestCase(unittest.TestCase): html = HTML(u'') self.assertEquals('', (html | HTMLSanitizer()).render()) src = u'alert("foo")' @@ -80,9 +103,11 @@ def test_sanitize_remove_onclick_attr(self): html = HTML(u'
') +diff --git a/genshi/template/astutil.py b/genshi/template/astutil.py +index b24f728..e561846 100644 --- a/genshi/template/astutil.py +++ b/genshi/template/astutil.py -@@ -21,7 +21,7 @@ +@@ -21,7 +21,7 @@ else: def parse(source, mode): return compile(source, '', mode, _ast.PyCF_ONLY_AST) @@ -91,7 +116,7 @@ __docformat__ = 'restructuredtext en' -@@ -103,32 +103,48 @@ +@@ -103,32 +103,48 @@ class ASTCodeGenerator(object): self._new_line() return self.visit(node.body) @@ -158,7 +183,7 @@ if not IS_PYTHON2: # In Python 3 arguments get a special node -@@ -724,6 +740,17 @@ +@@ -732,6 +748,17 @@ class ASTCodeGenerator(object): def visit_Name(self, node): self._write(node.id) @@ -176,7 +201,7 @@ # List(expr* elts, expr_context ctx) def visit_List(self, node): self._write('[') -@@ -829,6 +856,7 @@ +@@ -837,6 +864,7 @@ class ASTTransformer(object): visit_Attribute = _clone visit_Subscript = _clone visit_Name = _clone @@ -184,9 +209,11 @@ visit_List = _clone visit_Tuple = _clone +diff --git a/genshi/template/eval.py b/genshi/template/eval.py +index c00cfcb..81644a7 100644 --- a/genshi/template/eval.py +++ b/genshi/template/eval.py -@@ -24,7 +24,8 @@ +@@ -24,7 +24,8 @@ from genshi.template.astutil import ASTTransformer, ASTCodeGenerator, \ from genshi.template.base import TemplateRuntimeError from genshi.util import flatten @@ -196,7 +223,7 @@ __all__ = ['Code', 'Expression', 'Suite', 'LenientLookup', 'StrictLookup', 'Undefined', 'UndefinedError'] -@@ -495,28 +496,34 @@ +@@ -495,28 +496,34 @@ class TemplateASTTransformer(ASTTransformer): def __init__(self): self.locals = [CONSTANTS] @@ -245,9 +272,11 @@ return names def visit_Str(self, node): +diff --git a/genshi/template/tests/eval.py b/genshi/template/tests/eval.py +index 7722571..c44a0e3 100644 --- a/genshi/template/tests/eval.py +++ b/genshi/template/tests/eval.py -@@ -590,6 +590,29 @@ +@@ -590,6 +590,29 @@ x = smash(foo='abc', bar='def') suite.execute(data) self.assertEqual(['bardef', 'fooabc'], sorted(data['x'])) @@ -277,6 +306,9 @@ def test_def_nested(self): suite = Suite(""" def doit(): +diff --git a/run_benchmarks.sh b/run_benchmarks.sh +new file mode 100644 +index 0000000..0c64cc8 --- /dev/null +++ b/run_benchmarks.sh @@ -0,0 +1,31 @@ @@ -311,9 +343,11 @@ +echo "-- xpath --" +"$PYTHON" "$BENCH_DIR/xpath.py" +echo +diff --git a/setup.py b/setup.py +index 294ba9b..45099b5 100755 --- a/setup.py +++ b/setup.py -@@ -65,9 +65,13 @@ +@@ -65,9 +65,13 @@ available.""") if Feature: diff -Nru genshi-0.7/debian/patches/issue602.patch genshi-0.7/debian/patches/issue602.patch --- genshi-0.7/debian/patches/issue602.patch 2015-09-08 20:18:41.000000000 +0000 +++ genshi-0.7/debian/patches/issue602.patch 2017-06-29 18:20:11.000000000 +0000 @@ -1,11 +1,25 @@ -Description: Fix Python 3.5 compatibility issues. +From 1acbd00b4961164edc8a185458ba4a433bedbceb Mon Sep 17 00:00:00 2001 +From: SVN-Git Migration +Date: Thu, 8 Oct 2015 09:13:46 -0700 +Subject: Fix Python 3.5 compatibility issues. + Origin: http://genshi.edgewall.org/attachment/ticket/602/t602.diff Bug: http://genshi.edgewall.org/ticket/602 Forwarded: not-needed +Patch-Name: issue602.patch +--- + genshi/filters/i18n.py | 6 ++++-- + genshi/template/astutil.py | 14 +++++++++++--- + genshi/template/directives.py | 20 ++++++++++++++------ + genshi/template/eval.py | 5 +++++ + 4 files changed, 34 insertions(+), 11 deletions(-) + +diff --git a/genshi/filters/i18n.py b/genshi/filters/i18n.py +index b724956..dfb52b8 100644 --- a/genshi/filters/i18n.py +++ b/genshi/filters/i18n.py -@@ -1187,8 +1187,10 @@ +@@ -1187,8 +1187,10 @@ def extract_from_code(code, gettext_functions): elif arg: strings.append(None) [_add(arg) for arg in node.args] @@ -18,9 +32,11 @@ if len(strings) == 1: strings = strings[0] else: +diff --git a/genshi/template/astutil.py b/genshi/template/astutil.py +index a4c21c8..b24f728 100644 --- a/genshi/template/astutil.py +++ b/genshi/template/astutil.py -@@ -135,6 +135,10 @@ +@@ -135,6 +135,10 @@ class ASTCodeGenerator(object): def visit_arg(self, node): self._write(node.arg) @@ -31,7 +47,7 @@ # FunctionDef(identifier name, arguments args, # stmt* body, expr* decorator_list) def visit_FunctionDef(self, node): -@@ -648,9 +652,13 @@ +@@ -648,9 +652,13 @@ class ASTCodeGenerator(object): if not first: self._write(', ') first = False @@ -48,9 +64,11 @@ self.visit(keyword.value) if getattr(node, 'starargs', None): if not first: +diff --git a/genshi/template/directives.py b/genshi/template/directives.py +index 7301c2d..1f70ef6 100644 --- a/genshi/template/directives.py +++ b/genshi/template/directives.py -@@ -266,13 +266,21 @@ +@@ -266,13 +266,21 @@ class DefDirective(Directive): if isinstance(ast, _ast.Call): self.name = ast.func.id for arg in ast.args: @@ -78,9 +96,11 @@ if getattr(ast, 'starargs', None): self.star_args = ast.starargs.id if getattr(ast, 'kwargs', None): +diff --git a/genshi/template/eval.py b/genshi/template/eval.py +index 89aec49..c00cfcb 100644 --- a/genshi/template/eval.py +++ b/genshi/template/eval.py -@@ -593,6 +593,11 @@ +@@ -593,6 +593,11 @@ class TemplateASTTransformer(ASTTransformer): finally: self.locals.pop()