From e1a8b697368075342ff112d78559512e243f85e1 Mon Sep 17 00:00:00 2001 From: cclauss Date: Thu, 8 Feb 2018 21:13:40 +0100 Subject: [PATCH] from six.moves import xrange for Python 3 --- awx/lib/awx_display_callback/events.py | 2 ++ awx/main/queue.py | 2 ++ awx/main/tests/functional/conftest.py | 1 + .../tests/functional/models/fact/test_get_timeline.py | 10 ++++++---- awx/main/tests/functional/test_notifications.py | 2 ++ .../tests/unit/api/serializers/test_job_serializers.py | 2 ++ .../api/serializers/test_job_template_serializers.py | 2 ++ awx/main/tests/unit/utils/test_event_filter.py | 2 ++ 8 files changed, 19 insertions(+), 4 deletions(-) diff --git a/awx/lib/awx_display_callback/events.py b/awx/lib/awx_display_callback/events.py index b5ea72b21e..ca801925f5 100644 --- a/awx/lib/awx_display_callback/events.py +++ b/awx/lib/awx_display_callback/events.py @@ -29,6 +29,8 @@ import threading import uuid import memcache +from six.moves import xrange + __all__ = ['event_context'] diff --git a/awx/main/queue.py b/awx/main/queue.py index a1e1493b66..3f68c68c2a 100644 --- a/awx/main/queue.py +++ b/awx/main/queue.py @@ -5,6 +5,8 @@ import logging import os +from six.moves import xrange + # Django from django.conf import settings diff --git a/awx/main/tests/functional/conftest.py b/awx/main/tests/functional/conftest.py index a0c61d23f4..eba5a50b0d 100644 --- a/awx/main/tests/functional/conftest.py +++ b/awx/main/tests/functional/conftest.py @@ -5,6 +5,7 @@ import json import os import six from datetime import timedelta +from six.moves import xrange # Django from django.core.urlresolvers import resolve diff --git a/awx/main/tests/functional/models/fact/test_get_timeline.py b/awx/main/tests/functional/models/fact/test_get_timeline.py index 940498f913..7dbcb4bb4e 100644 --- a/awx/main/tests/functional/models/fact/test_get_timeline.py +++ b/awx/main/tests/functional/models/fact/test_get_timeline.py @@ -1,6 +1,8 @@ import pytest from datetime import timedelta +from six.moves import xrange + from django.utils import timezone from awx.main.models import Fact @@ -19,7 +21,7 @@ def setup_common(hosts, fact_scans, ts_from=None, ts_to=None, epoch=timezone.now continue facts_known.append(f) fact_objs = Fact.get_timeline(hosts[0].id, module=module_name, ts_from=ts_from, ts_to=ts_to) - return (facts_known, fact_objs) + return (facts_known, fact_objs) @pytest.mark.django_db @@ -27,7 +29,7 @@ def test_all(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): epoch = timezone.now() ts_from = epoch - timedelta(days=1) ts_to = epoch + timedelta(days=10) - + (facts_known, fact_objs) = setup_common(hosts, fact_scans, ts_from, ts_to, module_name=None, epoch=epoch) assert 9 == len(facts_known) assert 9 == len(fact_objs) @@ -53,7 +55,7 @@ def test_empty_db(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): epoch = timezone.now() ts_from = epoch - timedelta(days=1) ts_to = epoch + timedelta(days=10) - + fact_objs = Fact.get_timeline(hosts[0].id, 'ansible', ts_from, ts_to) assert 0 == len(fact_objs) @@ -64,7 +66,7 @@ def test_no_results(hosts, fact_scans, monkeypatch_jsonbfield_get_db_prep_save): epoch = timezone.now() ts_from = epoch - timedelta(days=100) ts_to = epoch - timedelta(days=50) - + (facts_known, fact_objs) = setup_common(hosts, fact_scans, ts_from, ts_to, epoch=epoch) assert 0 == len(fact_objs) diff --git a/awx/main/tests/functional/test_notifications.py b/awx/main/tests/functional/test_notifications.py index fe350fd988..9e659b0adc 100644 --- a/awx/main/tests/functional/test_notifications.py +++ b/awx/main/tests/functional/test_notifications.py @@ -5,6 +5,8 @@ from requests.adapters import HTTPAdapter from requests.utils import select_proxy from requests.exceptions import ConnectionError +from six.moves import xrange + from awx.api.versioning import reverse from awx.main.models.notifications import NotificationTemplate, Notification from awx.main.models.inventory import Inventory, InventorySource diff --git a/awx/main/tests/unit/api/serializers/test_job_serializers.py b/awx/main/tests/unit/api/serializers/test_job_serializers.py index e3062ef7e2..3c1529cba1 100644 --- a/awx/main/tests/unit/api/serializers/test_job_serializers.py +++ b/awx/main/tests/unit/api/serializers/test_job_serializers.py @@ -3,6 +3,8 @@ import pytest import mock import json +from six.moves import xrange + # AWX from awx.api.serializers import ( JobSerializer, diff --git a/awx/main/tests/unit/api/serializers/test_job_template_serializers.py b/awx/main/tests/unit/api/serializers/test_job_template_serializers.py index ce2cba53e3..29c0512256 100644 --- a/awx/main/tests/unit/api/serializers/test_job_template_serializers.py +++ b/awx/main/tests/unit/api/serializers/test_job_template_serializers.py @@ -2,6 +2,8 @@ import pytest import mock +from six.moves import xrange + # AWX from awx.api.serializers import ( JobTemplateSerializer, diff --git a/awx/main/tests/unit/utils/test_event_filter.py b/awx/main/tests/unit/utils/test_event_filter.py index 4db92c91ef..85ecc609d0 100644 --- a/awx/main/tests/unit/utils/test_event_filter.py +++ b/awx/main/tests/unit/utils/test_event_filter.py @@ -3,6 +3,8 @@ import base64 import json from StringIO import StringIO +from six.moves import xrange + from awx.main.utils import OutputEventFilter MAX_WIDTH = 78