commit d7533b541cc6d18bd14ac7c242f053289b2b3509
author Zack Williams <zdw@artisancomputer.com> Tue May 10 10:32:49 2016 -0700
committer Zack Williams <zdw@artisancomputer.com> Tue May 10 10:32:49 2016 -0700
tree 83dbb9beb7c67dec7ebd450afbc0220f820d8e13
parent aa4c87fc78ebe592b6ee952fea0d53d4718208a8

fix django deprecation warning

xos/core/models/tag.py

diff --git a/xos/core/models/tag.py b/xos/core/models/tag.py
index 76a4e2e..7bd7aea 100644
--- a/xos/core/models/tag.py
+++ b/xos/core/models/tag.py
@@ -4,7 +4,7 @@
 from core.models import Service
 from core.models.plcorebase import StrippedCharField
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.fields import GenericForeignKey
 
 # Create your models here.
 
@@ -18,7 +18,7 @@
     # The required fields to do a ObjectType lookup, and object_id assignment
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    content_object = GenericForeignKey('content_type', 'object_id')
 
     def __unicode__(self):
         return self.name