[Python-modules-commits] [django-recurrence] 06/13: 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-recurrence.

commit e118ef0142fd77d9a196e29bdd44ddede2bc23f6
Merge: f472a5e 5cf7d78
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue May 3 19:35:14 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...se-Python-3-compatible-exception-handling.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/github.py                                     |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 75b0dbd,0000000..d37e22b
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
- 9701c091ddfd818b6a42e2b4dbdb4c3b28497833
- 9701c091ddfd818b6a42e2b4dbdb4c3b28497833
++5cf7d7811e952aaa56835e72d59aab4ea5df79a4
++5cf7d7811e952aaa56835e72d59aab4ea5df79a4
 +9701c091ddfd818b6a42e2b4dbdb4c3b28497833
 +9701c091ddfd818b6a42e2b4dbdb4c3b28497833
 +django-recurrence_1.3.0.orig.tar.gz
 +2141b1dd6ad6f722f9a9bf1492fc173e39764848
 +86835
diff --cc debian/patches/0001-Use-Python-3-compatible-exception-handling.patch
index 0000000,0000000..c043991
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-Python-3-compatible-exception-handling.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 5cf7d7811e952aaa56835e72d59aab4ea5df79a4 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Tue, 3 May 2016 19:34:30 +0200
++Subject: Use Python 3 compatible exception handling.
++
++---
++ docs/github.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/github.py b/docs/github.py
++index 2f7f153..1623fb0 100644
++--- a/docs/github.py
+++++ b/docs/github.py
++@@ -20,7 +20,7 @@ def make_issue_node(rawtext, app, slug, options):
++         base = app.config.github_project_url
++         if not base:
++             raise AttributeError
++-    except AttributeError, err:
+++    except AttributeError as err:
++         raise ValueError('github_project_url configuration value is not set (%s)' % str(err))
++ 
++     slash = '/' if base[-1] != '/' else ''
diff --cc debian/patches/series
index 0000000,0000000..71bd34f
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-Python-3-compatible-exception-handling.patch

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