From c9dab5805d1fa4ed407312286c55a74ca344534e Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wayne@riotousliving.com>
Date: Mon, 12 Dec 2016 19:22:09 -0500
Subject: [PATCH] update imports and further consolidate

---
 awx/main/migrations/0034_v310_release.py               | 2 +-
 awx/main/migrations/0035_v310_remove_tower_settings.py | 7 +------
 awx/main/models/workflow.py                            | 5 -----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/awx/main/migrations/0034_v310_release.py b/awx/main/migrations/0034_v310_release.py
index 480f5dda06..fa46beec20 100644
--- a/awx/main/migrations/0034_v310_release.py
+++ b/awx/main/migrations/0034_v310_release.py
@@ -62,7 +62,7 @@ class Migration(migrations.Migration):
             options={
                 'ordering': ('id',),
             },
-            bases=('main.unifiedjob', models.Model, awx.main.models.notifications.JobNotificationMixin, awx.main.models.workflow.WorkflowJobInheritNodesMixin),
+            bases=('main.unifiedjob', models.Model, awx.main.models.notifications.JobNotificationMixin),
         ),
         migrations.CreateModel(
             name='WorkflowJobNode',
diff --git a/awx/main/migrations/0035_v310_remove_tower_settings.py b/awx/main/migrations/0035_v310_remove_tower_settings.py
index bdb0d284fa..e92dfe605c 100644
--- a/awx/main/migrations/0035_v310_remove_tower_settings.py
+++ b/awx/main/migrations/0035_v310_remove_tower_settings.py
@@ -1,12 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
-import awx.main.models.notifications
-import jsonfield.fields
-import django.db.models.deletion
-import awx.main.models.workflow
-import awx.main.fields
+from django.db import migrations
 
 
 class Migration(migrations.Migration):
diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py
index 1cd4d44348..fcf2749055 100644
--- a/awx/main/models/workflow.py
+++ b/awx/main/models/workflow.py
@@ -435,11 +435,6 @@ class WorkflowJobTemplate(UnifiedJobTemplate, WorkflowJobOptions, SurveyJobTempl
         return new_wfjt
 
 
-# Stub in place because of old migrations, can remove if migrations are squashed
-class WorkflowJobInheritNodesMixin(object):
-    pass
-
-
 class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificationMixin):
     class Meta:
         app_label = 'main'