diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py index d9ccb9b36f..12690379c1 100644 --- a/awx/api/views/__init__.py +++ b/awx/api/views/__init__.py @@ -2,7 +2,6 @@ # All Rights Reserved. # Python -import datetime import dateutil import functools import html @@ -889,6 +888,7 @@ class ProjectUpdateEventsList(SubListAPIView): job_created=self.get_parent_object().created_or_epoch ) + class SystemJobEventsList(SubListAPIView): model = models.SystemJobEvent @@ -907,6 +907,7 @@ class SystemJobEventsList(SubListAPIView): job_created=self.get_parent_object().created_or_epoch ) + class ProjectUpdateCancel(RetrieveAPIView): model = models.ProjectUpdate diff --git a/awx/api/views/inventory.py b/awx/api/views/inventory.py index 845f352e64..d255a8110b 100644 --- a/awx/api/views/inventory.py +++ b/awx/api/views/inventory.py @@ -2,7 +2,6 @@ # All Rights Reserved. # Python -import datetime import logging # Django diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index b0b0f6eddc..8daf3d116e 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -1031,6 +1031,7 @@ def truncate_stdout(stdout, size): return stdout + u'\u001b[0m' * (set_count - reset_count) + def deepmerge(a, b): """ Merge dict structures and return the result.