summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2014-03-19 05:20:27 -0400
committerJohn Szakmeister <john@szakmeister.net>2014-03-19 05:27:06 -0400
commit43c35e49106916f51f676455888fe7a39d030113 (patch)
tree4540ab792431f77ae1c38f449512b3c64bf576ed
parent74cdf50429897c34ca9f4fb026c3a623daa8767e (diff)
downloadnose-43c35e49106916f51f676455888fe7a39d030113.tar.gz
Fix #780: only set im_class in Python 2.x
-rw-r--r--CHANGELOG1
-rw-r--r--nose/pyversion.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6511c90..e22230f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Under Development
- Fixed #782: Test failures with Python >= 3.3
Patch by Dmitry Shachnev.
+- Fixed #780: Fix a regression with Python 3
1.3.1
diff --git a/nose/pyversion.py b/nose/pyversion.py
index fba5ada..8b56614 100644
--- a/nose/pyversion.py
+++ b/nose/pyversion.py
@@ -89,7 +89,8 @@ class UnboundMethod:
self.__dict__ = func.__dict__.copy()
self._func = func
self.__self__ = UnboundSelf(cls)
- self.im_class = cls
+ if sys.version_info < (3, 0):
+ self.im_class = cls
def address(self):
cls = self.__self__.cls