Replace mox with mox3

mox doesn't work on Python 3, whereas mox3 works on Python 2 and Python
3. Cinder, Nova and many other projects already replaced mox with mox3.
mox3 is now maintained by OpenStack.

Partial-Implements: blueprint porting-python3
Change-Id: I10e6a9754ebd58a2640d73ec8966527c3aa1fe9a

horizon/test/helpers.py

@@ -58,7 +58,7 @@ except ImportError as e:
     os.environ['WITH_SELENIUM'] = ''
 
 
-import mox
+from mox3 import mox
 
 from horizon import middleware
 

horizon/test/tests/tables.py

@@ -19,7 +19,7 @@ from django import http
 from django import shortcuts
 from django.template import defaultfilters
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from horizon import tables
 from horizon.tables import formset as table_formset

openstack_dashboard/dashboards/admin/aggregates/tests.py

@@ -16,7 +16,7 @@ import mock
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.admin.aggregates import constants

openstack_dashboard/dashboards/admin/defaults/tests.py

@@ -14,7 +14,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/admin/flavors/tests.py

@@ -14,7 +14,7 @@ import json
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/admin/hypervisors/compute/tests.py

@@ -12,7 +12,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/admin/hypervisors/tests.py

@@ -14,7 +14,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/admin/images/tests.py

@@ -19,7 +19,7 @@ from django.core.urlresolvers import reverse
 from django import http
 from django.test.utils import override_settings
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/admin/info/tests.py

@@ -14,8 +14,8 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox import IgnoreArg  # noqa
-from mox import IsA  # noqa
+from mox3.mox import IgnoreArg  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/admin/instances/tests.py

@@ -18,8 +18,8 @@ from django.core.urlresolvers import reverse
 from django import http
 from django.utils.datastructures import SortedDict
 
-from mox import IgnoreArg  # noqa
-from mox import IsA  # noqa
+from mox3.mox import IgnoreArg  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/admin/metadata_defs/tests.py

@@ -19,7 +19,7 @@ import json
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.admin.metadata_defs \

openstack_dashboard/dashboards/admin/metering/tests.py

@@ -14,7 +14,7 @@ import json
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/admin/networks/tests.py

@@ -17,7 +17,7 @@ from django import http
 
 from horizon.workflows import views
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.project.networks import tests

openstack_dashboard/dashboards/admin/overview/tests.py

@@ -23,7 +23,7 @@ from django import http
 from django.utils import encoding
 from django.utils import timezone
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from horizon.templatetags import sizeformat
 

openstack_dashboard/dashboards/admin/routers/tests.py

@@ -15,8 +15,8 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IgnoreArg  # noqa
-from mox import IsA  # noqa
+from mox3.mox import IgnoreArg  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.project.routers import tests as r_test

openstack_dashboard/dashboards/admin/volumes/snapshots/tests.py

@@ -12,7 +12,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard.api import cinder
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/admin/volumes/tests.py

@@ -14,7 +14,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.api import cinder

openstack_dashboard/dashboards/admin/volumes/volume_types/extras/tests.py

@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/tests.py

@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/admin/volumes/volume_types/tests.py

@@ -12,7 +12,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.api import cinder

openstack_dashboard/dashboards/admin/volumes/volumes/tests.py

@@ -13,7 +13,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard.api import cinder
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/identity/domains/tests.py

@@ -16,8 +16,8 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IgnoreArg  # noqa
-from mox import IsA  # noqa
+from mox3.mox import IgnoreArg  # noqa
+from mox3.mox import IsA  # noqa
 
 from horizon.workflows import views
 

openstack_dashboard/dashboards/identity/groups/tests.py

@@ -15,8 +15,8 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IgnoreArg  # noqa
-from mox import IsA  # noqa
+from mox3.mox import IgnoreArg  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/identity/projects/tests.py

@@ -24,8 +24,8 @@ from django.test.utils import override_settings
 from django.utils import timezone
 from django.utils import unittest
 
-from mox import IgnoreArg  # noqa
-from mox import IsA  # noqa
+from mox3.mox import IgnoreArg  # noqa
+from mox3.mox import IsA  # noqa
 
 from horizon import exceptions
 from horizon.workflows import views

openstack_dashboard/dashboards/identity/roles/tests.py

@@ -15,8 +15,8 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IgnoreArg  # noqa
-from mox import IsA  # noqa
+from mox3.mox import IgnoreArg  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/identity/users/tests.py

@@ -22,8 +22,8 @@ from django.core.urlresolvers import reverse
 from django import http
 from django.test.utils import override_settings
 
-from mox import IgnoreArg  # noqa
-from mox import IsA  # noqa
+from mox3.mox import IgnoreArg  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/access_and_security/api_access/tests.py

@@ -15,7 +15,7 @@
 from django.core.urlresolvers import reverse
 from django.http import HttpRequest  # noqa
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/access_and_security/floating_ips/tests.py

@@ -21,7 +21,7 @@ from django.core.urlresolvers import reverse
 from django import http
 from django.utils.http import urlencode
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.project.access_and_security \

openstack_dashboard/dashboards/project/access_and_security/keypairs/tests.py

@@ -19,7 +19,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.project.access_and_security.\

openstack_dashboard/dashboards/project/access_and_security/security_groups/tests.py

@@ -22,7 +22,7 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/access_and_security/tests.py

@@ -20,7 +20,7 @@ from copy import deepcopy  # noqa
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from horizon.workflows import views
 from openstack_dashboard import api

openstack_dashboard/dashboards/project/containers/tests.py

@@ -24,7 +24,7 @@ from django.core.files.uploadedfile import InMemoryUploadedFile  # noqa
 from django import http
 from django.utils import http as utils_http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.project.containers import forms

