[Python-modules-commits] [drf-haystack] 02/17: Initialize git-dpm

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository drf-haystack.

commit b0dd7a0b554fa149396f3761f80899d5bee4f2b9
Merge: 3ea9b2e 4d00caf
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Nov 13 08:25:40 2015 +0100

    Initialize git-dpm

 debian/.git-dpm                 |  8 ++++++++
 debian/patches/python3-io.patch | 22 +++++++++++++++-------
 setup.py                        |  3 ++-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 0000000,0000000..5cb54c2
new file mode 100644
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,0 -1,0 +1,8 @@@
++# see git-dpm(1) from git-dpm package
++4d00cafe4f86f036c08905dd8a0d0b0137e58932
++4d00cafe4f86f036c08905dd8a0d0b0137e58932
++3608abe12b9ae82c777f867cf478199ba2813725
++3608abe12b9ae82c777f867cf478199ba2813725
++drf-haystack_1.5.2.orig.tar.gz
++b9c20788297594f04701f54787876dd28e0d0942
++10056
diff --cc debian/patches/python3-io.patch
index 62bada4,0000000..d1301b1
mode 100644,000000..100644
--- a/debian/patches/python3-io.patch
+++ b/debian/patches/python3-io.patch
@@@ -1,25 -1,0 +1,33 @@@
- Description: Use io module to open UTF-8 encoded file.
++From 4d00cafe4f86f036c08905dd8a0d0b0137e58932 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <fladi at debian.org>
++Date: Fri, 13 Nov 2015 08:25:39 +0100
++Subject: Use io module to open UTF-8 encoded file.
++
 +Forwarded: no
- Author: Michael Fladischer <fladi at debian.org>
 +Last-Update: 2015-08-30
- Index: drf-haystack/setup.py
- ===================================================================
- --- drf-haystack.orig/setup.py	2015-08-30 13:16:24.697759827 +0200
- +++ drf-haystack/setup.py	2015-08-30 13:41:31.344495143 +0200
++Patch-Name: python3-io.patch
++---
++ setup.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 4ab8eb3..f192db9 100644
++--- a/setup.py
+++++ b/setup.py
 +@@ -2,6 +2,7 @@
 + 
 + import re
 + import os
 ++import io
 + 
 + try:
 +     from setuptools import setup
- @@ -15,7 +16,7 @@
++@@ -15,7 +16,7 @@ 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.search("__version__ = ['\"]([^'\"]+)['\"]", init_py).group(1)
 + 
 + setup(

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