[Python-modules-commits] [drf-haystack] 10/17: 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 drf-haystack.

commit c980eb84d102a406a968c611eb75c6aabc3cf557
Merge: 9780928 366db6e
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Jan 2 17:29:02 2016 +0100

    merge patched into master

 PKG-INFO                           |  2 +-
 README.rst                         |  2 +-
 debian/.git-dpm                    |  6 ++--
 debian/patches/python3-io.patch    |  4 +--
 docs/advanced_usage.rst            | 22 +++++++++++++--
 docs/conf.py                       |  2 +-
 docs/index.rst                     | 57 ++++++++++++++++++++++++++++++++++++++
 drf_haystack.egg-info/PKG-INFO     |  2 +-
 drf_haystack.egg-info/requires.txt |  1 -
 drf_haystack/__init__.py           |  2 +-
 drf_haystack/filters.py            | 25 +++++++++++++----
 drf_haystack/serializers.py        | 13 ++++++---
 requirements.txt                   |  2 +-
 setup.cfg                          |  2 +-
 setup.py                           |  3 +-
 tests/test_serializers.py          | 20 +++++++++++++
 tox.ini                            |  1 +
 17 files changed, 139 insertions(+), 27 deletions(-)

diff --cc debian/.git-dpm
index f011220,0000000..110d290
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
- 602ac1a1abe7cb30ccb47984391d4b0d2e8c7b92
- 602ac1a1abe7cb30ccb47984391d4b0d2e8c7b92
- 7125c89ce546985031495b0a69bfac1378c50603
++366db6e9e18ee0564badead81b0d40b5a6cfc5bb
++366db6e9e18ee0564badead81b0d40b5a6cfc5bb
++35215bc7a17f7fb475a8cc7b0975aaa106c7e5db
 +35215bc7a17f7fb475a8cc7b0975aaa106c7e5db
 +drf-haystack_1.5.6.orig.tar.gz
 +c78b75af307dd3ab56c0e5c378696901038c6df6
 +52734
diff --cc debian/patches/python3-io.patch
index 5dad988,0000000..99a3a61
mode 100644,000000..100644
--- a/debian/patches/python3-io.patch
+++ b/debian/patches/python3-io.patch
@@@ -1,33 -1,0 +1,33 @@@
- From 602ac1a1abe7cb30ccb47984391d4b0d2e8c7b92 Mon Sep 17 00:00:00 2001
++From 366db6e9e18ee0564badead81b0d40b5a6cfc5bb 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
 +Last-Update: 2015-08-30
 +Patch-Name: python3-io.patch
 +---
 + setup.py | 3 ++-
 + 1 file changed, 2 insertions(+), 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
- index 9599f13..cda8700 100644
++index 696709d..0abcf26 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 @@ 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