merge cleanup

.travis.yml

@@ -10,7 +10,7 @@ env:
     - BUILD_OPENSSL_VERSION=1.1.1g
     - MIN_OPENSSL_VERSION=1.1.1g
     - PATCHELF_VERSION=0.11
-    - PYINSTALLER_COMMIT=1e571ae1a302709583667f41fbc2508b9a79a05f
+    - PYINSTALLER_COMMIT=e9f9d79d6b23c767512156323d0a5d28c6386a57
     - secure: "FSKvLaiqhKz21SVgAQZI3bSX34Ffyev4l+R2G//QXNDu6UVQcuFsykzw+eZEG7fkhotXr8BMDL7xIkookiL8eLwUtcd/Z95HCjPBBHcmCSQleyvuuJBxdrQ9xldmiGLzMCYiumSH9OH4uJhQ39Yjnjsa8TK+PlTci6a/BTzlYyBSyDYDf7Iv/uhfQPDHL3pNwrQPHf4fL6/jcvo+uaPcv83AVZkNzZjjyoi9Aa+uh9xlbyHg11jp44463qqxoxTdYik3pYuXRBPjknjOGcnFHqn+QOVSdRQoiwbmT8xVuYuCzTv9THhuJ//i5u7s4y3Xyl7u17B3tdm86UlMpQHy/w9EsYaSBPOU4oPNomRtOnTSugh0v9ZBwptP5XfbslII/iA+LQdzTHhchn0W0CRyDqjOMSestWlrsq5NZJtBJTYHbebllOhEI7xbj9tY+re1zFWSPMOPgHJP23ovsdk3hD9OT93AzRHInCx5IxL6QvEgRhAancRuGkf2rGP0g/vX9fQ0Il3rNMSQxHB5CyHUBtUJ9nhU79YkMDZicD0jFMEwjWJO3itAp3ynoLXRgktgQCYUfgc9SpdWKD5SXLCYnSo22JD3D1P6h2EertRHaoKRLb+CRXQC/lM8uh/W+BjA2Xe6Vut2I/72ndjM+10T7E2xk1CFyCH37a5p8cH26Fs="
     - secure: "J9380tGLOZWa7dSH1y5Il8T5JQpN6ad81gI6VR1HIU0svpRdjgikyDA7ca2MKYDUYYY9yVSkTV6gCl6iIU/9+SKaYugpP+tkvdGYkC2moJdcTgYM/WOnIK9ExQ3BPhN1neGxJjPTwKo1ft27mtZ2I5vuCiBwIcnKWLnKPyW3PD+mWpfqiLuEzkHoAh6G3jC4qbcCrZDeX/knE+PzqESUEi+8k1G8gYcSDWujba9ypSsqZ8T/MXagGla6l7y2Rz+/KZTJmFHwKAA10V+xPLVqxoiqi4ar66yUqy0BamwRXPcseI+ns3Q+4lUpMqVQ5GlRy7LF1xC8myjmcAexXk0F9hg+CMzewKI8UgmQH/ZJvQZEh8s6mW26+CqA4d3zMQkWaR0WtEtpiuH7AGHCflIqvEQ6UiG7ia3B8iZfW2wl0j/kqx4OuHkS3r0pWKVVIIvCj9Ow2BHP7SpiV1AcUGsVxzwbgTh67fitna3Z3c6Uj8ccQlNr7ZIt1az6Wf3w5njijkLOiBpQSLKunTTCTSge/JzBTKUcie3RE9vzirl58gUxAt36nDtPWnory+RttMZrOkBVbTeSxp+IUe8pNwLFPHABsafXsjkfzBOtFmm+0ZXWt2Rlog5NvlemJfQUWDlsL4g+BSakzN+4sIPKzSauWDHyaEeULY7Uprkil6c5zwo="
     - secure: "szcjWHPr0Bf1KCkyTrV5Fu3ADhWk+pg8YWucjXHdybmhaQIKG7iBNg8LJ5d0OBTwAg31wK4ZgyLVSa2gKrAZ3UeDjykJFsR711xDSQOod51Wrgqu4FbXDewE817DUk3Cwe1l5DCu3/fjEw4vbm8B/qb7iMTRKCq6hJd97FwT5oauP0QHNPer9JjrW4F0Hk9ttkgEU2dXWvBMsTJsDOGNI3ddABE2HskxV4T4thelDYGKBDHhUOAsRwSjXgWy77Tvz98psPIvd+6+WPYNRdRWcPDyAR3Z1O/fNjUymrQI6eMaHoSFrmhDS5lbhjINRfdUmECyfCfIFeLWWiw4g4bq7l+4HBORbei55tAIjhEsxJQoqHi0Q5dD5TFh8IiWqowkFbpvNonMSIpKtB0cyT5jU1G/jRA7MPcIvSrdzHaDkoDNHJgAeZfgjOhzTGYYD19lGIljz5BQBcNFZY2dJbja+Jr4He2CMAOBOdERa4Zn1VyNfOmd8Bn5hu0C9D2ybnSCxjXXq5TRiktR8X7WycVZYfqMZXAwP9FEHVitJ4MZEGUc7S92K5gX4wmjcJjLS+Xo/0nsduQm8PuiMjbcPM7/oGx8Xm1KuSfHdKWMBoaesPaDvRX+YcuiNstXf1DkCWl72TsFABzddlNUMl/s2YSKkCSHAJ5ILqrB28Gx89kzVlg="

