openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Use six to import things from urllib"

Browse Source
This commit is contained in:
Zuul
2018-04-11 17:28:09 +00:00
committed by Gerrit Code Review
parent 852ca96e9e 2fd5bcc7e2
commit e32c3da3ff
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tripleoclient/v1/undercloud_deploy.py
View File

@@ -30,21 +30,13 @@ import time
import traceback import traceback
import yaml import yaml
try:
from urllib2 import HTTPError
from urllib2 import URLError
from urllib2 import urlopen
except ImportError:
# python3
from urllib.error import HTTPError
from urllib.error import URLError
from urllib.request import urlopen
from cliff import command from cliff import command
from heatclient.common import event_utils from heatclient.common import event_utils
from heatclient.common import template_utils from heatclient.common import template_utils
from openstackclient.i18n import _ from openstackclient.i18n import _
from six.moves import configparser from six.moves import configparser
from six.moves.urllib import error as url_error
from six.moves.urllib import request
from tripleoclient import constants from tripleoclient import constants
from tripleoclient import exceptions from tripleoclient import exceptions
@@ -102,12 +94,12 @@ class DeployUndercloud(command.Command):
time.sleep(1) time.sleep(1)
count += 1 count += 1
try: try:
urlopen("http://127.0.0.1:%s/" % api_port, timeout=1) request.urlopen("http://127.0.0.1:%s/" % api_port, timeout=1)
except HTTPError as he: except url_error.HTTPError as he:
if he.code == 300: if he.code == 300:
return True return True
pass pass
except URLError: except url_error.URLError:
pass pass
return False return False