convert py2 -> py3

This commit is contained in:
Ryan Petrello
2018-10-22 12:58:42 -04:00
parent f132ce9b64
commit f223df303f
202 changed files with 1137 additions and 2046 deletions

View File

@@ -1,4 +1,4 @@
import mock
from unittest import mock
import pytest

View File

@@ -1,7 +1,7 @@
# Python
import pytest
import mock
from mock import PropertyMock
from unittest import mock
from unittest.mock import PropertyMock
# AWX
from awx.api.serializers import (

View File

@@ -1,11 +1,9 @@
# Python
from collections import namedtuple
import pytest
import mock
from unittest import mock
import json
from six.moves import xrange
# AWX
from awx.api.serializers import (
JobDetailSerializer,
@@ -47,12 +45,12 @@ def job(mocker, job_template, project_update):
@pytest.fixture
def labels(mocker):
return [Label(id=x, name='label-%d' % x) for x in xrange(0, 25)]
return [Label(id=x, name='label-%d' % x) for x in range(0, 25)]
@pytest.fixture
def jobs(mocker):
return [Job(id=x, name='job-%d' % x) for x in xrange(0, 25)]
return [Job(id=x, name='job-%d' % x) for x in range(0, 25)]
@mock.patch('awx.api.serializers.UnifiedJobTemplateSerializer.get_related', lambda x,y: {})

View File

@@ -1,8 +1,6 @@
# Python
import pytest
import mock
from six.moves import xrange
from unittest import mock
# AWX
from awx.api.serializers import (
@@ -41,7 +39,7 @@ def job(mocker, job_template):
@pytest.fixture
def jobs(mocker):
return [Job(id=x, name='job-%d' % x) for x in xrange(0, 25)]
return [Job(id=x, name='job-%d' % x) for x in range(0, 25)]
@mock.patch('awx.api.serializers.UnifiedJobTemplateSerializer.get_related', lambda x,y: {})

View File

@@ -1,6 +1,6 @@
# Python
import pytest
import mock
from unittest import mock
# AWX
from awx.api.serializers import (