Fix a handful of warnings and remove some unused compatibility code

example/pexp/admin.py

@@ -42,36 +42,34 @@ class ModelAAdmin(PolymorphicParentModelAdmin):
 admin.site.register(ModelA, ModelAAdmin)
 
 
-if 'Model2A' in globals():
-    class Model2AChildAdmin(PolymorphicChildModelAdmin):
-        base_model = Model2A
+class Model2AChildAdmin(PolymorphicChildModelAdmin):
+    base_model = Model2A
 
-    class Model2AAdmin(PolymorphicParentModelAdmin):
-        base_model = Model2A
-        list_filter = (PolymorphicChildModelFilter,)
-        child_models = (
-            (Model2A, Model2AChildAdmin),
-            (Model2B, Model2AChildAdmin),
-            (Model2C, Model2AChildAdmin),
-        )
+class Model2AAdmin(PolymorphicParentModelAdmin):
+    base_model = Model2A
+    list_filter = (PolymorphicChildModelFilter,)
+    child_models = (
+        (Model2A, Model2AChildAdmin),
+        (Model2B, Model2AChildAdmin),
+        (Model2C, Model2AChildAdmin),
+    )
 
-    admin.site.register(Model2A, Model2AAdmin)
+admin.site.register(Model2A, Model2AAdmin)
 
 
-if 'UUIDModelA' in globals():
-    class UUIDModelAChildAdmin(PolymorphicChildModelAdmin):
-        base_model = UUIDModelA
+class UUIDModelAChildAdmin(PolymorphicChildModelAdmin):
+    base_model = UUIDModelA
 
-    class UUIDModelAAdmin(PolymorphicParentModelAdmin):
-        base_model = UUIDModelA
-        list_filter = (PolymorphicChildModelFilter,)
-        child_models = (
-            (UUIDModelA, UUIDModelAChildAdmin),
-            (UUIDModelB, UUIDModelAChildAdmin),
-            (UUIDModelC, UUIDModelAChildAdmin),
-        )
+class UUIDModelAAdmin(PolymorphicParentModelAdmin):
+    base_model = UUIDModelA
+    list_filter = (PolymorphicChildModelFilter,)
+    child_models = (
+        (UUIDModelA, UUIDModelAChildAdmin),
+        (UUIDModelB, UUIDModelAChildAdmin),
+        (UUIDModelC, UUIDModelAChildAdmin),
+    )
 
-    admin.site.register(UUIDModelA, UUIDModelAAdmin)
+admin.site.register(UUIDModelA, UUIDModelAAdmin)
 
 
 class ProxyChildAdmin(PolymorphicChildModelAdmin):

example/pexp/models.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import django
 from django.db import models
 
 from polymorphic.models import PolymorphicModel
@@ -26,27 +27,25 @@ class nModelB(nModelA):
 class nModelC(nModelB):
     field3 = models.CharField(max_length=10)
 
-# for Django 1.2+, test models with same names in different apps
-# (the other models with identical names are in polymorphic/tests.py)
-from django import VERSION as django_VERSION
-if not (django_VERSION[0]<=1 and django_VERSION[1]<=1):
-    class Model2A(PolymorphicModel):
-        field1 = models.CharField(max_length=10)
-    class Model2B(Model2A):
-        field2 = models.CharField(max_length=10)
-    class Model2C(Model2B):
-        field3 = models.CharField(max_length=10)
+class Model2A(PolymorphicModel):
+    field1 = models.CharField(max_length=10)
+class Model2B(Model2A):
+    field2 = models.CharField(max_length=10)
+class Model2C(Model2B):
+    field3 = models.CharField(max_length=10)
 
-try: from polymorphic.test_tools  import UUIDField
-except: pass
-if 'UUIDField' in globals():
-    class UUIDModelA(ShowFieldTypeAndContent, PolymorphicModel):
-        uuid_primary_key = UUIDField(primary_key = True)
-        field1 = models.CharField(max_length=10)
-    class UUIDModelB(UUIDModelA):
-        field2 = models.CharField(max_length=10)
-    class UUIDModelC(UUIDModelB):
-        field3 = models.CharField(max_length=10)
+if django.VERSION < (1,8):
+    from polymorphic.tools_for_tests import UUIDField
+else:
+    from django.db.models import UUIDField
+
+class UUIDModelA(ShowFieldTypeAndContent, PolymorphicModel):
+    uuid_primary_key = UUIDField(primary_key = True)
+    field1 = models.CharField(max_length=10)
+class UUIDModelB(UUIDModelA):
+    field2 = models.CharField(max_length=10)
+class UUIDModelC(UUIDModelB):
+    field3 = models.CharField(max_length=10)
 
 class ProxyBase(PolymorphicModel):
     title = models.CharField(max_length=200)