diff options
| author | Jelmer Vernooij <jelmer@jelmer.uk> | 2018-04-15 13:34:50 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@jelmer.uk> | 2018-04-15 13:34:50 +0100 |
| commit | 0f89037141581e2ad2f6cbbaf84da5af3679640b (patch) | |
| tree | 51a238afec6813fabcf250ab77b8bdcceb9cadb6 | |
| parent | 1f9710409b45f60541330758f74e3a0f4836eef3 (diff) | |
| download | python-fastimport-git-0f89037141581e2ad2f6cbbaf84da5af3679640b.tar.gz | |
Drop Cope_with_bytestirngs_in_utf8_bytes_string.patch, which is now included upstream.
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/patches/Cope_with_bytestrings_in_utf8_bytes_string.patch | 24 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 8 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog index a6b2822..1ba90dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ -python-fastimport (0.9.6-4) UNRELEASED; urgency=medium +python-fastimport (0.9.8-1) UNRELEASED; urgency=medium + [ Ondřej Nový ] * d/control: Set Vcs-* to salsa.debian.org * d/copyright: Use https protocol in Format field * d/control: Remove XS-Testsuite field, not needed anymore - -- Ondřej Nový <onovy@debian.org> Tue, 13 Feb 2018 10:07:41 +0100 + [ Jelmer Vernooij ] + * New upstream release. + + Drop Cope_with_bytestirngs_in_utf8_bytes_string.patch, which is now + included upstream. + + -- Jelmer Vernooij <jelmer@debian.org> Sun, 15 Apr 2018 13:33:51 +0100 python-fastimport (0.9.6-3) unstable; urgency=medium diff --git a/debian/patches/Cope_with_bytestrings_in_utf8_bytes_string.patch b/debian/patches/Cope_with_bytestrings_in_utf8_bytes_string.patch deleted file mode 100644 index efedb57..0000000 --- a/debian/patches/Cope_with_bytestrings_in_utf8_bytes_string.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: Cope with bytestrings in utf8_bytes_string() helper. -Author: Jelmer Vernooij <jelmer@jelmer.uk> -Acked-By: Unit 193 <unit193@ubuntu.com> -Acked-By: Mattia Rizzolo <mattia@debian.org> -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1647101 -Last-Update: 2017-04-23 - ---- a/fastimport/helpers.py -+++ b/fastimport/helpers.py -@@ -99,9 +99,12 @@ - - - def utf8_bytes_string(s): -- """Convert a string to a bytes string encoded in utf8""" -+ """Convert a string to a bytes string (if necessary, encode in utf8)""" - if sys.version_info[0] == 2: -- return s.encode('utf8') -+ if isinstance(s, str): -+ return s -+ else: -+ return s.encode('utf8') - else: - if isinstance(s, str): - return bytes(s, encoding='utf8') diff --git a/debian/patches/series b/debian/patches/series index 53d2ca8..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -Cope_with_bytestrings_in_utf8_bytes_string.patch |