[Python-modules-commits] [txzmq] 08/11: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository txzmq.

commit 9d9ed3c67fdbc960d498965b22f55bbe132742b8
Merge: cc65af8 044ccd4
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri May 20 19:34:05 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...-when-reading-UTF-8-encoded-file-for-Pyth.patch | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  6 ++--
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index f484c70,0000000..1910eec
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 1e765c935956056d487ff3ff124e068d4e773d39
- 1e765c935956056d487ff3ff124e068d4e773d39
++044ccd42964a7a786b03a1fa4503c21614b6ffec
++044ccd42964a7a786b03a1fa4503c21614b6ffec
 +1e765c935956056d487ff3ff124e068d4e773d39
 +1e765c935956056d487ff3ff124e068d4e773d39
 +txzmq_0.7.4.orig.tar.gz
 +22a9edb8724f772245adc4a6d99d10fe9477ad7f
 +18966
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-io.open-when-reading-UTF-8-encoded-file-for-Pyth.patch
index 0000000,0000000..8c85bc8
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-io.open-when-reading-UTF-8-encoded-file-for-Pyth.patch
@@@ -1,0 -1,0 +1,33 @@@
++From 044ccd42964a7a786b03a1fa4503c21614b6ffec Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Fri, 20 May 2016 19:34:00 +0200
++Subject: Use io.open when reading UTF-8 encoded file for Python3
++ compatibility.
++
++---
++ setup.py | 6 ++++--
++ 1 file changed, 4 insertions(+), 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index f179891..1ae7540 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -1,14 +1,16 @@
+++import io
+++
++ from distutils.core import setup
++ 
++ setup(
++     name='txZMQ',
++-    version=open('VERSION').read().strip(),
+++    version=io.open('VERSION', encoding='utf-8').read().strip(),
++     packages=['txzmq', 'txzmq.test'],
++     license='GPLv2',
++     author='Andrey Smirnov',
++     author_email='me at smira.ru',
++     url='https://github.com/smira/txZMQ',
++     description='Twisted bindings for ZeroMQ',
++-    long_description=open('README.rst').read(),
+++    long_description=io.open('README.rst', encoding='utf-8').read(),
++     install_requires=["Twisted>=10.0", "pyzmq>=13"],
++ )
diff --cc debian/patches/series
index 0000000,0000000..c401df6
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-io.open-when-reading-UTF-8-encoded-file-for-Pyth.patch

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