[Python-modules-commits] [python-prov] 03/14: Initialize git-dpm

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository python-prov.

commit f46f2599405b4ea37c33b9578fee7900c7453c9b
Merge: b8d28e3 c4fa1b3
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Mon Dec 12 21:19:30 2016 +0000

    Initialize git-dpm

 debian/.git-dpm                                             |  8 ++++++++
 ...001-test_xml-decode-buffers-to-work-with-py3-also.patch} |  7 ++-----
 ...x-deprecated-usage-of-cgi.escape-since-Python-3.3.patch} |  7 ++-----
 debian/patches/series                                       |  4 ++--
 prov/dot.py                                                 | 13 ++++++++-----
 prov/tests/test_xml.py                                      |  4 ++--
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --cc debian/.git-dpm
index 0000000,0000000..3764103
new file mode 100644
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,0 -1,0 +1,8 @@@
++# see git-dpm(1) from git-dpm package
++c4fa1b3953f0793667d0dd4ace35c1c7d3762fa0
++c4fa1b3953f0793667d0dd4ace35c1c7d3762fa0
++c1b7a50d8df5fd2b8122b9d2871dacf1782234bd
++c1b7a50d8df5fd2b8122b9d2871dacf1782234bd
++python-prov_1.4.0.orig.tar.gz
++e9d33a5deaf141e16d5b024b856c5f0ab8ac043c
++92617
diff --cc debian/patches/0001-test_xml-decode-buffers-to-work-with-py3-also.patch
index e0ec4b4,0000000..5d613fa
mode 100644,000000..100644
--- a/debian/patches/0001-test_xml-decode-buffers-to-work-with-py3-also.patch
+++ b/debian/patches/0001-test_xml-decode-buffers-to-work-with-py3-also.patch
@@@ -1,33 -1,0 +1,30 @@@
- From bdbc6fb97b52a76239498064764e2140c2236251 Mon Sep 17 00:00:00 2001
++From 33febe6e8aa51e8dd570b3a2933e4e172da80505 Mon Sep 17 00:00:00 2001
 +From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
 +Date: Sun, 6 Dec 2015 23:06:31 +0100
- Subject: [PATCH] test_xml: decode() buffers to work with py3 also
++Subject: test_xml: decode() buffers to work with py3 also
 +
 +Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
 +---
 + prov/tests/test_xml.py | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/prov/tests/test_xml.py b/prov/tests/test_xml.py
 +index 79fb7eb..533b967 100644
 +--- a/prov/tests/test_xml.py
 ++++ b/prov/tests/test_xml.py
 +@@ -64,13 +64,13 @@ def compare_xml(doc1, doc2):
 +     buf = io.BytesIO()
 +     obj1.write_c14n(buf)
 +     buf.seek(0, 0)
 +-    str1 = buf.read()
 ++    str1 = buf.read().decode()
 +     str1 = [_i.strip() for _i in str1.splitlines() if _i.strip()]
 + 
 +     buf = io.BytesIO()
 +     obj2.write_c14n(buf)
 +     buf.seek(0, 0)
 +-    str2 = buf.read()
 ++    str2 = buf.read().decode()
 +     str2 = [_i.strip() for _i in str2.splitlines() if _i.strip()]
 + 
 +     unified_diff = difflib.unified_diff(str1, str2)
- -- 
- 2.8.1
- 
diff --cc debian/patches/0002-Fix-deprecated-usage-of-cgi.escape-since-Python-3.3.patch
index 455884d,0000000..934e500
mode 100644,000000..100644
--- a/debian/patches/0002-Fix-deprecated-usage-of-cgi.escape-since-Python-3.3.patch
+++ b/debian/patches/0002-Fix-deprecated-usage-of-cgi.escape-since-Python-3.3.patch
@@@ -1,45 -1,0 +1,42 @@@
- From 1b3353944085e01807ae90e5fcf1e5848604e0dc Mon Sep 17 00:00:00 2001
++From c4fa1b3953f0793667d0dd4ace35c1c7d3762fa0 Mon Sep 17 00:00:00 2001
 +From: Ghislain Antony Vaillant <ghisvail at gmail.com>
 +Date: Fri, 22 Jul 2016 14:49:03 +0100
- Subject: [PATCH] Fix deprecated usage of cgi.escape since Python 3.3
++Subject: Fix deprecated usage of cgi.escape since Python 3.3
 +
 +---
 + prov/dot.py | 13 ++++++++-----
 + 1 file changed, 8 insertions(+), 5 deletions(-)
 +
 +diff --git a/prov/dot.py b/prov/dot.py
 +index 57adfc3..8e531de 100644
 +--- a/prov/dot.py
 ++++ b/prov/dot.py
 +@@ -17,7 +17,10 @@ from __future__ import (absolute_import, division, print_function,
 + __author__ = 'Trung Dong Huynh'
 + __email__ = 'trungdong at donggiang.com'
 + 
 +-import cgi
 ++try:
 ++    from html import escape
 ++except ImportError:
 ++    from cgi import escape
 + from datetime import datetime
 + import pydotplus as pydot
 + import six
 +@@ -175,12 +178,12 @@ def prov_to_dot(bundle, show_nary=True, use_labels=False,
 +             ann_rows = [ANNOTATION_START_ROW]
 +             ann_rows.extend(
 +                 ANNOTATION_ROW_TEMPLATE % (
 +-                    attr.uri, cgi.escape(six.text_type(attr)),
 ++                    attr.uri, escape(six.text_type(attr)),
 +                     ' href=\"%s\"' % value.uri if isinstance(value, Identifier)
 +                     else '',
 +-                    cgi.escape(six.text_type(value)
 +-                               if not isinstance(value, datetime) else
 +-                               six.text_type(value.isoformat())))
 ++                    escape(six.text_type(value)
 ++                           if not isinstance(value, datetime) else
 ++                           six.text_type(value.isoformat())))
 +                 for attr, value in attributes
 +             )
 +             ann_rows.append(ANNOTATION_END_ROW)
- -- 
- 2.8.1
- 
diff --cc debian/patches/series
index 429ace5,0000000..03a335e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
- test_xml-decode-buffers-to-work-with-py3-also.patch
- Fix-deprecated-usage-of-cgi.escape-since-Python-3.3.patch
++0001-test_xml-decode-buffers-to-work-with-py3-also.patch
++0002-Fix-deprecated-usage-of-cgi.escape-since-Python-3.3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-prov.git