mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-04-30 16:57:29 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
https://github.com/nose-devs/nose/commit/0181572a64195a8fa1c6c867ae6c61a79a9606ca.diff
|
|
|
|
diff --git a/nose/util.py b/nose/util.py
|
|
index dcb5fef..e612696 100644
|
|
--- a/nose/util.py
|
|
+++ b/nose/util.py
|
|
@@ -447,11 +447,10 @@ def try_run(obj, names):
|
|
if func is not None:
|
|
if type(obj) == types.ModuleType:
|
|
# py.test compatibility
|
|
- try:
|
|
- args, varargs, varkw, defaults = inspect.getargspec(func)
|
|
- if hasattr(func, '__call__') and ismethod(func.__call__):
|
|
- args.pop(0)
|
|
- except TypeError:
|
|
+ if isinstance(func, types.FunctionType):
|
|
+ args, varargs, varkw, defaults = \
|
|
+ inspect.getargspec(func)
|
|
+ else:
|
|
# Not a function. If it's callable, call it anyway
|
|
if hasattr(func, '__call__'):
|
|
func = func.__call__
|
|
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
|
|
index 2bd837c..cd9ba6e 100644
|
|
--- a/unit_tests/test_utils.py
|
|
+++ b/unit_tests/test_utils.py
|
|
@@ -1,4 +1,5 @@
|
|
import os
|
|
+import sys
|
|
import unittest
|
|
import nose
|
|
from nose import case
|
|
@@ -168,7 +169,7 @@ def __call__(self):
|
|
class Bar_m:
|
|
def __call__(self, mod):
|
|
pass
|
|
-
|
|
+
|
|
foo = imp.new_module('foo')
|
|
foo.bar = bar
|
|
foo.bar_m = bar_m
|
|
|