diff options
| author | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-09-08 18:46:12 +0200 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-09-08 18:46:12 +0200 |
| commit | c1039de70c737cd85f0b76d015e73f633f7a1095 (patch) | |
| tree | ee63c4fc90dae8824541e62556511888c6a4cd8f /contrib | |
| parent | Use UnsafeProxy for lookup results too (diff) | |
| download | ansible-c1039de70c737cd85f0b76d015e73f633f7a1095.tar.xz ansible-c1039de70c737cd85f0b76d015e73f633f7a1095.zip | |
Compatibility with six-1.3.0
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/inventory/ec2.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/inventory/ec2.py b/contrib/inventory/ec2.py index e4b0b072d4..7ed9b83e77 100755 --- a/contrib/inventory/ec2.py +++ b/contrib/inventory/ec2.py @@ -187,10 +187,10 @@ class Ec2Inventory(object): def read_settings(self): ''' Reads the settings from the ec2.ini file ''' - if six.PY2: - config = configparser.SafeConfigParser() - else: + if six.PY3: config = configparser.ConfigParser() + else: + config = configparser.SafeConfigParser() ec2_default_ini_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'ec2.ini') ec2_ini_path = os.path.expanduser(os.path.expandvars(os.environ.get('EC2_INI_PATH', ec2_default_ini_path))) config.read(ec2_ini_path) |