Author: Philip Jenvey <[email protected]>
Branch: py3.3
Changeset: r75154:b60d4915a3f5
Date: 2014-07-27 15:44 -0700
http://bitbucket.org/pypy/pypy/changeset/b60d4915a3f5/
Log: reapply ca139d96a0fa: fill in _STRUCT_TM_TIMES
diff --git a/pypy/module/time/__init__.py b/pypy/module/time/__init__.py
--- a/pypy/module/time/__init__.py
+++ b/pypy/module/time/__init__.py
@@ -17,6 +17,7 @@
'mktime': 'interp_time.mktime',
'strftime': 'interp_time.strftime',
'sleep' : 'interp_time.sleep',
+ '_STRUCT_TM_ITEMS': 'space.wrap(interp_time._STRUCT_TM_ITEMS)',
}
if os.name == "posix":
diff --git a/pypy/module/time/interp_time.py b/pypy/module/time/interp_time.py
--- a/pypy/module/time/interp_time.py
+++ b/pypy/module/time/interp_time.py
@@ -135,6 +135,9 @@
("tm_mon", rffi.INT), ("tm_year", rffi.INT), ("tm_wday", rffi.INT),
("tm_yday", rffi.INT), ("tm_isdst", rffi.INT)])
+# XXX: optionally support the 2 additional tz fields
+_STRUCT_TM_ITEMS = 9
+
class cConfig:
pass
diff --git a/pypy/module/time/test/test_time.py
b/pypy/module/time/test/test_time.py
--- a/pypy/module/time/test/test_time.py
+++ b/pypy/module/time/test/test_time.py
@@ -11,6 +11,7 @@
assert isinstance(time.timezone, int)
assert isinstance(time.tzname, tuple)
assert isinstance(time.__doc__, str)
+ assert isinstance(time._STRUCT_TM_ITEMS, int)
def test_sleep(self):
import sys
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
