From 75745aeb0cde9d7dd9c80f3ef6ed907ca714e429 Mon Sep 17 00:00:00 2001 From: Alain St-Denis Date: Mon, 16 Jan 2023 14:00:06 +0000 Subject: [PATCH] handle marshmallow.missing values. update setup.py to latest httpsig commit. --- federation/entities/activitypub/models.py | 8 ++++---- setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/federation/entities/activitypub/models.py b/federation/entities/activitypub/models.py index dffc493..f891678 100644 --- a/federation/entities/activitypub/models.py +++ b/federation/entities/activitypub/models.py @@ -256,7 +256,7 @@ OBJECTS = [ def set_public(entity): - for attr in [getattr(entity, 'to', []), getattr(entity, 'cc' ,[])]: + for attr in [entity.to, entity.cc]: if isinstance(attr, list): if NAMESPACE_PUBLIC in attr: entity.public = True elif attr == NAMESPACE_PUBLIC: entity.public = True @@ -1318,8 +1318,8 @@ def extract_replies(replies): visited = [] def walk_reply_collection(replies): - items = getattr(replies, 'items', []) - if items and not isinstance(items, list): items = [items] + items = replies.items if replies.items is not missing else [] + if not isinstance(items, list): items = [items] for obj in items: if isinstance(obj, Note): try: @@ -1330,7 +1330,7 @@ def extract_replies(replies): continue elif not isinstance(obj, str): continue objs.append(obj) - if getattr(replies, 'next_', None): + if replies.next_ is not missing: if (replies.id != replies.next_) and (replies.next_ not in visited): resp = retrieve_and_parse_document(replies.next_) if resp: diff --git a/setup.py b/setup.py index ebcd20a..85084dd 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ setup( "redis", "requests>=2.8.0", "requests-cache", - "httpsig @ git+https://github.com/tripougnif/python-httpsig-socialhome.git@f04c890ecca4d8921cd838a96db3e3345a80b4f0#egg=httpsig==0.1", + "httpsig @ git+https://github.com/tripougnif/python-httpsig-socialhome.git@ce03fa7b25acfacc14fba2670c33246025db7be0#egg=httpsig==0.1", ], include_package_data=True, classifiers=[