[Python-modules-commits] [python-pynzb] 03/07: merge patched into master

[Carl Suster]

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

arcresu-guest pushed a commit to branch master
in repository python-pynzb.

commit 13c940577c6fbf345bbd59ddb951e47bd5ca392c
Merge: 881ff2b 0a5a3e9
Author: Carl Suster <carl at contraflo.ws>
Date:   Mon Jan 9 11:58:20 2017 +1100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...1-set-message_id-properly-in-expat-parser.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 pynzb/expat_nzb.py                                 |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index f316a6e,0000000..b634411
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
- 124074ce42e5d83c71e028a8757afb392cc96548
- 124074ce42e5d83c71e028a8757afb392cc96548
++0a5a3e9b44be1ec1a150c027a07754a53f039189
++0a5a3e9b44be1ec1a150c027a07754a53f039189
 +124074ce42e5d83c71e028a8757afb392cc96548
 +124074ce42e5d83c71e028a8757afb392cc96548
 +python-pynzb_0.1.0.orig.tar.gz
 +cf39d7f32c15f281ab81b0043b4068d101a2cd1f
 +5598
diff --cc debian/patches/0001-set-message_id-properly-in-expat-parser.patch
index 0000000,0000000..2ed07ab
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-set-message_id-properly-in-expat-parser.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 0a5a3e9b44be1ec1a150c027a07754a53f039189 Mon Sep 17 00:00:00 2001
++From: Carl Suster <carl at contraflo.ws>
++Date: Mon, 9 Jan 2017 11:57:13 +1100
++Subject: set message_id properly in expat parser
++
++Upstream had a typo in the expat parser wrapper which called the
++non-existent message_id() when set_message_id() was intended.
++---
++ pynzb/expat_nzb.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/pynzb/expat_nzb.py b/pynzb/expat_nzb.py
++index 5c1b096..313dee6 100644
++--- a/pynzb/expat_nzb.py
+++++ b/pynzb/expat_nzb.py
++@@ -22,7 +22,7 @@ class ExpatNZBParser(BaseNZBParser):
++         elif name == 'group':
++             self.current_file.add_group(self.current_data)
++         elif name == 'segment':
++-            self.current_segment.message_id(self.current_data)
+++            self.current_segment.set_message_id(self.current_data)
++             self.current_file.add_segment(self.current_segment)
++     
++     def char_data(self, data):
diff --cc debian/patches/series
index 0000000,0000000..6e8e20b
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-set-message_id-properly-in-expat-parser.patch

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