From b90bb167e0bf11990ac0431c7703296646c37f88 Mon Sep 17 00:00:00 2001
From: brandonzhao <zhaolong@inspur.com>
Date: Fri, 26 Oct 2018 11:04:07 +0800
Subject: [PATCH] Fix the conflict of urlparse between python2 and python3

Change-Id: I47d7a524afaa3ae74b7c6c2931d8ebb89438c508
---
 integration/tests/examples/examples/client.py             | 2 +-
 integration/tests/examples/examples/example_generation.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/integration/tests/examples/examples/client.py b/integration/tests/examples/examples/client.py
index c044c1371c..4b18b0a7a7 100644
--- a/integration/tests/examples/examples/client.py
+++ b/integration/tests/examples/examples/client.py
@@ -1,7 +1,7 @@
 import json
 import os
 import re
-from urlparse import urlparse
+from six.moves.urllib.parse import urlparse
 import xml.dom.minidom
 
 from proboscis.asserts import *
diff --git a/integration/tests/examples/examples/example_generation.py b/integration/tests/examples/examples/example_generation.py
index eccd1eea86..d4422cdc01 100644
--- a/integration/tests/examples/examples/example_generation.py
+++ b/integration/tests/examples/examples/example_generation.py
@@ -5,7 +5,7 @@ import re
 import six
 import sys
 import time
-from urlparse import urlparse
+from six.moves.urllib.parse import urlparse
 import xml.dom.minidom
 
 from proboscis import before_class