[pypy-svn] r63120 - in pypy/trunk/pypy/module/rctime: . test

afa at codespeak.net afa at codespeak.net
Fri Mar 20 11:02:07 CET 2009


Author: afa
Date: Fri Mar 20 11:02:06 2009
New Revision: 63120

Modified:
   pypy/trunk/pypy/module/rctime/__init__.py
   pypy/trunk/pypy/module/rctime/test/test_rctime.py
Log:
time.tzname should be a tuple.
(time.tzset sets it to a tuple, btw)
This fixes test_rctime when called with the -A option


Modified: pypy/trunk/pypy/module/rctime/__init__.py
==============================================================================
--- pypy/trunk/pypy/module/rctime/__init__.py	(original)
+++ pypy/trunk/pypy/module/rctime/__init__.py	Fri Mar 20 11:02:06 2009
@@ -38,7 +38,7 @@
         Module.interpleveldefs['timezone'] = 'space.wrap(%r)' % timezone
         Module.interpleveldefs['daylight'] = 'space.wrap(%r)' % daylight
         Module.interpleveldefs['tzname'] = \
-            'space.newlist([space.wrap(%r), space.wrap(%r)])' % tuple(tzname)
+            'space.newtuple([space.wrap(%r), space.wrap(%r)])' % tuple(tzname)
         Module.interpleveldefs['altzone'] = 'space.wrap(%r)' % altzone
         super(Module, cls).buildloaders()
     buildloaders = classmethod(buildloaders)

Modified: pypy/trunk/pypy/module/rctime/test/test_rctime.py
==============================================================================
--- pypy/trunk/pypy/module/rctime/test/test_rctime.py	(original)
+++ pypy/trunk/pypy/module/rctime/test/test_rctime.py	Fri Mar 20 11:02:06 2009
@@ -12,7 +12,7 @@
         assert isinstance(rctime.altzone, int)
         assert isinstance(rctime.daylight, int)
         assert isinstance(rctime.timezone, int)
-        assert isinstance(rctime.tzname, list)
+        assert isinstance(rctime.tzname, tuple)
         assert isinstance(rctime.__doc__, str)
     
     def test_sleep(self):



More information about the Pypy-commit mailing list