openstack
/
oslo-incubator
Code Issues Proposed changes

Remove import workaround of SplitResult 

six 1.6.0 includes fix for SplitResult, we can remove the
workaround now.

Change-Id: I79aa154bac7e23e18ac63190f031cc937573e8ee
This commit is contained in:
ChangBo Guo(gcb) 2014-04-21 10:27:27 +08:00
parent 340b33a29e
commit 162e850422
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openstack/common/network_utils.py
View File

@ -17,16 +17,6 @@
Network-related utilities and helper functions.
"""
# TODO(jd) Use six.moves once
# https://bitbucket.org/gutworth/six/pull-request/28
# is merged
try:
import urllib.parse
SplitResult = urllib.parse.SplitResult
except ImportError:
import urlparse
SplitResult = urlparse.SplitResult
from six.moves.urllib import parse
@ -74,7 +64,7 @@ def parse_host_port(address, default_port=None):
return (host, None if port is None else int(port))
class ModifiedSplitResult(SplitResult):
class ModifiedSplitResult(parse.SplitResult):
"""Split results class for urlsplit."""
# NOTE(dims): The functions below are needed for Python 2.6.x.