Commit 19907e25 authored by 's avatar

Merged strftime %W, %U, %j fix from 2.2 branch

parent 743f563f
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
############################################################################## ##############################################################################
"""Encapsulation of date/time values""" """Encapsulation of date/time values"""
__version__='$Revision: 1.51 $'[11:-2] __version__='$Revision: 1.52 $'[11:-2]
import sys, os, math, regex, ts_regex, DateTimeZone import sys, os, math, regex, ts_regex, DateTimeZone
...@@ -1376,9 +1376,7 @@ class DateTime: ...@@ -1376,9 +1376,7 @@ class DateTime:
return millis return millis
def strftime(self, format): def strftime(self, format):
return strftime(format, (self._year, self._month, self._day, return strftime(format, gmtime(self.timeTime()))
self._hour, self._minute, self._nearsec,
(self._dayoffset + 6) % 7, 0, 0))
# General formats from previous DateTime # General formats from previous DateTime
def Date(self): def Date(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment