Remove client arg from _get_encrypted_fields

- client need not be an argument since it can be accessed using self.connection.connection

Author: aclark4life

django_mongodb_backend/management/commands/showencryptedfieldsmap.py

@@ -35,14 +35,13 @@ def handle(self, *args, **options):
         db = options["database"]
         create_data_keys = options.get("create_data_keys", False)
         connection = connections[db]
-        client = connection.connection
         encrypted_fields_map = {}
         with connection.schema_editor() as editor:
             for app_config in apps.get_app_configs():
                 for model in router.get_migratable_models(app_config, db):
                     if model_has_encrypted_fields(model):
                         fields = editor._get_encrypted_fields(
-                            model, client, create_data_keys=create_data_keys
+                            model, create_data_keys=create_data_keys
                         )
                         encrypted_fields_map[model._meta.db_table] = fields
         self.stdout.write(json_util.dumps(encrypted_fields_map, indent=2))

django_mongodb_backend/schema.py

@@ -474,7 +474,7 @@ def _create_collection(self, model):
                 )
             encrypted_fields_map = getattr(auto_encryption_opts, "_encrypted_fields_map", None)
             if not encrypted_fields_map:
-                encrypted_fields = self._get_encrypted_fields(model, client, create_data_keys=True)
+                encrypted_fields = self._get_encrypted_fields(model, create_data_keys=True)
             else:
                 # If the encrypted fields map is provided, get the encrypted fields for the
                 # specific collection.
@@ -484,14 +484,15 @@ def _create_collection(self, model):
             db.create_collection(db_table)
 
     def _get_encrypted_fields(
-        self, model, client, create_data_keys=False, key_alt_name=None, client_encryption=None
+        self, model, create_data_keys=False, key_alt_name=None, client_encryption=None
     ):
         """
         Recursively collect encryption schema data for fields in a model.
 
         key_alt_name is the base path for this level, typically model._meta.db_table
         """
         connection = self.connection
+        client = connection.connection
         fields = model._meta.fields
         key_alt_name = key_alt_name or model._meta.db_table
 
@@ -548,7 +549,6 @@ def _get_encrypted_fields(
                 field_list.append(field_dict)
                 embedded_result = self._get_encrypted_fields(
                     field.embedded_model,
-                    client,
                     create_data_keys=create_data_keys,
                     key_alt_name=new_path,
                     client_encryption=client_encryption,