Removed django-custom-field support

Author: bufke

README.md

@@ -18,6 +18,7 @@ Project is now stable and feature complete. Of course it's always a good idea to
 ## 2.0
 
 2.0 adds support for Django 1.9 and 1.10. Support for 1.8 and under is dropped. Support for Python 2 is dropped. 
+Removed support for django-custom-field
 Use 1.x for older environments.
 
 ## 1.17
@@ -31,7 +32,6 @@ atomic transactions. Please report any issues. I test against mysql innodb, post
 - Guess matches
 - Create, update, or both
 - Allow programmers to define special import methods for custom handling
-- Support for [django-custom-field](https://github.com/burke-software/django-custom-field)
 - Set related objects by any unique field
 - Simulate imports before commiting to database
 - Undo (create only) imports

simple_import/views.py

@@ -67,21 +67,6 @@ def validate_match_columns(import_log, model_class, header_row):
     return errors
 
 
-def get_custom_fields_from_model(model_class):
-    """ django-custom-fields support
-    """
-    if 'custom_field' in settings.INSTALLED_APPS:
-        from custom_field.models import CustomField
-        try:
-            content_type = ContentType.objects.get(
-                model=model_class._meta.module_name,
-                app_label=model_class._meta.app_label)
-        except ContentType.DoesNotExist:
-            content_type = None
-        custom_fields = CustomField.objects.filter(content_type=content_type)
-        return custom_fields
-
-
 @staff_member_required
 def match_columns(request, import_log_id):
     """ View to match import spreadsheet columns with database fields
@@ -180,12 +165,6 @@ def match_columns(request, import_log_id):
         if add:
             field_choices += ((field_name, field_verbose),)
 
-    # Include django-custom-field support
-    custom_fields = get_custom_fields_from_model(model_class)
-    if custom_fields:
-        for custom_field in custom_fields:
-            field_choices += (("simple_import_custom__{0}".format(custom_field),
-                           "{0} (Custom)".format(custom_field)),)
     # Include defined methods
     # Model must have a simple_import_methods defined
     if hasattr(model_class, 'simple_import_methods'):
@@ -231,8 +210,7 @@ def match_relations(request, import_log_id):
     for match in matches.exclude(field_name=""):
         field_name = match.field_name
 
-        if not field_name.startswith('simple_import_custom__') and \
-                not field_name.startswith('simple_import_method__'):
+        if not field_name.startswith('simple_import_method__'):
             field = model_class._meta.get_field(field_name)
             m2m = field.many_to_many
 
@@ -293,15 +271,16 @@ def set_field_from_cell(import_log, new_object, header_row_field_name, cell):
     """ Set a field from a import cell. Use referenced fields the field
     is m2m or a foreign key.
     """
-    if (not header_row_field_name.startswith('simple_import_custom__') and
-            not header_row_field_name.startswith('simple_import_method__')):
+    if not header_row_field_name.startswith('simple_import_method__'):
         field = new_object._meta.get_field(header_row_field_name)
-        direct = field.concrete
         m2m = field.many_to_many
         if m2m:
             new_object.simple_import_m2ms[header_row_field_name] = cell
         elif isinstance(field, ForeignKey):
-            related_field_name = RelationalMatch.objects.get(import_log=import_log, field_name=field.name).related_field_name
+            related_field_name = RelationalMatch.objects.get(
+                import_log=import_log,
+                field_name=field.name,
+            ).related_field_name
             related_model = field.remote_field.parent_model
             related_object = related_model.objects.get(**{related_field_name:cell})
             setattr(new_object, header_row_field_name, related_object)
@@ -330,19 +309,15 @@ def set_field_from_cell(import_log, new_object, header_row_field_name, cell):
 def set_method_from_cell(import_log, new_object, header_row_field_name, cell):
     """ Run a method from a import cell.
     """
-    if (not header_row_field_name.startswith('simple_import_custom__') and
-            not header_row_field_name.startswith('simple_import_method__')):
+    if not header_row_field_name.startswith('simple_import_method__'):
         pass
-    elif header_row_field_name.startswith('simple_import_custom__'):
-        new_object.set_custom_value(header_row_field_name[22:], cell)
     elif header_row_field_name.startswith('simple_import_method__'):
         getattr(new_object, header_row_field_name[22:])(cell)
 
 
 @staff_member_required
 def do_import(request, import_log_id):
-    """ Import the data!
-    """
+    """ Import the data! """
     import_log = get_object_or_404(ImportLog, id=import_log_id)
     if import_log.import_type == "N" and 'undo' in request.GET and request.GET['undo'] == "True":
         import_log.undo()
@@ -417,8 +392,6 @@ def do_import(request, import_log_id):
                                 set_method_from_cell(import_log, new_object, header_row_field_names[i], cell)
                             elif header_row_default[i]:
                                 set_method_from_cell(import_log, new_object, header_row_field_names[i], header_row_default[i])
-                    # set_custom_value() calls save() on its own, but the same cannot be assumed
-                    # for other methods, e.g. set_password()
                     new_object.save()
 
                     for key in new_object.simple_import_m2ms.keys():