From 0dda687762d44f58fa643372cb79037bf0c122a5 Mon Sep 17 00:00:00 2001 From: Steve Pulec Date: Thu, 23 Feb 2017 21:41:05 -0500 Subject: [PATCH] Fix urlparse for py3. --- moto/compat.py | 5 ----- moto/emr/responses.py | 2 +- moto/instance_metadata/responses.py | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/moto/compat.py b/moto/compat.py index 2dd2d879..a92a5f67 100644 --- a/moto/compat.py +++ b/moto/compat.py @@ -3,8 +3,3 @@ try: except ImportError: # python 2.6 or earlier, use backport from ordereddict import OrderedDict # flake8: noqa - -try: - from urlparse import urlparse # flake8: noqa -except ImportError: - from urllib.parse import urlparse # flake8: noqa diff --git a/moto/emr/responses.py b/moto/emr/responses.py index 91dc8cc1..3919d8b3 100644 --- a/moto/emr/responses.py +++ b/moto/emr/responses.py @@ -6,7 +6,7 @@ from functools import wraps import pytz -from moto.compat import urlparse +from six.moves.urllib.parse import urlparse from moto.core.responses import AWSServiceSpec from moto.core.responses import BaseResponse from moto.core.responses import xml_to_json_response diff --git a/moto/instance_metadata/responses.py b/moto/instance_metadata/responses.py index 2ea9aa9a..460e65ac 100644 --- a/moto/instance_metadata/responses.py +++ b/moto/instance_metadata/responses.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals import datetime import json -from urlparse import urlparse +from six.moves.urllib.parse import urlparse from moto.core.responses import BaseResponse