Minor refactor: pull out a common method for oneof's and use string .format().

jsmeredith · jsmeredith · commit 9b210a680804 · 2018-12-03T11:41:00.000-07:00
diff --git a/drive/activity-v2/quickstart.py b/drive/activity-v2/quickstart.py
@@ -24,10 +24,7 @@ def main():
 
     # Call the Drive Activity API
     results = service.activity().query(body={
-        'pageSize': 10,
-        'consolidationStrategy': {
-            'legacy': {}
-        }
+        'pageSize': 10
     }).execute()
     activities = results.get('activities', [])
 
@@ -47,7 +44,13 @@ def main():
 def truncated(array, limit=2):
     contents = ', '.join(array[:limit])
     more = '' if len(array) <= limit else ', ...'
-    return '[' + contents + more + ']'
+    return u'[{0}{1}]'.format(contents, more)
+
+
+def getOneOf(object):
+    for key in object:
+        return key
+    return 'unknown'
 
 
 def getTimeInfo(activity):
@@ -59,32 +62,35 @@ def getTimeInfo(activity):
 
 
 def getActionInfo(actionDetail):
-    return next(iter(actionDetail))
+    return getOneOf(actionDetail)
 
 
 def getUserInfo(user):
     if 'knownUser' in user:
         knownUser = user['knownUser']
         isMe = knownUser.get('isCurrentUser', False)
         return u'people/me' if isMe else knownUser['personName']
-    return next(iter(user))
+    return getOneOf(user)
 
 
 def getActorInfo(actor):
     if 'user' in actor:
         return getUserInfo(actor['user'])
-    return next(iter(actor))
+    return getOneOf(actor)
 
 
 def getTargetInfo(target):
     if 'driveItem' in target:
-        return 'driveItem:"' + target['driveItem'].get('title', 'unknown') + '"'
+        title = target['driveItem'].get('title', 'unknown')
+        return 'driveItem:"{0}"'.format(title)
     if 'teamDrive' in target:
-        return 'teamDrive:"' + target['teamDrive'].get('title', 'unknown') + '"'
+        title = target['teamDrive'].get('title', 'unknown')
+        return 'teamDrive:"{0}"'.format(title)
     if 'fileComment' in target:
         parent = target['fileComment'].get('parent', {})
-        return 'fileComment:"' + parent.get('title', 'unknown') + '"'
-    return next(iter(target))
+        title = parent.get('title', 'unknown')
+        return 'fileComment:"{0}"'.format(title)
+    return '{0}:unknown'.format(getOneOf(target))
 
 
 if __name__ == '__main__':
