1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/commits/91925448ac06/
Changeset: 91925448ac06
User: hpk42
Date: 2013-12-18 14:56:45
Summary: fix issue409 -- better interoperate with cx_freeze by not
trying to import from collections.abc which causes problems for py27/cx_freeze.
Affected #: 4 files
diff -r f050bf9961c2235f1cb1e5a8b7fd94008dbfdc0b -r
91925448ac067edf770b504d199a8998872a9f10 CHANGELOG
--- 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 -r f050bf9961c2235f1cb1e5a8b7fd94008dbfdc0b -r
91925448ac067edf770b504d199a8998872a9f10 _pytest/__init__.py
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
#
-__version__ = '2.5.1'
+__version__ = '2.5.2.dev1'
diff -r f050bf9961c2235f1cb1e5a8b7fd94008dbfdc0b -r
91925448ac067edf770b504d199a8998872a9f10 _pytest/assertion/util.py
--- 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 -r f050bf9961c2235f1cb1e5a8b7fd94008dbfdc0b -r
91925448ac067edf770b504d199a8998872a9f10 setup.py
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@
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'],
Repository URL: https://bitbucket.org/hpk42/pytest/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
pytest-commit mailing list
pytest-commit@python.org
https://mail.python.org/mailman/listinfo/pytest-commit
