Source: protobuf
Version: 2.6.1-1.3
Severity: minor
Tags: patch
User: debian-pyt...@lists.debian.org
Usertags: python3.6

Dear Maintainer,

I don't think upstream really supports Python 3.6 yet, but it's a supported
version in Ubuntu now so I had to patch it :-). Attaching the patch in case
it's useful when Debian gets to Python 3.6.

Cheers,
mwh

-- System Information:
Debian Release: stretch/sid
  APT prefers xenial-updates
  APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 
'xenial'), (400, 'xenial-proposed'), (100, 'xenial-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.4.0-75-generic (SMP w/4 CPU cores)
Locale: LANG=en_NZ.UTF-8, LC_CTYPE=en_NZ.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru protobuf-3.0.0/debian/changelog protobuf-3.0.0/debian/changelog
--- protobuf-3.0.0/debian/changelog	2017-05-12 12:10:07.000000000 +1200
+++ protobuf-3.0.0/debian/changelog	2017-05-15 11:43:03.000000000 +1200
@@ -1,3 +1,9 @@
+protobuf (3.0.0-9ubuntu4) artful; urgency=medium
+
+  * Fix build with Python 3.6. 
+
+ -- Michael Hudson-Doyle <michael.hud...@ubuntu.com>  Mon, 15 May 2017 11:42:39 +1200
+
 protobuf (3.0.0-9ubuntu3) artful; urgency=medium
 
   * No change rebuild to add Python 3.6 support.
diff -Nru protobuf-3.0.0/debian/patches/python36.patch protobuf-3.0.0/debian/patches/python36.patch
--- protobuf-3.0.0/debian/patches/python36.patch	1970-01-01 12:00:00.000000000 +1200
+++ protobuf-3.0.0/debian/patches/python36.patch	2017-05-15 11:40:44.000000000 +1200
@@ -0,0 +1,29 @@
+Description: Fix two tests with Python 3.6
+Author: Michael Hudson-Doyle <michael.hud...@ubuntu.com>
+Origin: vendor
+Bug: https://github.com/google/protobuf/issues/3037
+Last-Update: 2017-05-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/python/google/protobuf/internal/json_format_test.py
++++ b/python/google/protobuf/internal/json_format_test.py
+@@ -753,7 +753,7 @@
+     text = '{"value": "0000-01-01T00:00:00Z"}'
+     self.assertRaisesRegexp(
+         json_format.ParseError,
+-        'Failed to parse value field: year is out of range.',
++        'Failed to parse value field: year (0 )?is out of range.',
+         json_format.Parse, text, message)
+     # Time bigger than maxinum time.
+     message.value.seconds = 253402300800
+--- a/python/google/protobuf/internal/well_known_types_test.py
++++ b/python/google/protobuf/internal/well_known_types_test.py
+@@ -284,7 +284,7 @@
+         '1972-01-01T01:00:00.01+08',)
+     self.assertRaisesRegexp(
+         ValueError,
+-        'year is out of range',
++        'year (0 )?is out of range',
+         message.FromJsonString,
+         '0000-01-01T00:00:00Z')
+     message.seconds = 253402300800
diff -Nru protobuf-3.0.0/debian/patches/series protobuf-3.0.0/debian/patches/series
--- protobuf-3.0.0/debian/patches/series	2017-03-16 23:10:45.000000000 +1300
+++ protobuf-3.0.0/debian/patches/series	2017-05-12 15:40:22.000000000 +1200
@@ -7,3 +7,4 @@
 sparc64.patch
 python3_long_fix.patch
 Hide-unnecessary-exported-library-symbols.patch
+python36.patch

Reply via email to