[pypy-svn] r78382 - in pypy/branch/fast-forward/pypy/module/rctime: . test

[afa at codespeak.net]

Author: afa
Date: Thu Oct 28 01:54:11 2010
New Revision: 78382

Modified:
   pypy/branch/fast-forward/pypy/module/rctime/app_time.py
   pypy/branch/fast-forward/pypy/module/rctime/test/test_rctime.py
Log:
Ensure that time.strptime() returns a time structure

(the _strptime module changed in 2.7 to return an additional value)


Modified: pypy/branch/fast-forward/pypy/module/rctime/app_time.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/rctime/app_time.py	(original)
+++ pypy/branch/fast-forward/pypy/module/rctime/app_time.py	Thu Oct 28 01:54:11 2010
@@ -25,7 +25,7 @@
     (same as strftime())."""
 
     import _strptime     # from the CPython standard library
-    return _strptime._strptime(string, format)
+    return _strptime._strptime(string, format)[0]
 
 __doc__ = """This module provides various functions to manipulate time values.
 

Modified: pypy/branch/fast-forward/pypy/module/rctime/test/test_rctime.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/rctime/test/test_rctime.py	(original)
+++ pypy/branch/fast-forward/pypy/module/rctime/test/test_rctime.py	Thu Oct 28 01:54:11 2010
@@ -270,9 +270,11 @@
 
     def test_strptime(self):
         import time as rctime
-        
+
         t = rctime.time()
         tt = rctime.gmtime(t)
+        assert isinstance(rctime.strptime("", ""), type(tt))
+
         for directive in ('a', 'A', 'b', 'B', 'c', 'd', 'H', 'I',
                           'j', 'm', 'M', 'p', 'S',
                           'U', 'w', 'W', 'x', 'X', 'y', 'Y', 'Z', '%'):