Merge pull request ansible#10687 from ianzd/devel

Several more changes to support python3 syntax.
pva · Apr 13, 2015 · 4bbca92 · 4bbca92
2 parents 483c8d3 + 1bdf0bb
commit 4bbca92
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/v2/ansible/plugins/action/__init__.py b/v2/ansible/plugins/action/__init__.py
@@ -19,7 +19,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-import StringIO
+from six.moves import StringIO
 import json
 import os
 import random

diff --git a/v2/ansible/plugins/lookup/password.py b/v2/ansible/plugins/lookup/password.py
@@ -98,7 +98,7 @@ def run(self, terms, variables, **kwargs):
                 pathdir = os.path.dirname(path)
                 if not os.path.isdir(pathdir):
                     try:
-                        os.makedirs(pathdir, mode=0700)
+                        os.makedirs(pathdir, mode=0o700)
                     except OSError as e:
                         raise AnsibleError("cannot create the path for the password lookup: %s (error was %s)" % (pathdir, str(e)))
 
@@ -111,7 +111,7 @@ def run(self, terms, variables, **kwargs):
                 else:
                     content = password
                 with open(path, 'w') as f:
-                    os.chmod(path, 0600)
+                    os.chmod(path, 0o600)
                     f.write(content + '\n')
             else:
                 content = open(path).read().rstrip()
@@ -129,12 +129,12 @@ def run(self, terms, variables, **kwargs):
                     salt = self.random_salt()
                     content = '%s salt=%s' % (password, salt)
                     with open(path, 'w') as f:
-                        os.chmod(path, 0600)
+                        os.chmod(path, 0o600)
                         f.write(content + '\n')
                 # crypt not requested, remove salt if present
                 elif (encrypt is None and salt):
                     with open(path, 'w') as f:
-                        os.chmod(path, 0600)
+                        os.chmod(path, 0o600)
                         f.write(password + '\n')
 
             if encrypt: