Update to Django 1.9

requirements/base.txt

@@ -1,20 +1,19 @@
 -r openstack.txt
 -r hermes.txt
-Django==1.8.19
+Django==1.9.13
 dj.choices==0.11.0
 django-extensions==1.7.5
 django-filter==0.13.0
 django-import-export==0.4.2
 django-money==0.15.1
 py-moneyed==1.2
 django-mptt==0.8.7
-django-reversion==1.8.6
+django-reversion==1.10.0
 django-rq==2.0
 django-sitetree==1.7.0
-django-taggit==0.17.1
+django-taggit==0.18.1
 django-taggit-serializer==0.1.5
 django-threadlocals==0.8
-django-transaction-hooks==0.2  # it's merged to Django 1.9 - remove this when Django version will be bumped to 1.9
 django-cryptography==0.3
 djangorestframework==3.2.2
 djangorestframework_xml==1.2.0

src/ralph/access_cards/admin.py

@@ -1,7 +1,8 @@
 from django.utils.translation import ugettext_lazy as _
 
 from ralph.access_cards.models import AccessCard, AccessZone
-from ralph.admin import RalphAdmin, RalphMPTTAdmin, register
+from ralph.admin.mixins import RalphAdmin, RalphMPTTAdmin
+from ralph.admin.decorators import register
 from ralph.lib.transitions.admin import TransitionAdminMixin
 
 

src/ralph/accessories/admin.py

@@ -1,7 +1,8 @@
 from django.utils.translation import ugettext_lazy as _
 
 from ralph.accessories.models import Accessory, AccessoryUser
-from ralph.admin import RalphAdmin, RalphTabularInline, register
+from ralph.admin.mixins import RalphAdmin, RalphTabularInline
+from ralph.admin.decorators import register
 from ralph.admin.views.extra import RalphDetailViewAdmin
 from ralph.lib.transitions.admin import TransitionAdminMixin
 

src/ralph/accessories/models.py

@@ -213,7 +213,7 @@ def free(self):
     free._permission_field = 'number_bought'
 
 
