diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7263801..6148c5d8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -460,7 +460,7 @@ jobs: "${PYTHON}" get-pip.py "${PYTHON}" -m pip install --upgrade pip "${PYTHON}" -m pip install --upgrade wheel - "${PYTHON}" -m pip install --upgrade setuptools + "${PYTHON}" -m pip install --upgrade setuptools==70.3.0 --force-reinstall - name: Install pip requirements run: | diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 3dfe319a..5b0917e2 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -36922,9 +36922,9 @@ def _getCalendarEventAttribute(myarg, body, parameters, function): body.update(jsonData) clearJSONfields(body, EVENT_JSON_INSERT_CLEAR_FIELDS) elif function == 'import': + if 'id' in jsonData: + jsonData['iCalUID'] = jsonData.pop('id') body.update(jsonData) - if 'id' in body: - body['iCalUID'] = body.pop('id') elif function == 'update': if 'event' in jsonData and 'attendees' in jsonData['event']: parameters['attendees'].extend(jsonData['event'].pop('attendees'))