Whitespace cleanup in generator

Author: TKIPisalegacycipher

generator/generate_library.py

@@ -154,7 +154,7 @@ def generate_library(spec, version_number, is_github_action):
     base_url = 'https://raw.githubusercontent.com/meraki/dashboard-api-python/master/meraki/'
     for file in non_generated:
         response = requests.get(f'{base_url}{file}')
-        with open(f'meraki/{file}', 'w+', encoding='utf-8', newline='') as fp:
+        with open(f'meraki/{file}', 'w+', encoding='utf-8', newline=None) as fp:
             contents = response.text
             if file == '__init__.py':
                 start = contents.find('__version__ = ')
@@ -183,8 +183,8 @@ def generate_library(spec, version_number, is_github_action):
         print(f'...generating {scope}')
         section = scopes[scope]
 
-        with open(f'meraki/api/{scope}.py', 'w', encoding='utf-8', newline='') as output:
-            with open(f'{template_dir}class_template.jinja2', encoding='utf-8', newline='') as fp:
+        with open(f'meraki/api/{scope}.py', 'w', encoding='utf-8', newline=None) as output:
+            with open(f'{template_dir}class_template.jinja2', encoding='utf-8', newline=None) as fp:
                 class_template = fp.read()
                 template = jinja_env.from_string(class_template)
                 output.write(
@@ -194,8 +194,8 @@ def generate_library(spec, version_number, is_github_action):
                 )
 
             # Generate Asyncio API libraries
-            async_output = open(f'meraki/aio/api/{scope}.py', 'w', encoding='utf-8', newline='')
-            with open(f'{template_dir}async_class_template.jinja2', encoding='utf-8', newline='') as fp:
+            async_output = open(f'meraki/aio/api/{scope}.py', 'w', encoding='utf-8', newline=None)
+            with open(f'{template_dir}async_class_template.jinja2', encoding='utf-8', newline=None) as fp:
                 class_template = fp.read()
                 template = jinja_env.from_string(class_template)
                 async_output.write(
@@ -205,8 +205,8 @@ def generate_library(spec, version_number, is_github_action):
                 )
 
             # Generate Action Batch API libraries
