[Python-modules-commits] [taskw] 03/04: merge patched into master

[Edward Betts]

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

edward pushed a commit to branch master
in repository taskw.

commit 880b68a3f30a2cbfae12fcd290cf8d4d6658e138
Merge: 8db4562 b823934
Author: Edward Betts <edward at 4angle.com>
Date:   Tue Dec 15 11:35:28 2015 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 .../0002-Test-suite-patch-no-longer-required.patch | 50 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 taskw/test/test_datas.py                           |  8 ++--
 4 files changed, 57 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 80a23ec,0000000..261e942
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
- fa1ff7ebaa5423adf76a07cc30d5502c4d8b39ca
- fa1ff7ebaa5423adf76a07cc30d5502c4d8b39ca
++b8239349ce6d0f910d9a3ef2ddc09fbdd0830385
++b8239349ce6d0f910d9a3ef2ddc09fbdd0830385
 +a6ff52244fc64c5197a261d01a601d15a20a8cc1
 +a6ff52244fc64c5197a261d01a601d15a20a8cc1
 +taskw_1.1.0.orig.tar.gz
 +effbc94bce2ae5f78816b0a7b9de67a3351d9d84
 +39998
diff --cc debian/patches/0002-Test-suite-patch-no-longer-required.patch
index 0000000,0000000..361099e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Test-suite-patch-no-longer-required.patch
@@@ -1,0 -1,0 +1,50 @@@
++From b8239349ce6d0f910d9a3ef2ddc09fbdd0830385 Mon Sep 17 00:00:00 2001
++From: Edward Betts <edward at 4angle.com>
++Date: Tue, 15 Dec 2015 11:33:45 +0000
++Subject: Test suite patch no longer required.
++
++This reverts commit fa1ff7ebaa5423adf76a07cc30d5502c4d8b39ca.
++---
++ taskw/test/test_datas.py | 8 ++++----
++ 1 file changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/taskw/test/test_datas.py b/taskw/test/test_datas.py
++index fec3981..001eb9f 100644
++--- a/taskw/test/test_datas.py
+++++ b/taskw/test/test_datas.py
++@@ -369,7 +369,7 @@ class TestDBShellout(_BaseTestDB):
++         task1 = self.tw.task_add("[foobar1]")
++         task2 = self.tw.task_add("[foobar2]")
++         tasks = self.tw.filter_tasks({
++-            'description.contains': '\[foobar2\]',
+++            'description.contains': '[foobar2]',
++         })
++         eq_(len(tasks), 1)
++         eq_(tasks[0]['id'], 2)
++@@ -388,7 +388,7 @@ class TestDBShellout(_BaseTestDB):
++         task2 = self.tw.task_add("foobar2")
++         task2 = self.tw.task_add("foobar+")
++         tasks = self.tw.filter_tasks({
++-            'description.contains': 'foobar\+',
+++            'description.contains': 'foobar+',
++         })
++         eq_(len(tasks), 1)
++         eq_(tasks[0]['id'], 3)
++@@ -417,7 +417,7 @@ class TestDBShellout(_BaseTestDB):
++         task1 = self.tw.task_add("foobar1")
++         task2 = self.tw.task_add("foo?bar")
++         tasks = self.tw.filter_tasks({
++-                'description.contains': 'oo\?ba',
+++                'description.contains': 'oo?ba',
++         })
++         eq_(len(tasks), 1)
++         eq_(tasks[0]['id'], 2)
++@@ -446,7 +446,7 @@ class TestDBShellout(_BaseTestDB):
++         task2 = self.tw.task_add("foobar2")
++         task2 = self.tw.task_add("foo?bar")
++         tasks = self.tw.filter_tasks({
++-            'description.contains': 'foo\?bar',
+++            'description.contains': 'foo?bar',
++         })
++         eq_(len(tasks), 1)
++         eq_(tasks[0]['id'], 3)
diff --cc debian/patches/series
index 74df6ea,0000000..2b3c782
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-fix-test-suite-by-escaping-special-characters.patch
++0002-Test-suite-patch-no-longer-required.patch

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