cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Python 3 fix for consul_io inventory (#26510)

Browse source 
* Python 3 fix for consul_io inventory

* Remove configparser CamelCase try statement

* revert to python2.6 compatible try;except

* Fix pip8 error E302
This commit is contained in:
Greg Dahlman 2017-07-20 10:35:17 -07:00 committed by Toshio Kuratomi
parent 640d057f3f
commit 1d8854b045
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
contrib/inventory/consul_io.py
View file

@ -133,7 +133,11 @@ import os
import re
import argparse
import sys
import ConfigParser
try:
import configparser
except ImportError:
import ConfigParser as configparser
def get_log_filename():
@ -421,7 +425,7 @@ class ConsulConfig(dict):
def read_settings(self):
''' Reads the settings from the consul_io.ini file (or consul.ini for backwards compatibility)'''
config = ConfigParser.SafeConfigParser()
config = configparser.SafeConfigParser()
if os.path.isfile(os.path.dirname(os.path.realpath(__file__)) + '/consul_io.ini'):
config.read(os.path.dirname(os.path.realpath(__file__)) + '/consul_io.ini')
else:
@ -469,7 +473,10 @@ class ConsulConfig(dict):
scheme = 'http'
if hasattr(self, 'url'):
from urlparse import urlparse
try:
from urlparse import urlparse
except ImportError:
from urllib.parse import urlparse
o = urlparse(self.url)
if o.hostname:
host = o.hostname