Tidying

person.py

@@ -1309,9 +1309,9 @@ def getActorJson(handle: str, http: bool, gnunet: bool,
             return None
 
     profileStr = 'https://www.w3.org/ns/activitystreams'
-    asHeader = {
+    headersList = (
-        'Accept': 'application/activity+json; profile="' + profileStr + '"'
+        "activity+json", "ld+json", "jrd+json"
-    }
+    )
     if not personUrl:
         personUrl = getUserUrl(wfRequest, 0, debug)
     if nickname == domain:
@@ -1323,32 +1323,24 @@ def getActorJson(handle: str, http: bool, gnunet: bool,
     if not personUrl:
         # try single user instance
         personUrl = httpPrefix + '://' + domain
-        asHeader = {
+        headersList = (
-            'Accept': 'application/ld+json; profile="' + profileStr + '"'
+            "ld+json", "jrd+json", "activity+json"
-        }
+        )
     if '/channel/' in personUrl or '/accounts/' in personUrl:
-        asHeader = {
+        headersList = (
-            'Accept': 'application/ld+json; profile="' + profileStr + '"'
+            "ld+json", "jrd+json", "activity+json"
-        }
+        )
 
-    personJson = \
+    for headerType in headersList:
-        getJson(session, personUrl, asHeader, None,
+        headerMimeType = 'application/' + headerType
-                debug, __version__, httpPrefix, None, 20, quiet)
-    if personJson:
-        if not quiet:
-            pprint(personJson)
-        return personJson
-    else:
         asHeader = {
-            'Accept': 'application/jrd+json; profile="' + profileStr + '"'
+            'Accept': headerMimeType + '; profile="' + profileStr + '"'
         }
         personJson = \
             getJson(session, personUrl, asHeader, None,
-                    debug, __version__, httpPrefix, None)
+                    debug, __version__, httpPrefix, None, 20, quiet)
-        if not quiet:
+        if personJson:
-            if personJson:
+            if not quiet:
-                print('getActorJson returned actor')
                 pprint(personJson)
-            else:
+            return personJson
-                print('Failed to get ' + personUrl)
+    return None
-        return personJson

utils.py

@@ -15,7 +15,6 @@ import json
 import idna
 import locale
 from pprint import pprint
-from calendar import monthrange
 from followingCalendar import addPersonToCalendar
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes