[Python-modules-commits] [django-oauth-toolkit] 09/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 c51a20d1e66f37768e336043c91976784f564957
Merge: ccfb276 32081b6
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Dec 7 17:15:56 2016 +0100

    merge patched into master

 debian/.git-dpm                                                   | 4 ++--
 debian/patches/0002-Use-io.open-to-read-UTF-8-encoded-files.patch | 6 +++---
 setup.py                                                          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 9e1ad72,0000000..2b7e3ea
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
- e22c2d81e0e4b5c8e20f0c6a62f470ac3ad3919d
- e22c2d81e0e4b5c8e20f0c6a62f470ac3ad3919d
++32081b61f7ea91b548abadc53c8210e907ef6c20
++32081b61f7ea91b548abadc53c8210e907ef6c20
 +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 0b7ba47,0000000..303aaf4
mode 100644,000000..100644
--- a/debian/patches/0002-Use-io.open-to-read-UTF-8-encoded-files.patch
+++ b/debian/patches/0002-Use-io.open-to-read-UTF-8-encoded-files.patch
@@@ -1,38 -1,0 +1,38 @@@
- From e22c2d81e0e4b5c8e20f0c6a62f470ac3ad3919d Mon Sep 17 00:00:00 2001
++From 32081b61f7ea91b548abadc53c8210e907ef6c20 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
++index 309c526..89e8d6b 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()
+++LONG_DESCRIPTION = io.open('README.rst', encoding='utf-8').read()
 + 
 + setup(
 +     name="django-oauth-toolkit",

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