Fixed issue 161 (2.6 compat)

4 files changed, 15 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 9ad0373..e8d7dfe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+0.10.4
+
+- Made nose compatible with python 2.6.
+
 0.10.3
 
 - Fixed bug in nosetests setup command that caused an exception to be raised
diff --git a/nose/__init__.py b/nose/__init__.py
index 9deb02c..139ef0a 100644
--- a/nose/__init__.py
+++ b/nose/__init__.py
@@ -397,7 +397,7 @@ from nose.exc import SkipTest, DeprecatedTest
 from nose.tools import with_setup 
 
 __author__ = 'Jason Pellerin'
-__versioninfo__ = (0, 10, 3)
+__versioninfo__ = (0, 10, 4)
 __version__ = '.'.join(map(str, __versioninfo__))
 
 __all__ = [
diff --git a/nose/suite.py b/nose/suite.py
index d7d36b6..096598d 100644
--- a/nose/suite.py
+++ b/nose/suite.py
@@ -46,6 +46,9 @@ class LazySuite(unittest.TestSuite):
     def __repr__(self):
         return "<%s tests=generator (%s)>" % (
             unittest._strclass(self.__class__), id(self))
+
+    def __hash__(self):
+        return object.__hash__(self)
     
     __str__ = __repr__
 
@@ -127,6 +130,9 @@ class ContextSuite(LazySuite):
             getattr(self.context, '__name__', self.context))
     __str__ = __repr__
 
+    def __hash__(self):
+        return object.__hash__(self)
+
     # 2.3 compat -- force 2.4 call sequence
     def __call__(self, *arg, **kw):
         return self.run(*arg, **kw)
diff --git a/test.sh b/test.sh
index 1b17383..f0dc112 100755
--- a/test.sh
+++ b/test.sh
@@ -11,6 +11,10 @@ echo
 echo "python 2.5..."
 python2.5 selftest.py
 
+echo
+echo "python 2.6..."
+python2.6 selftest.py
+
 if [ "${JYTHON}x" != "x" ] 
 then
     echo