-            batch_output = open(f'meraki/api/batch/{scope}.py', 'w', encoding='utf-8', newline='')
-            with open(f'{template_dir}batch_class_template.jinja2', encoding='utf-8', newline='') as fp:
+            batch_output = open(f'meraki/api/batch/{scope}.py', 'w', encoding='utf-8', newline=None)
+            with open(f'{template_dir}batch_class_template.jinja2', encoding='utf-8', newline=None) as fp:
                 class_template = fp.read()
                 template = jinja_env.from_string(class_template)
                 batch_output.write(
@@ -307,7 +307,7 @@ def generate_library(spec, version_number, is_github_action):
                         call_line = 'return self._session.delete(metadata, resource)'
 
                     # Add function to files
-                    with open(f'{template_dir}function_template.jinja2', encoding='utf-8', newline='') as fp:
+                    with open(f'{template_dir}function_template.jinja2', encoding='utf-8', newline=None) as fp:
                         function_template = fp.read()
                         template = jinja_env.from_string(function_template)
                         output.write(
@@ -430,7 +430,7 @@ def generate_library(spec, version_number, is_github_action):
                         call_line = 'return action'
 
                         # Add function to files
-                        with open(f'{template_dir}batch_function_template.jinja2', encoding='utf-8', newline='') as fp:
+                        with open(f'{template_dir}batch_function_template.jinja2', encoding='utf-8', newline=None) as fp:
                             function_template = fp.read()
                             template = jinja_env.from_string(function_template)
                             batch_output.write(

meraki/__init__.py

@@ -45,7 +45,7 @@
     USE_ITERATOR_FOR_GET_PAGES,
 )
 
-__version__ = '1.34.0'
+__version__ = '1.34.1'
 
 
 class DashboardAPI(object):

meraki/aio/api/organizations.py

@@ -3521,27 +3521,6 @@ def getOrganizationUplinksStatuses(self, organizationId: str, total_pages=1, dir
 
 
 
-    def deleteOrganizationUser(self, organizationId: str, userId: str):
-        """
-        **Delete a user and all of its authentication methods.**
-        https://developer.cisco.com/meraki/api-v1/#!delete-organization-user
-
-        - organizationId (string): Organization ID
-        - userId (string): User ID
-        """
-
-        metadata = {
-            'tags': ['organizations', 'configure', 'users'],
-            'operation': 'deleteOrganizationUser'
-        }
-        organizationId = urllib.parse.quote(str(organizationId), safe='')
-        userId = urllib.parse.quote(str(userId), safe='')
-        resource = f'/organizations/{organizationId}/users/{userId}'
-
-        return self._session.delete(metadata, resource)
-        
-
-
     def getOrganizationWebhooksAlertTypes(self, organizationId: str, **kwargs):
         """
         **Return a list of alert types to be used with managing webhook alerts**

meraki/api/batch/__init__.py

@@ -1,28 +1,28 @@
-from meraki.api.batch.organizations import ActionBatchOrganizations
-from meraki.api.batch.networks import ActionBatchNetworks
-from meraki.api.batch.devices import ActionBatchDevices
-from meraki.api.batch.appliance import ActionBatchAppliance
-from meraki.api.batch.camera import ActionBatchCamera
-from meraki.api.batch.cellularGateway import ActionBatchCellularGateway
-from meraki.api.batch.insight import ActionBatchInsight
-from meraki.api.batch.sensor import ActionBatchSensor
-from meraki.api.batch.sm import ActionBatchSm
-from meraki.api.batch.switch import ActionBatchSwitch
-from meraki.api.batch.wireless import ActionBatchWireless
-
-
-# Batch class
-class Batch:
-    def __init__(self):
-        # Action Batch helper API endpoints by section
-        self.organizations = ActionBatchOrganizations()
-        self.networks = ActionBatchNetworks()
-        self.devices = ActionBatchDevices()
-        self.appliance = ActionBatchAppliance()
-        self.camera = ActionBatchCamera()
-        self.cellularGateway = ActionBatchCellularGateway()
-        self.insight = ActionBatchInsight()
-        self.sensor = ActionBatchSensor()
-        self.sm = ActionBatchSm()
-        self.switch = ActionBatchSwitch()
-        self.wireless = ActionBatchWireless()
+from meraki.api.batch.organizations import ActionBatchOrganizations
+from meraki.api.batch.networks import ActionBatchNetworks
+from meraki.api.batch.devices import ActionBatchDevices
+from meraki.api.batch.appliance import ActionBatchAppliance
+from meraki.api.batch.camera import ActionBatchCamera
+from meraki.api.batch.cellularGateway import ActionBatchCellularGateway
+from meraki.api.batch.insight import ActionBatchInsight
+from meraki.api.batch.sensor import ActionBatchSensor
+from meraki.api.batch.sm import ActionBatchSm
+from meraki.api.batch.switch import ActionBatchSwitch
+from meraki.api.batch.wireless import ActionBatchWireless
+
+
+# Batch class
+class Batch:
+    def __init__(self):
+        # Action Batch helper API endpoints by section
+        self.organizations = ActionBatchOrganizations()
+        self.networks = ActionBatchNetworks()
+        self.devices = ActionBatchDevices()
+        self.appliance = ActionBatchAppliance()
+        self.camera = ActionBatchCamera()
+        self.cellularGateway = ActionBatchCellularGateway()
+        self.insight = ActionBatchInsight()
+        self.sensor = ActionBatchSensor()
+        self.sm = ActionBatchSm()
+        self.switch = ActionBatchSwitch()
+        self.wireless = ActionBatchWireless()

meraki/api/batch/organizations.py

@@ -1236,29 +1236,3 @@ def deleteOrganizationSamlIdp(self, organizationId: str, idpId: str):
 
 
 
-
-
-    def deleteOrganizationUser(self, organizationId: str, userId: str):
-        """
-        **Delete a user and all of its authentication methods.**
-        https://developer.cisco.com/meraki/api-v1/#!delete-organization-user
-
-        - organizationId (string): Organization ID
-        - userId (string): User ID
-        """
-
-        metadata = {
-            'tags': ['organizations', 'configure', 'users'],
-            'operation': 'deleteOrganizationUser'
-        }
-        resource = f'/organizations/{organizationId}/users/{userId}'
-
-        action = {
-            "resource": resource,
-            "operation": "destroy",
-        }
-        return action
-        
-
-
-

meraki/api/organizations.py

@@ -3521,27 +3521,6 @@ def getOrganizationUplinksStatuses(self, organizationId: str, total_pages=1, dir
 
 
 
-    def deleteOrganizationUser(self, organizationId: str, userId: str):
-        """
-        **Delete a user and all of its authentication methods.**
-        https://developer.cisco.com/meraki/api-v1/#!delete-organization-user
-
-        - organizationId (string): Organization ID
-        - userId (string): User ID
-        """
-
-        metadata = {
-            'tags': ['organizations', 'configure', 'users'],
-            'operation': 'deleteOrganizationUser'
-        }
-        organizationId = urllib.parse.quote(str(organizationId), safe='')
-        userId = urllib.parse.quote(str(userId), safe='')
-        resource = f'/organizations/{organizationId}/users/{userId}'
-
-        return self._session.delete(metadata, resource)
-        
-
-
     def getOrganizationWebhooksAlertTypes(self, organizationId: str, **kwargs):
         """
         **Return a list of alert types to be used with managing webhook alerts**