Compatibility with six-1.3.0

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)

test/units/parsing/test_data_loader.py

@@ -19,7 +19,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from six import PY2
+from six import PY3
 from yaml.scanner import ScannerError
 
 from ansible.compat.tests import unittest
@@ -81,10 +81,10 @@ class TestDataLoaderWithVault(unittest.TestCase):
 3135306561356164310a343937653834643433343734653137383339323330626437313562306630
 3035
 """
-        if PY2:
-            builtins_name = '__builtin__'
-        else:
+        if PY3:
             builtins_name = 'builtins'
+        else:
+            builtins_name = '__builtin__'
 
         with patch(builtins_name + '.open', mock_open(read_data=vaulted_data)):
             output = self._loader.load_from_file('dummy_vault.txt')