summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2014-01-30 16:06:53 -0800
committerJohn Szakmeister <john@szakmeister.net>2014-01-30 16:06:53 -0800
commit1991f489a544b537743b6fcc537f917835f59bdd (patch)
treeb0deef79b9193e69ac9c327e1bb7acc81a696211
parent79102e33fda8a67292e7c79aafea85ea74334288 (diff)
parentb112828d393ac704315c88a85dfaa57c70f2b4f6 (diff)
downloadnose-1991f489a544b537743b6fcc537f917835f59bdd.tar.gz
Merge pull request #763 from warsaw/issue759
Fix the test failures in issue 759.
-rw-r--r--nose/config.py3
-rw-r--r--nose/suite.py1
2 files changed, 1 insertions, 3 deletions
diff --git a/nose/config.py b/nose/config.py
index 979fe3b..4214c2d 100644
--- a/nose/config.py
+++ b/nose/config.py
@@ -623,9 +623,6 @@ class NoOptions(object):
def __getnewargs__(self):
return ()
- def __getattr__(self, attr):
- return None
-
def __nonzero__(self):
return False
diff --git a/nose/suite.py b/nose/suite.py
index 3b68b23..18098ca 100644
--- a/nose/suite.py
+++ b/nose/suite.py
@@ -573,6 +573,7 @@ class FinalizingSuiteWrapper(unittest.TestSuite):
control.
"""
def __init__(self, suite, finalize):
+ super(FinalizingSuiteWrapper, self).__init__()
self.suite = suite
self.finalize = finalize