Skip to content

refactor: Adding python3.x compatibility #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Azraeht wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: Adding python3.x compatibility #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions chef_inventory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
import sys
import re
from time import time
import ConfigParser
from six import iteritems
try:
import configparser
except ImportError:
import ConfigParser as configparser

try:
import json
Expand Down Expand Up @@ -55,7 +59,7 @@ def __init__(self):
sys.exit(1)

def read_settings(self):
config = ConfigParser.SafeConfigParser()
config = configparser.ConfigParser()
chef_default_ini_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'chef.ini')
chef_ini_path = os.environ.get('CHEF_INI_PATH', chef_default_ini_path)
config.read(chef_ini_path)
Expand Down Expand Up @@ -137,7 +141,7 @@ def list_nodes(self):
hostvars = {}

data = self.read_cache()
for name, node in data.iteritems():
for name, node in iteritems(data):
# make sure node is configured/working
if ( "ipaddress" in node["automatic"].keys() ):
if name not in hostvars:
Expand Down Expand Up @@ -180,7 +184,7 @@ def list_nodes(self):
groups[item].append(name)

# remove any duplicates
groups = {key : list(set(items)) for (key, items) in groups.iteritems() }
groups = {key : list(set(items)) for (key, items) in iteritems(groups)}

meta = { "_meta" : { "hostvars" : hostvars } }
groups.update(meta)
Expand Down