src/gam/__init__.py

@@ -3890,7 +3890,7 @@ def downloadDriveFile(users):
                             if sheet['properties']['title'].lower(
                             ) == csvSheetTitleLower:
                                 spreadsheetUrl = '{0}?format=csv&id={1}&gid={2}'.format(
-                                    re.sub('/edit$', '/export',
+                                    re.sub('/edit.*$', '/export',
                                            spreadsheet['spreadsheetUrl']),
                                     fileId, sheet['properties']['sheetId'])
                                 break

src/gam/gapi/cloudidentity/groups.py

@@ -163,7 +163,6 @@ def print_():
     members = membersCountOnly = managers = managersCountOnly = owners = ownersCountOnly = False
     gapi_directory_customer.setTrueCustomerId()
     parent = f'customers/{GC_Values[GC_CUSTOMER_ID]}'
-    aliasDelimiter = ' '
     memberDelimiter = '\n'
     todrive = False
     titles = []
@@ -176,7 +175,7 @@ def print_():
             todrive = True
             i += 1
         elif myarg == 'delimiter':
-            aliasDelimiter = memberDelimiter = sys.argv[i + 1]
+            memberDelimiter = sys.argv[i + 1]
             i += 2
         elif myarg == 'sortheaders':
             sortHeaders = True
@@ -251,7 +250,7 @@ def print_():
                 f' Getting {roles} for {groupEmail}{gam.currentCountNL(i, count)}'
             )
             page_message = gapi.got_total_items_first_last_msg('Members')
-            validRoles, listRoles, listFields = gam._getRoleVerification(
+            validRoles, _, _ = gam._getRoleVerification(
                 roles, 'nextPageToken,members(email,id,role)')
             groupMembers = gapi.get_all_pages(ci.groups().memberships(),
                                               'list',
@@ -616,7 +615,9 @@ def update():
                             f' Group: {group}, {users_email[0]} Update to {role} Failed: {str(e)}'
                         )
                         break
-                print(f' Group: {group}, {users_email[0]} Updated to {role}')
+                print(
+                  f' Group: {group}, {users_email[0]} Updated to {role}'
+                )
 
         else:  # clear
             roles = []
@@ -709,7 +710,7 @@ def group_email_to_id(ci, group, i=0, count=0):
             gapi_errors.GapiDomainNotFoundError,
             gapi_errors.GapiDomainCannotUseApisError,
             gapi_errors.GapiForbiddenError, gapi_errors.GapiBadRequestError):
-        entityUnknownWarning('Group', group, i, count)
+        gam.entityUnknownWarning('Group', group, i, count)
         return None
 
 
@@ -727,7 +728,7 @@ def membership_email_to_id(ci, parent, membership, i=0, count=0):
             gapi_errors.GapiDomainNotFoundError,
             gapi_errors.GapiDomainCannotUseApisError,
             gapi_errors.GapiForbiddenError, gapi_errors.GapiBadRequestError):
-        entityUnknownWarning('Membership', member_email, i, count)
+        gam.entityUnknownWarning('Membership', membership, i, count)
         return None
 
 
@@ -735,7 +736,7 @@ def get_single_role(roles):
     ''' returns the highest role of member '''
     roles = [role.get('name') for role in roles]
     if not roles:
-        return
+        return ROLE_MEMBER
     for a_role in [ROLE_OWNER, ROLE_MANAGER, ROLE_MEMBER]:
         if a_role in roles:
             return a_role
@@ -747,5 +748,5 @@ def filter_members_to_roles(members, roles):
     for member in members:
         role = get_single_role(member.get('roles', []))
         if role in roles:
-            filtered_members.include(member)
+            filtered_members.append(member)
     return filtered_members