Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/reader/_parser/jsonfeed.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
from typing import TypeVar
from typing import Union

import iso8601

from .._types import EntryData
from .._types import FeedData
from ..exceptions import ParseError
Expand Down Expand Up @@ -183,8 +181,9 @@ def _process_entry(feed_url: str, d: Any, feed_lang: str | None) -> EntryData:

def _parse_date(s: str) -> datetime | None:
try:
dt = iso8601.parse_date(s)
except iso8601.ParseError:
dt = datetime.fromisoformat(s)
except ValueError:
return None
assert isinstance(dt, datetime)
if dt.tzinfo is None: # pragma: no cover
dt = dt.replace(tzinfo=timezone.utc)
return dt.astimezone(timezone.utc)
8 changes: 4 additions & 4 deletions tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def invoke(*args):

result = invoke('list', 'entries')
assert result.exit_code == 0
assert {tuple(l.split()) for l in result.output.splitlines()} == {
assert {tuple(l.rsplit(None, 1)) for l in result.output.splitlines()} == {
(feed_path, e.link or e.id) for e in expected['entries']
}

Expand Down Expand Up @@ -152,23 +152,23 @@ def invoke(*args):

result = invoke('search', 'entries', 'amok')
assert result.exit_code == 0
assert {tuple(l.split()) for l in result.output.splitlines()} == {
assert {tuple(l.rsplit(None, 1)) for l in result.output.splitlines()} == {
(feed_path, e.link or e.id)
for e in expected['entries']
if e.title and 'amok' in e.title.lower()
}

result = invoke('search', 'entries', 'again')
assert result.exit_code == 0
assert {tuple(l.split()) for l in result.output.splitlines()} == {
assert {tuple(l.rsplit(None, 1)) for l in result.output.splitlines()} == {
(feed_path, e.link or e.id)
for e in expected['entries']
if e.title and 'again' in e.title.lower()
}

result = invoke('search', 'entries', 'nope')
assert result.exit_code == 0
assert {tuple(l.split()) for l in result.output.splitlines()} == set()
assert {tuple(l.rsplit(None, 1)) for l in result.output.splitlines()} == set()

result = invoke('search', 'disable')
assert result.exit_code == 0
Expand Down
Loading