[Python-modules-commits] [django-oauth-toolkit] 07/12: 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 django-oauth-toolkit.

commit ccfb276b2b7fddb539deb4085d30a806c74b7475
Merge: 4934bfa e22c2d8
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Dec 7 17:14:36 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...2-Use-io.open-to-read-UTF-8-encoded-files.patch | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  5 +--
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index e23593c,0000000..9e1ad72
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
- 15d5d2f5fe0decbee63bff4e3673da6b4e2ae518
- 15d5d2f5fe0decbee63bff4e3673da6b4e2ae518
++e22c2d81e0e4b5c8e20f0c6a62f470ac3ad3919d
++e22c2d81e0e4b5c8e20f0c6a62f470ac3ad3919d
 +acc128fd39dff68579749639a8dbffa64a0e4a78
 +acc128fd39dff68579749639a8dbffa64a0e4a78
 +django-oauth-toolkit_0.11.0.orig.tar.gz
 +c854ec40ea5d3c4960dc8ab5863809613b92888f
 +69928
diff --cc debian/patches/0002-Use-io.open-to-read-UTF-8-encoded-files.patch
index 0000000,0000000..0b7ba47
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Use-io.open-to-read-UTF-8-encoded-files.patch
@@@ -1,0 -1,0 +1,38 @@@
++From e22c2d81e0e4b5c8e20f0c6a62f470ac3ad3919d Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Wed, 7 Dec 2016 17:14:14 +0100
++Subject: Use io.open to read UTF-8 encoded files.
++
++---
++ setup.py | 5 +++--
++ 1 file changed, 3 insertions(+), 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 309c526..9c4d332 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -2,6 +2,7 @@
++ # -*- coding: utf-8 -*-
++ 
++ from setuptools import setup, find_packages
+++import io
++ import os
++ import re
++ 
++@@ -10,14 +11,14 @@ def get_version(package):
++     """
++     Return package version as listed in `__version__` in `init.py`.
++     """
++-    init_py = open(os.path.join(package, '__init__.py')).read()
+++    init_py = io.open(os.path.join(package, '__init__.py'), encoding='utf-8').read()
++     return re.match("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
++ 
++ 
++ version = get_version('oauth2_provider')
++ 
++ 
++-LONG_DESCRIPTION = open('README.rst').read()
+++LONG_DESCRIPTION = io.open('README.rst', encodig='utf-8').read()
++ 
++ setup(
++     name="django-oauth-toolkit",
diff --cc debian/patches/series
index 3c50a87,0000000..1adbeaf
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Replace-CDN-URL-with-a-local-bootstrap-CSS-file.patch
++0002-Use-io.open-to-read-UTF-8-encoded-files.patch

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