From 600b4684098f4cb4efbe425f15a7553df6dd0bbc Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 18 Aug 2019 21:47:12 +0100 Subject: [PATCH] Handle no returned value --- inbox.py | 2 ++ posts.py | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/inbox.py b/inbox.py index 30cc2f3ed..639500cf7 100644 --- a/inbox.py +++ b/inbox.py @@ -276,6 +276,8 @@ def inboxCheckCapabilities(baseDir :str,nickname :str,domain :str, \ getOcapFilename(baseDir, \ queueJson['nickname'],queueJson['domain'], \ actor,'accept') + if not ocapFilename: + return False if not os.path.isfile(ocapFilename): if debug: print('DEBUG: capabilities for '+ \ diff --git a/posts.py b/posts.py index 6df5e5af2..8307275c5 100644 --- a/posts.py +++ b/posts.py @@ -487,11 +487,12 @@ def createPostBase(baseDir: str,nickname: str, domain: str, port: int, \ capabilityId=None capabilityIdList=[] ocapFilename=getOcapFilename(baseDir,nickname,domain,toUrl,'granted') - if os.path.isfile(ocapFilename): - with open(ocapFilename, 'r') as fp: - oc=commentjson.load(fp) - if oc.get('id'): - capabilityIdList=[oc['id']] + if ocapFilename: + if os.path.isfile(ocapFilename): + with open(ocapFilename, 'r') as fp: + oc=commentjson.load(fp) + if oc.get('id'): + capabilityIdList=[oc['id']] newPost = { "@context": "https://www.w3.org/ns/activitystreams",