[Python-modules-commits] [python-django-localflavor] 03/04: merge patched into master

[Orestis Ioannou]

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

oorestisime-guest pushed a commit to branch master
in repository python-django-localflavor.

commit 94ad085cae678b6821c63fefb003bace7a4c94e8
Merge: 7cccfe3 bd031f1
Author: Orestis Ioannou <orestis at oioannou.com>
Date:   Fri Oct 23 17:54:56 2015 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../patches/0001-Update-docs-for-sphinx-1.3.patch  | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/extensions/promises.py                        |  4 +--
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 0542156,0000000..8682a84
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
- 8c8c7742f6c7afe614c19cca135fb5f127c82cbf
- 8c8c7742f6c7afe614c19cca135fb5f127c82cbf
++bd031f1e740e970ca1a0e5e3ccfae69309a9f27f
++bd031f1e740e970ca1a0e5e3ccfae69309a9f27f
 +8c8c7742f6c7afe614c19cca135fb5f127c82cbf
 +8c8c7742f6c7afe614c19cca135fb5f127c82cbf
 +django-localflavor_1.1.orig.tar.gz
 +f8f9e32aa627bf3b7b90aa69b53f05766a07ad03
 +2552086
diff --cc debian/patches/0001-Update-docs-for-sphinx-1.3.patch
index 0000000,0000000..a90ff90
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Update-docs-for-sphinx-1.3.patch
@@@ -1,0 -1,0 +1,30 @@@
++From bd031f1e740e970ca1a0e5e3ccfae69309a9f27f Mon Sep 17 00:00:00 2001
++From: Orestis Ioannou <orestis at oioannou.com>
++Date: Fri, 23 Oct 2015 16:23:21 +0200
++Subject: Update docs for sphinx 1.3
++
++---
++ docs/extensions/promises.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/docs/extensions/promises.py b/docs/extensions/promises.py
++index f3e76fd..8633493 100644
++--- a/docs/extensions/promises.py
+++++ b/docs/extensions/promises.py
++@@ -6,7 +6,7 @@ except ImportError:
++ 
++ from django.utils.functional import Promise
++ 
++-from sphinx.util.inspect import safe_repr
+++from sphinx.util.inspect import object_description
++ 
++ list_or_tuple = lambda x: isinstance(x, (tuple, list))
++ 
++@@ -34,6 +34,6 @@ def setup(app):
++     from sphinx.ext import autodoc
++ 
++     def lazy_safe_repr(object):
++-        return safe_repr(lazy_repr(object))
+++        return object_description(lazy_repr(object))
++ 
++     autodoc.safe_repr = lazy_safe_repr  # noqa
diff --cc debian/patches/series
index 0000000,0000000..a9557af
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Update-docs-for-sphinx-1.3.patch

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