deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 12:21:35 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

filter is a builtin Python function (#1244)

Browse Source 
devices.py:118:4: W0622: Redefining built-in 'filter' (redefined-builtin)
This commit is contained in:
Ross Scroggs
2020-09-18 12:28:42 -07:00
committed by GitHub
parent 4fe3dc052a
commit d7453a7841
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gam/gapi/cloudidentity/devices.py
View File

@@ -115,7 +115,7 @@ def print_():
ci = gapi_cloudidentity.build_dwd() ci = gapi_cloudidentity.build_dwd()
customer = f'customers/{GC_Values[GC_CUSTOMER_ID]}' customer = f'customers/{GC_Values[GC_CUSTOMER_ID]}'
parent = 'devices/-' parent = 'devices/-'
filter = None device_filter = None
get_device_users = True get_device_users = True
get_device_views = ['COMPANY_INVENTORY', 'USER_ASSIGNED_DEVICES'] get_device_views = ['COMPANY_INVENTORY', 'USER_ASSIGNED_DEVICES']
titles = [] titles = []
@@ -126,7 +126,7 @@ def print_():
while i < len(sys.argv): while i < len(sys.argv):
myarg = sys.argv[i].lower().replace('_', '') myarg = sys.argv[i].lower().replace('_', '')
if myarg in ['filter', 'query']: if myarg in ['filter', 'query']:
filter = sys.argv[i+1] device_filter = sys.argv[i+1]
i += 2 i += 2
elif myarg == 'nocompanydevices': elif myarg == 'nocompanydevices':
get_device_views.remove('COMPANY_INVENTORY') get_device_views.remove('COMPANY_INVENTORY')
@@ -152,12 +152,12 @@ def print_():
page_message = gapi.got_total_items_msg(view_name, '...\n') page_message = gapi.got_total_items_msg(view_name, '...\n')
devices += gapi.get_all_pages(ci.devices(), 'list', 'devices', devices += gapi.get_all_pages(ci.devices(), 'list', 'devices',
customer=customer, page_message=page_message, customer=customer, page_message=page_message,
pageSize=100, filter=filter, view=view) pageSize=100, filter=device_filter, view=view)
if get_device_users: if get_device_users:
page_message = gapi.got_total_items_msg('Device Users', '...\n') page_message = gapi.got_total_items_msg('Device Users', '...\n')
device_users = gapi.get_all_pages(ci.devices().deviceUsers(), 'list', device_users = gapi.get_all_pages(ci.devices().deviceUsers(), 'list',
'deviceUsers', customer=customer, parent=parent, 'deviceUsers', customer=customer, parent=parent,
page_message=page_message, pageSize=20, filter=filter) page_message=page_message, pageSize=20, filter=device_filter)
for device_user in device_users: for device_user in device_users:
for device in devices: for device in devices:
if device_user.get('name').startswith(device.get('name')): if device_user.get('name').startswith(device.get('name')):
@@ -181,7 +181,7 @@ def sync():
device_types = gapi.get_enum_values_minus_unspecified( device_types = gapi.get_enum_values_minus_unspecified(
ci._rootDesc['schemas']['GoogleAppsCloudidentityDevicesV1Device']['properties']['deviceType']['enum']) ci._rootDesc['schemas']['GoogleAppsCloudidentityDevicesV1Device']['properties']['deviceType']['enum'])
customer = f'customers/{GC_Values[GC_CUSTOMER_ID]}' customer = f'customers/{GC_Values[GC_CUSTOMER_ID]}'
filter = None device_filter = None
csv_file = None csv_file = None
serialnumber_column = 'serialNumber' serialnumber_column = 'serialNumber'
devicetype_column = 'deviceType' devicetype_column = 'deviceType'
@@ -194,7 +194,7 @@ def sync():
while i < len(sys.argv): while i < len(sys.argv):
myarg = sys.argv[i].lower().replace('_', '') myarg = sys.argv[i].lower().replace('_', '')
if myarg in ['filter', 'query']: if myarg in ['filter', 'query']:
filter = sys.argv[i+1] device_filter = sys.argv[i+1]
i += 2 i += 2
elif myarg == 'csvfile': elif myarg == 'csvfile':
csv_file = sys.argv[i+1] csv_file = sys.argv[i+1]
@@ -260,7 +260,7 @@ def sync():
fields = f'nextPageToken,devices({",".join(device_fields)})' fields = f'nextPageToken,devices({",".join(device_fields)})'
remote_devices = gapi.get_all_pages(ci.devices(), 'list', 'devices', remote_devices = gapi.get_all_pages(ci.devices(), 'list', 'devices',
customer=customer, page_message=page_message, customer=customer, page_message=page_message,
pageSize=100, filter=filter, view='COMPANY_INVENTORY', fields=fields) pageSize=100, filter=device_filter, view='COMPANY_INVENTORY', fields=fields)
remote_device_map = {} remote_device_map = {}
for remote_device in remote_devices: for remote_device in remote_devices:
sn = remote_device['serialNumber'] sn = remote_device['serialNumber']