gam7 7.19.1__py3-none-any.whl → 7.19.3__py3-none-any.whl

gam/__init__.py

@@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki
 """
 
 __author__ = 'GAM Team <google-apps-manager@googlegroups.com>'
-__version__ = '7.19.01'
+__version__ = '7.19.03'
 __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 #pylint: disable=wrong-import-position
@@ -5807,7 +5807,7 @@ def convertUIDtoEmailAddress(emailAddressOrUID, cd=None, emailTypes=None,
     normalizedEmailAddressOrUID = normalizeEmailAddressOrUID(emailAddressOrUID, ciGroupsAPI=ciGroupsAPI)
     if normalizedEmailAddressOrUID.startswith(NON_EMAIL_MEMBER_PREFIXES):
       return normalizedEmailAddressOrUID
-  email, _ = convertUIDtoEmailAddressWithType(emailAddressOrUID, cd, emailTypes,
+  email, _ = convertUIDtoEmailAddressWithType(emailAddressOrUID, cd, None, emailTypes,
                                               checkForCustomerId, ciGroupsAPI, aliasAllowed)
   return email
 
@@ -32228,9 +32228,9 @@ def doUpdateMobileDevices():
                           [Msg.ACTION_APPLIED, body['action']], i, count)
       except GAPI.internalError:
         entityActionFailedWarning([Ent.MOBILE_DEVICE, resourceId], Msg.DOES_NOT_EXIST, i, count)
-      except (GAPI.resourceIdNotFound, GAPI.badRequest, GAPI.resourceNotFound) as e:
+      except (GAPI.resourceIdNotFound, GAPI.badRequest, GAPI.resourceNotFound, GAPI.forbidden) as e:
         entityActionFailedWarning([Ent.MOBILE_DEVICE, resourceId], str(e), i, count)
-      except (GAPI.forbidden, GAPI.permissionDenied) as e:
+      except GAPI.permissionDenied as e:
         ClientAPIAccessDeniedExit(str(e))
 
 # gam delete mobile|mobiles <MobileDeviceEntity>
@@ -44907,6 +44907,12 @@ def waitForMailbox(entityList):
     Ind.Decrement()
 
 def getUserLicenses(lic, user, skus):
+  reasons_to_quit = [
+    GAPI.ACCESS_NOT_CONFIGURED, # license API not turned on
+    GAPI.PERMISSION_DENIED, # Admin doesn't have rights to license assignments
+    GAPI.NOT_FOUND # API call succeeded, user does not have this license
+  ]
+
   def _callbackGetLicense(request_id, response, exception):
     if exception is None:
       if response and 'skuId' in response:
@@ -44914,18 +44920,12 @@ def getUserLicenses(lic, user, skus):
         del sku_calls[request_id]
     else:
       _, reason, _ = checkGAPIError(exception, softErrors=True)
-      reasons_to_quit = [
-        GAPI.ACCESS_NOT_CONFIGURED, # license API not turned on
-        GAPI.PERMISSION_DENIED, # Admin doesn't have rights to license assignments
-        GAPI.NOT_FOUND # API call succeeded, user does not have this license
-      ]
       if reason in reasons_to_quit:
         del sku_calls[request_id]
 
   licenses = []
   svcargs = dict([('userId', user['primaryEmail']), ('productId', None), ('skuId', None), ('fields', 'skuId')]+GM.Globals[GM.EXTRA_ARGS_LIST])
   method = getattr(lic.licenseAssignments(), 'get')
-  dbatch = lic.new_batch_http_request(callback=_callbackGetLicense)
   sku_calls = {}
   for sku in skus:
     svcparms = svcargs.copy()
@@ -44944,7 +44944,7 @@ def getUserLicenses(lic, user, skus):
       if try_count >= 5:
         # give up and return what we have
         return licenses
-    time.sleep(5)
+      time.sleep(5)
   return licenses
 
 USER_NAME_PROPERTY_PRINT_ORDER = [

{gam7-7.19.1.dist-info → gam7-7.19.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gam7
-Version: 7.19.1
+Version: 7.19.3
 Summary: CLI tool to manage Google Workspace
 Project-URL: Homepage, https://github.com/GAM-team/GAM
 Project-URL: Issues, https://github.com/GAM-team/GAM/issues

{gam7-7.19.1.dist-info → gam7-7.19.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-gam/__init__.py,sha256=v_f6su0DU1Y8sZtTT6vOeiHVMZgh3rpOQUmb9NOoy6M,3584396
+gam/__init__.py,sha256=ngnkOfi7vZjdRs83cEbcphscUZiEoju6GlIDSBF9nVM,3584315
 gam/__main__.py,sha256=amz0-959ph6zkZKqjaar4n60yho-T37w6qWI36qx0CA,1049
 gam/cacerts.pem,sha256=DUsVo2XlFYwfkhe3gnxa-Km4Z4noz74hSApXwTT-nQE,44344
 gam/cbcm-v1.1beta1.json,sha256=xO5XloCQQULmPbFBx5bckdqmbLFQ7sJ2TImhE1ysDIY,19439
@@ -65,8 +65,8 @@ gam/googleapiclient/discovery_cache/base.py,sha256=yCDPtxnbNN-p5_9fzBacC6P3wcUPl
 gam/googleapiclient/discovery_cache/file_cache.py,sha256=sim3Mg4HgRYo3vX75jvcKy_aV568EvIrtBfvfbw-044,4774
 gam/iso8601/__init__.py,sha256=Z2PsYbXgAH5a5xzUvgczCboPzqWpm65kRcIngCnhViU,1218
 gam/iso8601/iso8601.py,sha256=Li2FHZ4sBTWuthuQhyCvmvj0j6At8JbGzkSv2fc2RHU,4384
-gam7-7.19.1.dist-info/METADATA,sha256=pql652oT3XdQ8EVv88iKWb9ckPLa3K93DNtfPnehJIw,2940
-gam7-7.19.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gam7-7.19.1.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
-gam7-7.19.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-gam7-7.19.1.dist-info/RECORD,,
+gam7-7.19.3.dist-info/METADATA,sha256=TeUdQCPXnItSyqXwJbMSkU3f43C-2H1wKRyc2AF7YPM,2940
+gam7-7.19.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gam7-7.19.3.dist-info/entry_points.txt,sha256=HVUM5J7dA8YwvJfG30jiLefR19ExMs387TWugWd9sf4,42
+gam7-7.19.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+gam7-7.19.3.dist-info/RECORD,,