Skip to content

Commit d2477ff

Browse files
NateScarletsdispater
authored andcommitted
Fix issue #238: wrong position swap code. (#240)
* Fix issue #238: wrong position swap code. * Fix test for travisCI: use other supported timezone
1 parent 9d55d8b commit d2477ff

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,7 @@ profile.html
3131
/wheelhouse
3232
/docs/site/*
3333
pyproject.lock
34+
35+
# editor
36+
37+
.vscode

pendulum/_extensions/helpers.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,6 @@ def precise_diff(d1, d2):
282282
hour_diff += 24
283283
d_diff -= 1
284284

285-
if d1 > d2:
286-
d1, d2 = d2, d1
287-
sign = -1
288-
289285
y_diff = d2.year - d1.year
290286
m_diff = d2.month - d1.month
291287
d_diff += d2.day - d1.day

tests/test_helpers.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,14 @@ def test_precise_diff_timezone():
115115
days=1, hours=5
116116
)
117117

118+
# Issue238
119+
dt1 = timezone('UTC').datetime(2018, 6, 20, 1, 30)
120+
dt2 = timezone('Europe/Paris').datetime(2018, 6, 20, 3, 40) # UTC+2
121+
diff = precise_diff(dt1, dt2)
122+
assert_diff(
123+
diff,
124+
minutes=10
125+
)
118126

119127
def test_week_day():
120128
assert 5 == week_day(2017, 6, 2)

0 commit comments

Comments
 (0)