Python3 compatibility for osa-filters
The urlparse module is renamed to urllib.parse in Python3. Change-Id: I3dceb2f87e5e0469ab705866163225601686a0af Implements: blueprint goal-python35
This commit is contained in:
parent
36ff6fb6da
commit
057ed9a808
@ -18,10 +18,13 @@ import hashlib
|
||||
import logging
|
||||
import os
|
||||
import re
|
||||
import urlparse
|
||||
|
||||
from ansible import errors
|
||||
from jinja2.runtime import Undefined
|
||||
try:
|
||||
from urllib.parse import urlparse
|
||||
except ImportError:
|
||||
from urlparse import urlparse
|
||||
|
||||
"""Filter usage:
|
||||
|
||||
@ -161,7 +164,7 @@ def get_netloc(url):
|
||||
:returns: ``str``
|
||||
"""
|
||||
try:
|
||||
netloc = urlparse.urlparse(url).netloc
|
||||
netloc = urlparse(url).netloc
|
||||
except Exception as exp:
|
||||
raise errors.AnsibleFilterError(
|
||||
'Failed to return the netloc of: "%s"' % str(exp)
|
||||
@ -194,7 +197,7 @@ def get_netorigin(url):
|
||||
:returns: ``str``
|
||||
"""
|
||||
try:
|
||||
parsed_url = urlparse.urlparse(url)
|
||||
parsed_url = urlparse(url)
|
||||
netloc = parsed_url.netloc
|
||||
scheme = parsed_url.scheme
|
||||
except Exception as exp:
|
||||
|
Loading…
Reference in New Issue
Block a user