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

Backport some python3 fixes for facts

Browse source
This commit is contained in:
Toshio Kuratomi 2016-05-10 21:46:52 -07:00
parent 1c21baa706
commit e9406bcfd3
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/ansible/module_utils/facts.py
View file

@ -31,7 +31,13 @@ import struct
import datetime import datetime
import getpass import getpass
import pwd import pwd
import ConfigParser
try:
# python2
import ConfigParser as configparser
except ImportError:
# python3
import configparser
from ansible.module_utils.basic import get_all_subclasses from ansible.module_utils.basic import get_all_subclasses
# py2 vs py3; replace with six via ziploader # py2 vs py3; replace with six via ziploader
@ -40,7 +46,12 @@ try:
except ImportError: except ImportError:
from io import StringIO from io import StringIO
from string import maketrans try:
# python2
from string import maketrans
except ImportError:
# python3
maketrans = str.maketrans
try: try:
import selinux import selinux
@ -260,10 +271,10 @@ class Facts(object):
fact = json.loads(out) fact = json.loads(out)
except ValueError: except ValueError:
# load raw ini # load raw ini
cp = ConfigParser.ConfigParser() cp = configparser.ConfigParser()
try: try:
cp.readfp(StringIO(out)) cp.readfp(StringIO(out))
except ConfigParser.Error: except configparser.Error:
fact = "error loading fact - please check content" fact = "error loading fact - please check content"
else: else:
fact = {} fact = {}
@ -1176,7 +1187,8 @@ class LinuxHardware(Hardware):
sysfs_no_links = 0 sysfs_no_links = 0
try: try:
path = os.readlink(os.path.join("/sys/block/", block)) path = os.readlink(os.path.join("/sys/block/", block))
except OSError, e: except OSError:
e = sys.exc_info()[1]
if e.errno == errno.EINVAL: if e.errno == errno.EINVAL:
path = block path = block
sysfs_no_links = 1 sysfs_no_links = 1