-@reversion.register()
+# @reversion.register()
 class AccessoryUser(models.Model):
     accessory = models.ForeignKey(Accessory)
     user = models.ForeignKey(

src/ralph/accounts/admin.py

@@ -14,12 +14,13 @@
 from django.utils.translation import ugettext_lazy as _
 
 from ralph.accounts.models import RalphUser, Region, Team
-from ralph.admin import RalphAdmin, register
+from ralph.admin.mixins import RalphAdmin
+from ralph.admin.decorators import register
 from ralph.admin.helpers import getattr_dunder
 from ralph.admin.mixins import RalphAdminFormMixin
 from ralph.admin.views.extra import RalphDetailView
 from ralph.back_office.models import BackOfficeAsset, BackOfficeAssetStatus
-from ralph.lib.table import Table
+from ralph.lib.table.table import Table
 from ralph.lib.transitions.models import TransitionsHistory
 from ralph.licences.models import Licence
 from ralph.sim_cards.models import SIMCard

src/ralph/accounts/models.py

@@ -13,7 +13,7 @@
 
 from ralph.admin.autocomplete import AutocompleteTooltipMixin
 from ralph.lib.mixins.models import AdminAbsoluteUrlMixin, NamedMixin
-from ralph.lib.permissions import (
+from ralph.lib.permissions.models import (
     PermByFieldMixin,
     PermissionsForObjectMixin,
     user_permission

src/ralph/admin/__init__.py

@@ -1,22 +1 @@
-from ralph.admin.sites import ralph_site
-from ralph.admin.mixins import (
-    RalphAdmin,
-    RalphAdminForm,
-    RalphMPTTAdmin,
-    RalphStackedInline,
-    RalphTabularInline,
-)
-from ralph.admin.decorators import register
-
 default_app_config = 'ralph.admin.apps.RalphAdminConfig'
-
-__all__ = [
-    'ralph_site',
-    'default_app_config',
-    'register',
-    'RalphAdmin',
-    'RalphAdminForm',
-    'RalphMPTTAdmin',
-    'RalphStackedInline',
-    'RalphTabularInline',
-]

src/ralph/admin/apps.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from ralph.admin.filters import register_custom_filters
+
 from ralph.apps import RalphAppConfig
 
 
@@ -9,5 +9,6 @@ class RalphAdminConfig(RalphAppConfig):
     verbose_name = 'Ralph Admin'
 
     def ready(self):
+        from ralph.admin.filters import register_custom_filters
         register_custom_filters()
         super().ready()

src/ralph/admin/autocomplete.py

@@ -4,10 +4,10 @@
 from functools import reduce
 
 from dj.choices import Choices
+from django.apps import apps
 from django.conf.urls import url
 from django.core.exceptions import FieldDoesNotExist
 from django.db.models import Manager, Q
-from django.db.models.loading import get_model
 from django.http import Http404, HttpResponseBadRequest, JsonResponse
 from django.views.generic import View
 
@@ -164,7 +164,7 @@ class AutocompleteList(SuggestView):
 
     def dispatch(self, request, *args, **kwargs):
         try:
-            model = get_model(kwargs['app'], kwargs['model'])
+            model = apps.get_model(kwargs['app'], kwargs['model'])
         except LookupError:
             return HttpResponseBadRequest('Model not found')
 

src/ralph/admin/m2m.py

@@ -55,7 +55,7 @@ class AuthorAdmin(admin.ModelAdmin):
 from django.utils.text import get_text_list
 from django.utils.translation import ugettext_lazy as _
 
-from ralph.admin import RalphStackedInline, RalphTabularInline
+from ralph.admin.mixins import RalphStackedInline, RalphTabularInline
 from ralph.admin.mixins import RalphAdminForm
 
 

src/ralph/admin/mixins.py

@@ -21,7 +21,8 @@
 from import_export.admin import ImportExportModelAdmin
 from import_export.widgets import ForeignKeyWidget
 from mptt.admin import MPTTAdminForm, MPTTModelAdmin
-from reversion import VersionAdmin
+
+from reversion.admin import VersionAdmin
 
 from ralph.admin import widgets
 from ralph.admin.autocomplete import AjaxAutocompleteMixin
@@ -473,8 +474,8 @@ class RalphAdmin(
     PermissionAdminMixin,
     RalphAdminImportExportMixin,
     AjaxAutocompleteMixin,
+    VersionAdmin,
     RalphAdminMixin,
-    VersionAdmin
 ):
     @property
     def media(self):

src/ralph/admin/widgets.py

@@ -8,11 +8,11 @@
 from urllib import parse
 
 from django import forms
+from django.apps import apps
 from django.contrib.admin.templatetags.admin_static import static
 from django.contrib.admin.views.main import TO_FIELD_VAR
 from django.core.exceptions import FieldDoesNotExist
 from django.core.urlresolvers import reverse
-from django.db.models.loading import get_model
 from django.forms.utils import flatatt
 from django.template import loader
 from django.template.context import RenderContext
@@ -232,7 +232,7 @@ def get_search_fields(self):
             limit_models = getattr(self.field, 'limit_models', [])
             if limit_models:
                 polymorphic_models = [
-                    get_model(*i.split('.')) for i in limit_models
+                    apps.get_model(*i.split('.')) for i in limit_models
                 ]
 
             search_fields_tooltip = defaultdict(list)

src/ralph/assets/admin.py

@@ -2,7 +2,8 @@
 from django.db.models import Count
 from django.utils.translation import ugettext_lazy as _
 
-from ralph.admin import RalphAdmin, RalphMPTTAdmin, RalphTabularInline, register
+from ralph.admin.mixins import RalphAdmin, RalphMPTTAdmin, RalphTabularInline
+from ralph.admin.decorators import register
 from ralph.admin.views.extra import RalphDetailView
 from ralph.assets.models.assets import (
     Asset,
@@ -34,7 +35,7 @@
 )
 from ralph.data_importer import resources
 from ralph.lib.custom_fields.admin import CustomFieldValueAdminMixin
-from ralph.lib.table import Table, TableWithUrl
+from ralph.lib.table.table import Table, TableWithUrl
 from ralph.security.views import ScanStatusInTableMixin
 
 

src/ralph/assets/models/assets.py

@@ -31,7 +31,7 @@
     PriceMixin,
     TimeStampMixin
 )
-from ralph.lib.permissions import PermByFieldMixin
+from ralph.lib.permissions.models import PermByFieldMixin
 from ralph.lib.permissions.models import PermissionsBase
 
 logger = logging.getLogger(__name__)

src/ralph/assets/models/base.py

@@ -11,7 +11,7 @@
     WithCustomFieldsMixin
 )
 from ralph.lib.mixins.models import TaggableMixin, TimeStampMixin
-from ralph.lib.permissions import PermByFieldMixin
+from ralph.lib.permissions.models import PermByFieldMixin
 from ralph.lib.permissions.models import PermissionsBase
 from ralph.lib.polymorphic.models import (
     Polymorphic,

src/ralph/assets/views.py

@@ -1,6 +1,6 @@
 from django.utils.translation import ugettext_lazy as _
 
-from ralph.admin import RalphTabularInline
+from ralph.admin.mixins import RalphTabularInline
 from ralph.admin.views.extra import RalphDetailViewAdmin
 from ralph.assets.models.components import (
     Disk,

src/ralph/attachments/models.py

@@ -3,7 +3,7 @@
 import string
 
 from django.conf import settings
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes import fields
 from django.contrib.contenttypes.models import ContentType
 from django.core.files.base import ContentFile
 from django.db import models, transaction
@@ -169,7 +169,7 @@ class AttachmentItem(models.Model):
     attachment = models.ForeignKey(Attachment, related_name='items')
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    content_object = fields.GenericForeignKey('content_type', 'object_id')
 
     objects = AttachmentItemManager()
 

src/ralph/back_office/admin.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 from django import forms
+from django.apps import apps
 from django.conf import settings
-from django.db.models.loading import get_model
 from django.utils.translation import ugettext_lazy as _
 
-from ralph.admin import RalphAdmin, RalphTabularInline, register
+from ralph.admin.mixins import RalphAdmin, RalphTabularInline
+from ralph.admin.decorators import register
 from ralph.admin.filters import LiquidatedStatusFilter, TagsListFilter
 from ralph.admin.mixins import BulkEditChangeListMixin
 from ralph.admin.sites import ralph_site
@@ -217,7 +218,7 @@ class BackOfficeAssetBulkForm(Form):
                 queryset=Licence.objects.all(), label=_('licences'),
                 required=False,
                 widget=AutocompleteWidget(
-                    field=get_model(
+                    field=apps.get_model(
                         'licences.BaseObjectLicence'
                     )._meta.get_field('licence'),
                     admin_site=ralph_site,

src/ralph/configuration_management/models.py

@@ -5,7 +5,7 @@
 
 from ralph.assets.models import BaseObject
 from ralph.lib.mixins.models import TimeStampMixin
-from ralph.lib.permissions import PermByFieldMixin
+from ralph.lib.permissions.models import PermByFieldMixin
 
 
 class SCMCheckResult(Choices):

src/ralph/dashboards/admin.py

@@ -7,7 +7,8 @@
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 
-from ralph.admin import RalphAdmin, register
+from ralph.admin.mixins import RalphAdmin
+from ralph.admin.decorators import register
 from ralph.admin.mixins import RalphAdminForm
 from ralph.dashboards.models import Dashboard, Graph
 

src/ralph/data_center/admin.py

@@ -10,7 +10,9 @@
 from django.db.models import Prefetch, Q
 from django.utils.translation import ugettext_lazy as _
 
-from ralph.admin import filters, RalphAdmin, RalphTabularInline, register
+from ralph.admin import filters
+from ralph.admin.mixins import RalphAdmin, RalphTabularInline
+from ralph.admin.decorators import register
 from ralph.admin.filters import (
     BaseObjectHostnameFilter,
     ChoicesListFilter,
@@ -60,7 +62,7 @@
 from ralph.data_importer import resources
 from ralph.deployment.mixins import ActiveDeploymentMessageMixin
 from ralph.lib.custom_fields.admin import CustomFieldValueAdminMixin
-from ralph.lib.table import Table
+from ralph.lib.table.table import Table
 from ralph.lib.transitions.admin import TransitionAdminMixin
 from ralph.licences.models import BaseObjectLicence
 from ralph.networks.forms import SimpleNetworkWithManagementIPForm

src/ralph/data_center/forms.py

@@ -13,7 +13,7 @@
 
 class DataCenterAssetForm(PriceFormMixin, AssetFormMixin, RalphAdminForm):
     MODEL_TYPE = ObjectModelType.data_center
-    management_ip = forms.IPAddressField(required=False)
+    management_ip = forms.GenericIPAddressField(required=False, protocol='IPv4')
     management_hostname = CharFormFieldWithAutoStrip(required=False)
 
     ip_fields = ['management_ip', 'management_hostname']

src/ralph/data_importer/models.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes import fields
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 
@@ -20,7 +20,7 @@ class ImportedObjects(TimeStampMixin, models.Model):
     old_ci_uid = models.CharField(
         max_length=255, db_index=True, null=True, blank=True
     )
-    object = generic.GenericForeignKey('content_type', 'object_pk')
+    object = fields.GenericForeignKey('content_type', 'object_pk')
 
     def __str__(self):
         return "{} - {}".format(

src/ralph/deployment/admin.py

@@ -1,6 +1,7 @@
 from django.utils.translation import ugettext_lazy as _
 
-from ralph.admin import RalphAdmin, register
+from ralph.admin.mixins import RalphAdmin
+from ralph.admin.decorators import register
 from ralph.deployment.forms import PrebootConfigurationForm
 from ralph.deployment.models import (
     Deployment,

src/ralph/dhcp/admin.py

@@ -2,14 +2,15 @@
 from django.template.defaultfilters import date, timesince_filter
 from django.utils.translation import ugettext_lazy as _
 
-from ralph.admin import RalphAdmin, RalphTabularInline, register
+from ralph.admin.mixins import RalphAdmin, RalphTabularInline
+from ralph.admin.decorators import register
 from ralph.dhcp.models import (
     DHCPServer,
     DNSServer,
     DNSServerGroup,
     DNSServerGroupOrder
 )
-from ralph.lib.table import TableWithUrl
+from ralph.lib.table.table import TableWithUrl
 
 
 @register(DHCPServer)

src/ralph/domains/admin.py

@@ -2,7 +2,8 @@
 from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
 
-from ralph.admin import RalphAdmin, RalphTabularInline, register
+from ralph.admin.mixins import RalphAdmin, RalphTabularInline
+from ralph.admin.decorators import register
 from ralph.admin.filters import DateListFilter
 from ralph.attachments.admin import AttachmentsMixin
 from ralph.data_importer.resources import DomainContractResource, DomainResource

src/ralph/domains/models/domains.py

@@ -14,7 +14,7 @@
     PriceMixin,
     TimeStampMixin
 )
-from ralph.lib.permissions import PermByFieldMixin
+from ralph.lib.permissions.models import PermByFieldMixin
 
 
 class DomainRegistrant(

src/ralph/lib/custom_fields/admin.py

@@ -3,7 +3,8 @@
 from django.contrib.admin.utils import unquote
 from django.contrib.contenttypes.models import ContentType
 
-from ralph.admin import RalphAdmin, register
+from ralph.admin.decorators import register
+from ralph.admin.mixins import RalphAdmin
 from ralph.admin.mixins import RalphGenericTabularInline
 from ralph.lib.custom_fields.forms import (
     CustomFieldValueForm,