fix issue409 -- better interoperate with cx_freeze by not

trying to import from collections.abc which causes problems for py27/cx_freeze.

CHANGELOG

@@ -1,3 +1,10 @@
+UNRELEASED
+-----------------------------------
+
+- fix issue409 -- better interoperate with cx_freeze by not
+  trying to import from collections.abc which causes problems for py27/cx_freeze.
+  Thanks Wolfgang L. for reporting and tracking it down.
+
 2.5.1
 -----------------------------------
 

_pytest/__init__.py

@@ -1,2 +1,2 @@
 #
-__version__ = '2.5.1'
+__version__ = '2.5.2.dev1'

_pytest/assertion/util.py

@@ -2,13 +2,9 @@
 
 import py
 try:
-    from collections.abc import Sequence
+    from collections import Sequence
 except ImportError:
-    try:
+    Sequence = list
-        from collections import Sequence
-    except ImportError:
-        Sequence = list
-
 
 BuiltinAssertionError = py.builtin.builtins.AssertionError
 u = py.builtin._totext

setup.py

@@ -27,7 +27,7 @@ def main():
         name='pytest',
         description='py.test: simple powerful testing with Python',
         long_description = long_description,
-        version='2.5.1',
+        version='2.5.2.dev1',
         url='http://pytest.org',
         license='MIT license',
         platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],