Django 1.8: fix import errors, deprecation warnings and models warnings

1 files changed, 11 insertions, 13 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index f1de8c60a..e1a643ea3 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -55,7 +55,7 @@ from django.template.defaultfilters import slugify
 
 from django.contrib.auth.models import User, Group
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.gis.db import models
 
 from simple_history.models import HistoricalRecords as BaseHistoricalRecords
@@ -130,7 +130,7 @@ def check_model_access_control(request, model, available_perms=None):
 
 class Imported(models.Model):
     imports = models.ManyToManyField(
-        'Import', blank=True, null=True,
+        'Import', blank=True,
         related_name="imported_%(app_label)s_%(class)s")
 
     class Meta:
@@ -772,7 +772,7 @@ class ItemKey(models.Model):
     key = models.CharField(_(u"Key"), max_length=100)
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    content_object = GenericForeignKey('content_type', 'object_id')
     importer = models.ForeignKey(
         'Import', null=True, blank=True,
         help_text=_(u"Specific key to an import"))
@@ -1695,10 +1695,8 @@ class Address(BaseHistorizedItem):
 
 class Merge(models.Model):
     merge_key = models.TextField(_("Merge key"), blank=True, null=True)
-    merge_candidate = models.ManyToManyField("self",
-                                             blank=True, null=True)
-    merge_exclusion = models.ManyToManyField("self",
-                                             blank=True, null=True)
+    merge_candidate = models.ManyToManyField("self", blank=True)
+    merge_exclusion = models.ManyToManyField("self", blank=True)
     archived = models.NullBooleanField(default=False,
                                        blank=True, null=True)
     # 1 for one word similarity, 2 for two word similarity, etc.
@@ -1837,13 +1835,13 @@ class ImporterType(models.Model):
     description = models.CharField(_(u"Description"), blank=True, null=True,
                                    max_length=500)
     users = models.ManyToManyField('IshtarUser', verbose_name=_(u"Users"),
-                                   blank=True, null=True)
+                                   blank=True)
     associated_models = models.ForeignKey(
         ImporterModel, verbose_name=_(u"Associated model"),
         related_name='+', blank=True, null=True)
     created_models = models.ManyToManyField(
         ImporterModel, verbose_name=_(u"Models that can accept new items"),
-        blank=True, null=True, help_text=_(u"Leave blank for no restrictions"),
+        blank=True, help_text=_(u"Leave blank for no restrictions"),
         related_name='+')
     is_template = models.BooleanField(_(u"Is template"), default=False)
     unicity_keys = models.CharField(_(u"Unicity keys (separator \";\")"),
@@ -2603,7 +2601,7 @@ class Organization(Address, Merge, OwnPerms, ValueGetter):
 class PersonType(GeneralType):
     # rights = models.ManyToManyField(WizardStep, verbose_name=_(u"Rights"))
     groups = models.ManyToManyField(Group, verbose_name=_(u"Groups"),
-                                    blank=True, null=True)
+                                    blank=True)
 
     class Meta:
         verbose_name = _(u"Person type")
@@ -2868,8 +2866,8 @@ class IshtarUser(User):
     }
 
     # fields
-    person = models.ForeignKey(Person, verbose_name=_(u"Person"), unique=True,
-                               related_name='ishtaruser')
+    person = models.OneToOneField(Person, verbose_name=_(u"Person"),
+                                  related_name='ishtaruser')
     advanced_shortcut_menu = models.BooleanField(
         _(u"Advanced shortcut menu"), default=False)
 
@@ -3006,7 +3004,7 @@ class Source(OwnPerms, ImageModel, models.Model):
     authors = models.ManyToManyField(Author, verbose_name=_(u"Authors"),
                                      related_name="%(class)s_related")
     associated_url = models.URLField(
-        verify_exists=False, blank=True, null=True,
+        blank=True, null=True,
         verbose_name=_(u"Numerical ressource (web address)"))
     receipt_date = models.DateField(blank=True, null=True,
                                     verbose_name=_(u"Receipt date"))