Skip to content

Commit 9bdd016

Browse files
committed
Fixes parsing of the now string
1 parent d41a069 commit 9bdd016

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change Log
22

3+
## [Unreleased]
4+
5+
### Fixed
6+
7+
- Fixed parsing of `now` string.
8+
9+
310
## [1.2.3] - 2017-06-18
411

512
### Fixed

pendulum/parser.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ def parse(self, text):
2424
2525
:rtype: mixed
2626
"""
27+
# Handling special cases
28+
if text == 'now':
29+
return Pendulum.now()
30+
2731
parsed = super(Parser, self).parse(text)
2832

2933
if not self.is_strict():

tests/pendulum_tests/test_parser.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,13 @@ def test_parse_strict(self):
5555

5656
self.assertIsInstanceOfTime(dt)
5757
self.assertTime(dt, 12, 34, 56, 123456)
58+
59+
def test_parse_now(self):
60+
dt = pendulum.parse('now')
61+
62+
assert dt.timezone_name == 'America/Toronto'
63+
64+
mock_now = pendulum.yesterday()
65+
66+
with pendulum.test(mock_now):
67+
assert pendulum.parse('now') == mock_now

0 commit comments

Comments
 (0)