[Python-modules-commits] [python-scrapy-djangoitem] 04/05: 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 python-scrapy-djangoitem.

commit 81ebe5dee1ec0bdd768ea79729b6a5b979353f4a
Merge: 959ea43 db3256a
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Feb 2 20:14:58 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...Use-io.open-to-read-UTF-8-README.rst-file.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  3 ++-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index a27c57f,0000000..1903777
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- af33fe3e278fefacff302871c5100be196856bfb
- af33fe3e278fefacff302871c5100be196856bfb
++db3256a0366cf0223386c144c0f012c5fd237407
++db3256a0366cf0223386c144c0f012c5fd237407
 +af33fe3e278fefacff302871c5100be196856bfb
 +af33fe3e278fefacff302871c5100be196856bfb
 +python-scrapy-djangoitem_1.1.1.orig.tar.gz
 +df1f9818f9da0b45b3a473285c832c7e81142307
 +6951
diff --cc debian/patches/0001-Use-io.open-to-read-UTF-8-README.rst-file.patch
index 0000000,0000000..28c1b29
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-io.open-to-read-UTF-8-README.rst-file.patch
@@@ -1,0 -1,0 +1,29 @@@
++From db3256a0366cf0223386c144c0f012c5fd237407 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Thu, 2 Feb 2017 20:14:47 +0100
++Subject: Use io.open to read UTF-8 README.rst file.
++
++Otherwise we would not be able to use setup.py with Python3.
++---
++ setup.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 2aa7bb8..b654e0f 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -1,12 +1,13 @@
++ from setuptools import setup, find_packages
++ 
+++import io
++ 
++ setup(
++     name='scrapy-djangoitem',
++     version='1.1.1',
++     url='https://github.com/scrapy-plugins/scrapy-djangoitem',
++     description='Scrapy extension to write scraped items using Django models',
++-    long_description=open('README.rst').read(),
+++    long_description=io.open('README.rst', encoding='utf-8').read(),
++     author='Scrapy developers',
++     license='BSD',
++     packages=find_packages(exclude=('tests', 'tests.*')),
diff --cc debian/patches/series
index 0000000,0000000..e1de5e1
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-io.open-to-read-UTF-8-README.rst-file.patch

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