[Python-modules-commits] r28246 - in packages/nose/trunk/debian (5 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Wednesday, March 19, 2014 @ 10:50:17
  Author: mitya57-guest
Revision: 28246

Add three new patches (issue782, issue783 and issue788) to fix various test failures.

Added:
  packages/nose/trunk/debian/patches/issue783
  packages/nose/trunk/debian/patches/issue788
Modified:
  packages/nose/trunk/debian/changelog
  packages/nose/trunk/debian/patches/issue782
  packages/nose/trunk/debian/patches/series

Modified: packages/nose/trunk/debian/changelog
===================================================================
--- packages/nose/trunk/debian/changelog	2014-03-18 23:08:29 UTC (rev 28245)
+++ packages/nose/trunk/debian/changelog	2014-03-19 10:50:17 UTC (rev 28246)
@@ -3,7 +3,8 @@
   * Team upload.
   * New upstream release.
   * Drop d/patches/issue759, applied in the new version.
-  * Add d/patches/issue782 to fix test failure (closes: #741750).
+  * Add three new patches (issue782, issue783 and issue788) to fix
+    various test failures (closes: #741750).
   * Disable one more unstable test.
   * Remove unit_tests/support/doctest/noname_wrapped.not_pyc in
     clean target.

Modified: packages/nose/trunk/debian/patches/issue782
===================================================================
--- packages/nose/trunk/debian/patches/issue782	2014-03-18 23:08:29 UTC (rev 28245)
+++ packages/nose/trunk/debian/patches/issue782	2014-03-19 10:50:17 UTC (rev 28246)
@@ -1,8 +1,7 @@
-Description: Make doctest work with new configparser versions
-Author: Dmitry Shachnev <mitya57 at gmail.com>
-Bug: https://github.com/nose-devs/nose/issues/782
+Description: make doctest work with new configparser versions
+Origin: upstream, https://github.com/nose-devs/nose/commit/5bcedc9a0601b4
 Bug-Debian: https://bugs.debian.org/741750
-Forwarded: yes, https://github.com/nose-devs/nose/pull/784
+Last-Update: 2014-03-19
 
 --- a/unit_tests/test_config_defaults.rst
 +++ b/unit_tests/test_config_defaults.rst

Added: packages/nose/trunk/debian/patches/issue783
===================================================================
--- packages/nose/trunk/debian/patches/issue783	                        (rev 0)
+++ packages/nose/trunk/debian/patches/issue783	2014-03-19 10:50:17 UTC (rev 28246)
@@ -0,0 +1,24 @@
+Description: fix failure in test_try_run
+Origin: upstream, https://github.com/nose-devs/nose/commit/192694ed9f7044
+Last-Update: 2014-03-19
+
+--- a/nose/util.py
++++ b/nose/util.py
+@@ -8,7 +8,7 @@ import re
+ import sys
+ import types
+ import unittest
+-from nose.pyversion import ClassType, TypeType, isgenerator
++from nose.pyversion import ClassType, TypeType, isgenerator, ismethod
+ 
+ 
+ log = logging.getLogger('nose')
+@@ -449,6 +449,8 @@ def try_run(obj, names):
+                 # py.test compatibility
+                 try:
+                     args, varargs, varkw, defaults = inspect.getargspec(func)
++                    if hasattr(func, '__call__') and ismethod(func.__call__):
++                        args.pop(0)
+                 except TypeError:
+                     # Not a function. If it's callable, call it anyway
+                     if hasattr(func, '__call__'):

Added: packages/nose/trunk/debian/patches/issue788
===================================================================
--- packages/nose/trunk/debian/patches/issue788	                        (rev 0)
+++ packages/nose/trunk/debian/patches/issue788	2014-03-19 10:50:17 UTC (rev 28246)
@@ -0,0 +1,18 @@
+Description: fix issue680 test failure when LC_ALL=C
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Forwarded: yes, https://github.com/nose-devs/nose/pull/788
+Last-Update: 2014-03-19
+
+--- a/functional_tests/test_xunit.py
++++ b/functional_tests/test_xunit.py
+@@ -86,8 +86,8 @@ class TestIssue680(PluginTester, unittest.TestCase):
+ 
+     def runTest(self):
+         print str(self.output)
+-        f = open(xml_results_filename,'r')
+-        result = f.read()
++        f = open(xml_results_filename,'rb')
++        result = f.read().decode('utf-8')
+         f.close()
+         print result
+         assert 'tests="1" errors="0" failures="0" skip="0"' in result

Modified: packages/nose/trunk/debian/patches/series
===================================================================
--- packages/nose/trunk/debian/patches/series	2014-03-18 23:08:29 UTC (rev 28245)
+++ packages/nose/trunk/debian/patches/series	2014-03-19 10:50:17 UTC (rev 28246)
@@ -3,3 +3,5 @@
 no-distribute_setup
 disable-unstable-tests
 issue782
+issue783
+issue788