Django 1.11: adapt all get_field_* to match the current Options API

1 files changed, 11 insertions, 21 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 082991824..19f557511 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -22,10 +22,8 @@ Models description
 """
 from cStringIO import StringIO
 import copy
-import csv
 import datetime
 from PIL import Image
-from importlib import import_module
 import logging
 import os
 from os.path import isfile, join
@@ -35,24 +33,18 @@ import shutil
 from subprocess import Popen, PIPE
 import tempfile
 import time
-import unicodecsv
-import zipfile
 
 from django.conf import settings
 from django.core.cache import cache
-from django.core.exceptions import ObjectDoesNotExist, ValidationError, \
-    SuspiciousOperation
-from django.core.files import File
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.validators import validate_slug
 from django.core.urlresolvers import reverse, NoReverseMatch
 from django.db.utils import DatabaseError
 from django.db.models import Q, Max, Count
-from django.db.models.base import ModelBase
-from django.db.models.signals import post_save, pre_delete, post_delete
+from django.db.models.signals import post_save, post_delete
 from django.utils.functional import lazy
-from django.utils.translation import ugettext_lazy as _, ugettext, \
-    pgettext_lazy
+from django.utils.translation import ugettext_lazy as _
 
 from django.utils.safestring import SafeUnicode, mark_safe
 from django.template.defaultfilters import slugify
@@ -65,10 +57,8 @@ from django.contrib.gis.db import models
 from simple_history.models import HistoricalRecords as BaseHistoricalRecords
 
 from ishtar_common.model_merging import merge_model_objects
-from ishtar_common.utils import get_cache, disable_for_loaddata, create_slug
-from ishtar_common.data_importer import Importer, ImportFormater, \
-    IntegerFormater, FloatFormater, UnicodeFormater, DateFormater, \
-    TypeFormater, YearFormater, StrToBoolean, FileFormater
+from ishtar_common.utils import get_cache, disable_for_loaddata, create_slug,\
+    get_all_field_names
 
 from ishtar_common.models_imports import ImporterModel, ImporterType, \
     ImporterDefault, ImporterDefaultValues, ImporterColumn, \
@@ -143,7 +133,7 @@ class ValueGetter(object):
         if not prefix:
             prefix = self._prefix
         values = {}
-        for field_name in self._meta.get_all_field_names():
+        for field_name in get_all_field_names(self):
             if not hasattr(self, field_name):
                 continue
             value = getattr(self, field_name)
@@ -180,7 +170,7 @@ class ValueGetter(object):
         if not prefix:
             prefix = cls._prefix
         values = {}
-        for field_name in cls._meta.get_all_field_names():
+        for field_name in get_all_field_names(cls):
             values[prefix + field_name] = ''
         return values
 
@@ -789,12 +779,12 @@ class ImageModel(models.Model):
 
     def __init__(self, *args, **kwargs):
         super(ImageModel, self).__init__(*args, **kwargs)
-        image = self._meta.get_field_by_name("image")[0]
+        image = self._meta.get_field("image")
         IMAGE_PREFIX = self.IMAGE_PREFIX
         if not IMAGE_PREFIX.endswith('/'):
             IMAGE_PREFIX += u'/'
         image.upload_to = IMAGE_PREFIX
-        thumbnail = self._meta.get_field_by_name("thumbnail")[0]
+        thumbnail = self._meta.get_field("thumbnail")
         thumbnail.upload_to = IMAGE_PREFIX + "thumbs/"
 
     def has_changed(self, field):
@@ -939,8 +929,8 @@ class BaseHistorizedItem(Imported):
             item._next = None
         item.history_date = historized[step].history_date
         model = self.__class__
-        for k in model._meta.get_all_field_names():
-            field = model._meta.get_field_by_name(k)[0]
+        for k in get_all_field_names(model):
+            field = model._meta.get_field(k)
             if hasattr(field, 'rel') and field.rel:
                 if not hasattr(item, k + '_id'):
                     setattr(item, k, getattr(self, k))