[pypy-svn] pypy default: (fijal, arigo)

arigo commits-noreply at bitbucket.org
Thu Jan 20 14:36:20 CET 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r41022:1c8f5ef2598a
Date: 2011-01-20 14:35 +0100
http://bitbucket.org/pypy/pypy/changeset/1c8f5ef2598a/

Log:	(fijal, arigo)

	Skip a test on top of CPython 2.5.

diff --git a/lib_pypy/pypy_test/test_datetime.py b/lib_pypy/pypy_test/test_datetime.py
--- a/lib_pypy/pypy_test/test_datetime.py
+++ b/lib_pypy/pypy_test/test_datetime.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+import py
 
 from .. import datetime
 
@@ -8,7 +9,9 @@
     assert repr(datetime.datetime(1,2,3)) == expected
 
 def test_strptime():
-    import time
+    import time, sys
+    if sys.version_info < (2, 6):
+        py.test.skip("needs the _strptime module")
 
     string = '2004-12-01 13:02:47'
     format = '%Y-%m-%d %H:%M:%S'


More information about the Pypy-commit mailing list