Skip to content

Commit

Permalink
fix error when updating ingest provider (#2389)
Browse files Browse the repository at this point in the history
expiry can be set to `None` and then the ingest fails with:

```
'NoneType' object has no attribute 'tzinfo'
```
  • Loading branch information
petrjasek committed Oct 17, 2022
1 parent 3b0e44a commit ffbe50b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion superdesk/io/commands/update_ingest.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def is_closed(provider):
def is_not_expired(item, delta):
if item.get("expiry") or item.get("versioncreated"):
try:
expiry = item.get("expiry", item["versioncreated"] + delta)
expiry = item.get("expiry") or item.get("versioncreated") + delta
except OverflowError: # this will never expire
return True
if expiry.tzinfo:
Expand Down
5 changes: 5 additions & 0 deletions tests/io/item_expiry_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,8 @@ def test_expiry_overflow(self):
item = {"versioncreated": datetime.now()}
delta = timedelta(minutes=999999999999)
self.assertTrue(is_not_expired(item, delta))

def test_expiry_None(self):
item = {"expiry": None, "versioncreated": datetime.now()}
delta = timedelta(minutes=5)
self.assertTrue(is_not_expired(item, delta))

0 comments on commit ffbe50b

Please sign in to comment.