Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
Zope
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
Zope
Commits
69f0a937
Commit
69f0a937
authored
Sep 07, 2008
by
Paul Winkler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for launchpad #267545: DateTime(DateTime()) should preserve the correct hour
parent
d3ad78e1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
doc/CHANGES.txt
doc/CHANGES.txt
+3
-0
lib/python/DateTime/DateTime.py
lib/python/DateTime/DateTime.py
+1
-4
lib/python/DateTime/tests/testDateTime.py
lib/python/DateTime/tests/testDateTime.py
+6
-2
No files found.
doc/CHANGES.txt
View file @
69f0a937
...
...
@@ -8,6 +8,9 @@ Zope Changes
Bugs fixed
- Launchpad #267545: DateTime(DateTime()) now preserves the
correct hour
- Launchpad #245649: the Products package is now a proper
"namespace package" under the rules specified by setuptools.
...
...
lib/python/DateTime/DateTime.py
View file @
69f0a937
...
...
@@ -712,11 +712,8 @@ class DateTime:
if
isinstance
(
arg
,
DateTime
):
""" Construct a new DateTime instance from a given DateTime instance """
t
=
arg
.
timeTime
()
tz
=
arg
.
timezone
()
ms
=
(
t
-
math
.
floor
(
t
))
s
,
d
=
_calcSD
(
t
)
yr
,
mo
,
dy
,
hr
,
mn
,
sc
=
gmtime
(
t
)[:
6
]
sc
=
sc
+
ms
yr
,
mo
,
dy
,
hr
,
mn
,
sc
,
tz
=
arg
.
parts
()
elif
isinstance
(
arg
,
(
unicode
,
str
))
and
arg
.
lower
()
in
self
.
_tzinfo
.
_zidx
:
# Current time, to be displayed in specified timezone
...
...
lib/python/DateTime/tests/testDateTime.py
View file @
69f0a937
...
...
@@ -296,8 +296,10 @@ class DateTimeTests(unittest.TestCase):
def
testCopyConstructor
(
self
):
d
=
DateTime
(
'2004/04/04'
)
self
.
assertEqual
(
DateTime
(
d
),
d
)
d
=
DateTime
(
'1999/04/12'
)
self
.
assertEqual
(
DateTime
(
d
),
d
)
self
.
assertEqual
(
str
(
DateTime
(
d
)),
str
(
d
))
d2
=
DateTime
(
'1999/04/12 01:00:00'
)
self
.
assertEqual
(
DateTime
(
d2
),
d2
)
self
.
assertEqual
(
str
(
DateTime
(
d2
)),
str
(
d2
))
def
testCopyConstructorPreservesTimezone
(
self
):
# test for https://bugs.launchpad.net/zope2/+bug/200007
...
...
@@ -308,8 +310,10 @@ class DateTimeTests(unittest.TestCase):
self
.
assertEqual
(
DateTime
(
d
).
timezone
(),
d
.
timezone
())
d2
=
DateTime
(
'2008/04/25 12:00:00 EST'
)
self
.
assertEqual
(
DateTime
(
d2
).
timezone
(),
d2
.
timezone
())
self
.
assertEqual
(
str
(
DateTime
(
d2
)),
str
(
d2
))
d3
=
DateTime
(
'2008/04/25 12:00:00 PST'
)
self
.
assertEqual
(
DateTime
(
d3
).
timezone
(),
d3
.
timezone
())
self
.
assertEqual
(
str
(
DateTime
(
d3
)),
str
(
d3
))
def
testRFC822
(
self
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment