From 699892bd035b756740c08c5af1bb933c1983b4f5 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Wed, 18 Dec 2013 14:56:45 +0100 Subject: [PATCH] fix issue409 -- better interoperate with cx_freeze by not trying to import from collections.abc which causes problems for py27/cx_freeze. --- CHANGELOG | 7 +++++++ _pytest/__init__.py | 2 +- _pytest/assertion/util.py | 8 ++------ setup.py | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 776c28d55..f31fbe909 100644 --- a/CHANGELOG +++ b/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 ----------------------------------- diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 06da340f7..2ec33245d 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '2.5.1' +__version__ = '2.5.2.dev1' diff --git a/_pytest/assertion/util.py b/_pytest/assertion/util.py index 1787e7354..258fee8a8 100644 --- a/_pytest/assertion/util.py +++ b/_pytest/assertion/util.py @@ -2,13 +2,9 @@ import py try: - from collections.abc import Sequence + from collections import Sequence except ImportError: - try: - from collections import Sequence - except ImportError: - Sequence = list - + Sequence = list BuiltinAssertionError = py.builtin.builtins.AssertionError u = py.builtin._totext diff --git a/setup.py b/setup.py index 6ef9d4852..9e2fa3e3d 100644 --- a/setup.py +++ b/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'],