Merge #130: github-merge: Handle deleted users gracefully

8b7b630 github-merge: Handle deleted users gracefully (laanwj)

Pull request description:

  Handle deleted github users gracefully when retrieving ACKs by replacing their name with `[deleted]` in the sanitization function.
  Tested with bitcoin/bitcoin#15423.

ACKs for top commit:
  MarcoFalke:
    cr ACK 8b7b630

Tree-SHA512: 21aa715e4d3196bcde6a8523892afd415c8aae4a440e9ea413a5459ce8c0c978747289a3300e4ff28647cb6af8aded59fd749a06d48b5c2b09896e3eee48d6c1

Author: fanquake

github-merge.py

@@ -85,10 +85,13 @@ def sanitize_ghdata(rec):
         rec['body'] = ''
     rec['body'] = sanitize(rec['body'], newlines=True)
 
-    # "Github username may only contain alphanumeric characters or hyphens'.
-    # Use \Z instead of $ to not match final newline only end of string.
-    if not re.match('[a-zA-Z0-9-]+\Z', rec['user']['login'], re.DOTALL):
-        raise ValueError('Github username contains invalid characters: {}'.format(sanitize(rec['user']['login'])))
+    if rec['user'] is None: # User deleted account
+        rec['user'] = {'login': '[deleted]'}
+    else:
+        # "Github username may only contain alphanumeric characters or hyphens'.
+        # Use \Z instead of $ to not match final newline only end of string.
+        if not re.match('[a-zA-Z0-9-]+\Z', rec['user']['login'], re.DOTALL):
+            raise ValueError('Github username contains invalid characters: {}'.format(sanitize(rec['user']['login'])))
     return rec
 
 def retrieve_json(req_url, ghtoken, use_pagination=False):