| 1 |
floppym 14/04/01 01:18:40 |
| 2 |
|
| 3 |
Added: nose-1.3.1-python3.4.patch |
| 4 |
Log: |
| 5 |
Version bump. Add python3.4. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-python/nose/files/nose-1.3.1-python3.4.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/nose/files/nose-1.3.1-python3.4.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/nose/files/nose-1.3.1-python3.4.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: nose-1.3.1-python3.4.patch |
| 16 |
=================================================================== |
| 17 |
From 192694ed9f70447317bd54e427a17208bddf03be Mon Sep 17 00:00:00 2001 |
| 18 |
From: John Szakmeister <john@×××××××××××.net> |
| 19 |
Date: Sat, 15 Mar 2014 06:15:42 -0400 |
| 20 |
Subject: [PATCH] Fix #783: try_run is broken with Python 3.4 |
| 21 |
|
| 22 |
It turns out that we expected inspect.getargspec() to only work on |
| 23 |
functions (versus classes that are callable). Python 3.4 has changed |
| 24 |
this behavior and now happily returns the arg spec. Let's try to detect |
| 25 |
this situation by checking the __call__() method to if it's actually the |
| 26 |
method of a class. If so, pop the 'self' argument off of args--similar |
| 27 |
to what's done in the exceptional case below. |
| 28 |
--- |
| 29 |
CHANGELOG | 1 + |
| 30 |
nose/util.py | 4 +++- |
| 31 |
2 files changed, 4 insertions(+), 1 deletion(-) |
| 32 |
|
| 33 |
diff --git a/nose/util.py b/nose/util.py |
| 34 |
index 7995700..dcb5fef 100644 |
| 35 |
--- a/nose/util.py |
| 36 |
+++ b/nose/util.py |
| 37 |
@@ -8,7 +8,7 @@ |
| 38 |
import sys |
| 39 |
import types |
| 40 |
import unittest |
| 41 |
-from nose.pyversion import ClassType, TypeType, isgenerator |
| 42 |
+from nose.pyversion import ClassType, TypeType, isgenerator, ismethod |
| 43 |
|
| 44 |
|
| 45 |
log = logging.getLogger('nose') |
| 46 |
@@ -449,6 +449,8 @@ def try_run(obj, names): |
| 47 |
# py.test compatibility |
| 48 |
try: |
| 49 |
args, varargs, varkw, defaults = inspect.getargspec(func) |
| 50 |
+ if hasattr(func, '__call__') and ismethod(func.__call__): |
| 51 |
+ args.pop(0) |
| 52 |
except TypeError: |
| 53 |
# Not a function. If it's callable, call it anyway |
| 54 |
if hasattr(func, '__call__'): |
| 55 |
-- |
| 56 |
1.8.5.5 |
Archives