GAM 4.95, Ross' changes in #1018, re-enable older Python tests

src/GamCommands.txt

@@ -303,6 +303,7 @@ If an item contains spaces, it should be surrounded by ".
 	cancomment|
 	canreadrevisions|
 	copyable|
+	copyrequireswriterpermission|
 	createddate|createdtime|
 	description|
 	editable|
@@ -670,12 +671,16 @@ Specify a collection of Users by directly specifying them or by specifiying item
 
 <DriveFileAddAttributes> ::=
 	(localfile <FileName>)|
-	(convert)|(ocr)|(ocrlanguage <Language>)|(restricted|restrict)|(starred|star)|(trashed|trash)|(viewed|view)|
+	(convert)|(ocr)|(ocrlanguage <Language>)|
+	(restricted|restrict)|(starred|star)|(trashed|trash)|(viewed|view)|
+	copyrequireswriterpermission|
 	(lastviewedbyme <Time>)|(modifieddate|modifiedtime <Time>)|(description <String>)|(mimetype <MimeType>)|
 	(parentid <DriveFolderID>)|(parentname <DriveFolderName>)|(anyownerparentname <DriveFolderName>)|writerscantshare
 <DriveFileUpdateAttributes> ::=
 	(localfile <FileName>)|
-	(convert)|(ocr)|(ocrlanguage <Language>)|(restricted|restrict <Boolean>)|(starred|star <Boolean>)|(trashed|trash <Boolean>)|(viewed|view <Boolean>)|
+	(convert)|(ocr)|(ocrlanguage <Language>)|
+	(restricted|restrict <Boolean>)|(starred|star <Boolean>)|(trashed|trash <Boolean>)|(viewed|view <Boolean>)|
+	(copyrequireswriterpermission <Boolean>)|
 	(lastviewedbyme <Time>)|(modifieddate <Time>)|(description <String>)|(mimetype <MimeType>)|
 	(parentid <DriveFolderID>)|(parentname <DriveFolderName>)|(anyownerparentname <DriveFolderName>)|writerscantshare
 <GroupSettingsAttribute> ::=
@@ -1083,6 +1088,7 @@ gam info member <UserItem> <GroupItem>
 gam print group-members|groups-members [todrive]
 	([domain <DomainName>] ([member <UserItem>]|[query <QueryGroup>]))|[group|group_ns|group_susp <GroupItem>] [notsuspended|suspended]
 	[roles <GroupRoleList>] [membernames] [fields <MembersFieldNameList>]
+	[includederivedmembership]
 
 gam print licenses [todrive] [(products|product <ProductIDList>)|(skus|sku <SKUIDList>)|allskus|gsuite] [countsonly]
 gam show license|licenses|licence|licences [(products|product <ProductIDList>)|(skus|sku <SKUIDList>)|allskus|gsuite]

src/gam.py

@@ -4941,6 +4941,13 @@ def getDriveFileAttribute(i, body, parameters, myarg, update=False):
   elif myarg == 'ocrlanguage':
     parameters[DFA_OCRLANGUAGE] = LANGUAGE_CODES_MAP.get(sys.argv[i+1].lower(), sys.argv[i+1])
     i += 2
+  elif myarg in ['copyrequireswriterpermission', 'restrict', 'restricted']:
+    if update:
+      body['copyRequiresWriterPermission'] = getBoolean(sys.argv[i+1], myarg)
+      i += 2
+    else:
+      body['copyRequiresWriterPermission'] = True
+      i += 1
   elif myarg in DRIVEFILE_LABEL_CHOICES_MAP:
     body.setdefault('labels', {})
     if update:
@@ -10661,7 +10668,7 @@ def doGetCrosInfo():
           if deviceFile:
             downloadfilename = os.path.join(targetFolder, 'cros-logs-{0}-{1}.zip'.format(deviceId, deviceFile['createTime']))
             _, content = cd._http.request(deviceFile['downloadUrl'])
-            writeFile(downloadfilename, content, continueOnError=True)
+            writeFile(downloadfilename, content, mode='wb', continueOnError=True)
             print('Downloaded: {0}'.format(downloadfilename))
         elif downloadfile:
           print('ERROR: no files to download.')
@@ -12172,6 +12179,7 @@ def doPrintGroupMembers():
   cd = buildGAPIObject('directory')
   todrive = False
   membernames = False
+  includeDerivedMembership = False
   customer = GC_Values[GC_CUSTOMER_ID]
   checkSuspended = usedomain = usemember = usequery = None
   roles = []
@@ -12223,6 +12231,9 @@ def doPrintGroupMembers():
     elif myarg in ['suspended', 'notsuspended']:
       checkSuspended = myarg == 'suspended'
       i += 1
+    elif myarg == 'includederivedmembership':
+      includeDerivedMembership = True
+      i += 1
     else:
       systemErrorExit(2, '%s is not a valid argument for "gam print group-members"' % sys.argv[i])
   if not groups_to_get:
@@ -12238,6 +12249,7 @@ def doPrintGroupMembers():
     validRoles, listRoles, listFields = _getRoleVerification(','.join(roles), fields)
     group_members = callGAPIpages(cd.members(), 'list', 'members',
                                   soft_errors=True,
+                                  includeDerivedMembership=includeDerivedMembership,
                                   groupKey=group_email, roles=listRoles, fields=listFields)
     for member in group_members:
       if not _checkMemberRoleIsSuspended(member, validRoles, checkSuspended):

src/var.py

@@ -6,7 +6,7 @@ import platform
 import re
 
 gam_author = 'Jay Lee <jay0lee@gmail.com>'
-gam_version = '4.94'
+gam_version = '4.95'
 gam_license = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 GAM_URL = 'https://git.io/gam'
@@ -232,6 +232,7 @@ DRIVEFILE_FIELDS_CHOICES_MAP = {
   'cancomment': 'canComment',
   'canreadrevisions': 'canReadRevisions',
   'copyable': 'copyable',
+  'copyrequireswriterpermission': 'copyRequiresWriterPermission',
   'createddate': 'createdDate',
   'createdtime': 'createdDate',
   'description': 'description',