[med-svn] [python-ruffus] 01/01: Thanks for the hints to Dmitry Shachnev <mitya57 at debian.org>

[Andreas Tille]

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

tille pushed a commit to branch master
in repository python-ruffus.

commit 7c479e4172d43386a5b3fb65721172149643a979
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jan 15 11:25:01 2016 +0100

    Thanks for the hints to Dmitry Shachnev <mitya57 at debian.org>
---
 debian/changelog                | 4 +++-
 debian/patches/python-3.5.patch | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f7f4f1e..f31c189 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 python-ruffus (2.6.3+dfsg-2) UNRELEASED; urgency=medium
 
-  * Fix issue in test when using Python 3.5
+  * Fix issue in test when using Python 3.5 (Thanks for the hints to
+    Dmitry Shachnev <mitya57 at debian.org>)
+    Closes: #811002
 
  -- Andreas Tille <tille at debian.org>  Fri, 15 Jan 2016 10:08:16 +0100
 
diff --git a/debian/patches/python-3.5.patch b/debian/patches/python-3.5.patch
index 822da4d..fd34ea9 100644
--- a/debian/patches/python-3.5.patch
+++ b/debian/patches/python-3.5.patch
@@ -6,12 +6,13 @@ Description: Fix issue in test suite when using Python 3.5
 
 --- a/ruffus/test/test_ruffus_utility.py
 +++ b/ruffus/test/test_ruffus_utility.py
-@@ -259,7 +259,7 @@ class Test_compile_regex (unittest.TestC
+@@ -259,7 +259,8 @@ class Test_compile_regex (unittest.TestC
          try:
              compile_regex("Dummy Task", regex(".*)"), Exception, "test1")
          except Exception as e:
 -            self.assertEqual(e.args, ('Dummy Task', "test1: regular expression regex('.*)') is malformed\n[sre_constants.error: (unbalanced parenthesis)]"))
-+            self.assertEqual(e.args, ('Dummy Task', "test1: regular expression regex('.*)') is malformed\n[sre_constants.error: (unbalanced parenthesis at position 2)]"))
++            self.assertEqual(e.args[0], 'Dummy Task')
++            self.assertIn("test1: regular expression regex('.*)') is malformed\n[sre_constants.error: (unbalanced parenthesis", e.args[1])
  
          # bad number of items regex
          self.assertRaises(Exception, compile_regex, "Dummy Task", regex(".*", "o"), Exception, "test1")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-ruffus.git