openstack_dashboard/dashboards/project/data_processing/cluster_templates/tests.py

@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/data_processing/clusters/tests.py

@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/data_processing/data_image_registry/tests.py

@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/data_processing/data_plugins/tests.py

@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/data_processing/data_sources/tests.py

@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/data_processing/job_binaries/tests.py

@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/data_processing/job_executions/tests.py

@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/data_processing/jobs/tests.py

@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/tests.py

@@ -13,8 +13,8 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IgnoreArg  # noqa
-from mox import IsA  # noqa
+from mox3.mox import IgnoreArg  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.project.data_processing.utils \

openstack_dashboard/dashboards/project/database_backups/tests.py

@@ -14,7 +14,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/databases/tests.py

@@ -20,7 +20,7 @@ from django.core.urlresolvers import reverse
 from django import http
 from django.utils import unittest
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from horizon import exceptions
 from openstack_dashboard import api

openstack_dashboard/dashboards/project/firewalls/tests.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy

openstack_dashboard/dashboards/project/images/images/tests.py

@@ -25,7 +25,7 @@ from django.forms.widgets import HiddenInput  # noqa
 from django import http
 from django.test.utils import override_settings
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from horizon import tables as horizon_tables
 from openstack_dashboard import api

openstack_dashboard/dashboards/project/images/snapshots/tests.py

@@ -19,7 +19,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/images/tests.py

@@ -22,7 +22,7 @@ from socket import timeout as socket_timeout  # noqa
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from horizon import exceptions
 

openstack_dashboard/dashboards/project/instances/tests.py

@@ -27,8 +27,8 @@ import django.test
 from django.utils.datastructures import SortedDict
 from django.utils import encoding
 from django.utils.http import urlencode
-from mox import IgnoreArg  # noqa
-from mox import IsA  # noqa
+from mox3.mox import IgnoreArg  # noqa
+from mox3.mox import IsA  # noqa
 
 from horizon import exceptions
 from horizon import forms

openstack_dashboard/dashboards/project/loadbalancers/tests.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy

openstack_dashboard/dashboards/project/network_topology/tests.py

@@ -18,7 +18,7 @@ from django.core.urlresolvers import reverse
 from django import http
 import django.test
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/networks/tests.py

@@ -18,7 +18,7 @@ from django.utils.html import escape
 
 from horizon.workflows import views
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.project.networks.subnets import tables\

openstack_dashboard/dashboards/project/overview/tests.py

@@ -22,7 +22,7 @@ from django.core.urlresolvers import reverse
 from django import http
 from django.utils import timezone
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/routers/tests.py

@@ -16,8 +16,8 @@ import copy
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IgnoreArg  # noqa
-from mox import IsA  # noqa
+from mox3.mox import IgnoreArg  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.dashboards.project.routers.extensions.routerrules\

openstack_dashboard/dashboards/project/stacks/resource_types/tests.py

@@ -14,7 +14,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/stacks/tests.py

@@ -21,7 +21,7 @@ from django import http
 from django.test.utils import override_settings  # noqa
 from django.utils import html
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/volumes/backups/tests.py

@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 from django.utils.http import urlencode
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/volumes/snapshots/tests.py

@@ -18,7 +18,7 @@
 
 from django.core.urlresolvers import reverse
 from django import http
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.api import cinder

openstack_dashboard/dashboards/project/volumes/test.py

@@ -15,7 +15,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/project/volumes/volumes/tests.py

@@ -22,7 +22,7 @@ from django.forms import widgets
 from django import http
 from django.test.utils import override_settings
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.api import cinder

openstack_dashboard/dashboards/project/vpn/tests.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy

openstack_dashboard/dashboards/router/nexus1000v/tests.py

@@ -13,7 +13,7 @@
 from django.core.urlresolvers import reverse
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/dashboards/settings/password/tests.py

@@ -19,7 +19,7 @@ from django import http
 from django.utils.six.moves.urllib.parse import urlsplit  # noqa
 from django.utils import unittest
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/test/api_tests/ceilometer_tests.py

@@ -14,7 +14,7 @@
 
 from django import http
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.test import helpers as test

openstack_dashboard/test/api_tests/network_tests.py

@@ -19,7 +19,7 @@ import uuid
 
 from django import http
 from django.test.utils import override_settings
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from novaclient.v2 import floating_ip_pools
 

openstack_dashboard/test/api_tests/nova_tests.py

@@ -23,7 +23,7 @@ from django.conf import settings
 from django import http
 from django.test.utils import override_settings
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 from novaclient import exceptions as nova_exceptions
 from novaclient.v2 import servers
 import six

openstack_dashboard/test/api_tests/swift_tests.py

@@ -18,7 +18,7 @@
 
 from __future__ import absolute_import
 
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from horizon import exceptions
 

openstack_dashboard/test/helpers.py

@@ -38,7 +38,7 @@ from heatclient import client as heat_client
 import httplib2
 from keystoneclient.v2_0 import client as keystone_client
 import mock
-import mox
+from mox3 import mox
 from neutronclient.v2_0 import client as neutron_client
 from novaclient.v2 import client as nova_client
 from openstack_auth import user

openstack_dashboard/test/tests/quotas.py

@@ -20,7 +20,7 @@
 from __future__ import absolute_import
 
 from django import http
-from mox import IsA  # noqa
+from mox3.mox import IsA  # noqa
 
 from openstack_dashboard import api
 from openstack_dashboard.api import cinder

test-requirements.txt

@@ -13,7 +13,7 @@ coverage>=3.6
 django-nose>=1.2
 mock>=1.1;python_version!='2.6'
 mock==1.0.1;python_version=='2.6'
-mox>=0.5.3
+mox3>=0.7.0
 nodeenv>=0.9.4 # BSD License
 nose
 nose-exclude