pytest: make test suite compatible with 2.7

2 files changed, 6 insertions, 4 deletions

diff --git a/pytest.py b/pytest.py
index d2ec378..da007c0 100644
--- a/pytest.py
+++ b/pytest.py
@@ -118,11 +118,12 @@ import types
 
 from logilab.common.fileutils import abspath_listdir
 from logilab.common import testlib, STD_BLACKLIST
+# use the same unittest module as testlib
 from logilab.common.testlib import unittest
 import doctest
 
-# use the same unittest module as testlib
-if sys.version_info < (3, 2):
+import unittest as unittest_legacy
+if not getattr(unittest_legacy, "__package__", None):
     try:
         import unittest2.suite as unittest_suite
     except ImportError:
diff --git a/testlib.py b/testlib.py
index 49304e3..ed18cff 100644
--- a/testlib.py
+++ b/testlib.py
@@ -57,7 +57,8 @@ from ConfigParser import ConfigParser
 from logilab.common.deprecation import deprecated
 from itertools import dropwhile
 
-if sys.version_info < (3, 2):
+import unittest as unittest_legacy
+if not getattr(unittest_legacy, "__package__", None):
     try:
         import unittest2 as unittest
         from unittest2 import SkipTest
@@ -969,7 +970,7 @@ succeeded test into", osp.join(os.getcwd(), FILE_RESTART)
         from xml.parsers.expat import ExpatError
         try:
             parse(data)
-        except ExpatError, ex:
+        except (ExpatError, ParseError), ex:
             if msg is None:
                 if hasattr(data, 'readlines'): #file like object
                     data.seek(0)