Add python3-compat boilerplate to all .py files in lib/ansible

.travis.yml

@@ -22,6 +22,8 @@ install:
 script:
 # urllib2's defaults are not secure enough for us
 - ./test/code-smell/replace-urlopen.sh .
+- ./test/code-smell/use-compat-six.sh .
+- ./test/code-smell/boilerplate.sh .
 - if test x"$TOXENV" != x'py24' ; then tox ; fi
 - if test x"$TOXENV" = x'py24' ; then python2.4 -V && python2.4 -m compileall -fq -x 'module_utils/(a10|rax|openstack|ec2|gce).py' lib/ansible/module_utils ; fi
   #- make -C docsite all

bin/ansible

@@ -18,7 +18,7 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################
-from __future__ import (absolute_import, print_function)
+from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 __requires__ = ['ansible']

lib/ansible/__init__.py

@@ -14,5 +14,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 __version__ = '2.0.0'
 __author__  = 'Ansible, Inc.'

lib/ansible/cli/adhoc.py

@@ -15,6 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 ########################################################
 from ansible import constants as C
 from ansible.cli import CLI

lib/ansible/cli/doc.py

@@ -16,6 +16,9 @@
 # ansible-vault is a script that encrypts/decrypts YAML files. See
 # http://docs.ansible.com/playbooks_vault.html for more details.
 
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import fcntl
 import datetime
 import os

lib/ansible/cli/galaxy.py

@@ -19,6 +19,9 @@
 #
 ########################################################################
 
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import os
 import os.path
 import sys

lib/ansible/cli/playbook.py

@@ -18,6 +18,10 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import os
 import stat
 

lib/ansible/cli/pull.py

@@ -15,6 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 ########################################################
 import datetime
 import os

lib/ansible/cli/vault.py

@@ -16,6 +16,9 @@
 # ansible-vault is a script that encrypts/decrypts YAML files. See
 # http://docs.ansible.com/playbooks_vault.html for more details.
 
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import os
 import sys
 import traceback

lib/ansible/constants.py

@@ -16,7 +16,7 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 # Make coding more python3-ish
-from __future__ import (absolute_import, division)
+from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 import os

lib/ansible/galaxy/__init__.py

@@ -20,6 +20,9 @@
 ########################################################################
 ''' This manages remote shared Ansible objects, mainly roles'''
 
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import os
 
 from ansible.compat.six import string_types

lib/ansible/galaxy/api.py

@@ -20,6 +20,10 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 ########################################################################
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import json
 from urllib2 import quote as urlquote, HTTPError
 from urlparse import urlparse

lib/ansible/galaxy/role.py

@@ -19,6 +19,9 @@
 #
 ########################################################################
 
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import datetime
 import os
 import tarfile

lib/ansible/inventory/vars_plugins/__init__.py

@@ -0,0 +1,4 @@
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+

lib/ansible/plugins/cache/jsonfile.py

@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import os
 import time
 import errno

lib/ansible/plugins/callback/__init__.py

@@ -16,7 +16,7 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 # Make coding more python3-ish
-from __future__ import (absolute_import, division)
+from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 import json

lib/ansible/plugins/callback/context_demo.py

@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 from ansible.plugins.callback import CallbackBase
 
 class CallbackModule(CallbackBase):

lib/ansible/plugins/callback/hipchat.py

@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import os
 import urllib
 

lib/ansible/plugins/callback/log_plays.py

@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import os
 import time
 import json

lib/ansible/plugins/callback/mail.py

@@ -16,6 +16,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import os
 import smtplib
 import json

lib/ansible/plugins/callback/osx_say.py

@@ -16,6 +16,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import subprocess
 import os
 

lib/ansible/plugins/callback/profile_tasks.py

@@ -18,6 +18,10 @@
 # Provides per-task timing, ongoing playbook elapsed time and
 # ordered list of top 20 longest running tasks at end
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import time
 
 from ansible.plugins.callback import CallbackBase

lib/ansible/plugins/callback/syslog_json.py

@@ -1,3 +1,7 @@
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import os
 import json
 

lib/ansible/plugins/callback/timer.py

@@ -1,3 +1,7 @@
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import os
 import datetime
 from datetime import datetime, timedelta

lib/ansible/plugins/filter/__init__.py

@@ -0,0 +1,5 @@
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+

lib/ansible/plugins/filter/core.py

@@ -15,7 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 
 import sys
 import base64

lib/ansible/plugins/filter/ipaddr.py

@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 from functools import partial
 import types
 

lib/ansible/plugins/filter/mathstuff.py

@@ -15,7 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 
 import math
 import collections

lib/ansible/plugins/lookup/list.py

@@ -14,7 +14,9 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-from __future__ import (absolute_import, division)
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
 from ansible.plugins.lookup import LookupBase

lib/ansible/plugins/test/__init__.py

@@ -0,0 +1,3 @@
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type

lib/ansible/plugins/test/core.py

@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import re
 from ansible import errors
 

lib/ansible/plugins/test/files.py

@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 from os.path import isdir, isfile, isabs, exists, lexists, islink, samefile, ismount
 from ansible import errors
 

lib/ansible/utils/cmd_functions.py

@@ -14,7 +14,9 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-from __future__ import absolute_import
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import os
 import sys

lib/ansible/utils/module_docs.py

@@ -17,6 +17,10 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import os
 import sys
 import ast

lib/ansible/utils/shlex.py

@@ -15,7 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # alongwith Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import absolute_import
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
 
 import shlex
 from ansible.compat.six import PY3

lib/ansible/vars/unsafe_proxy.py

@@ -50,6 +50,9 @@
 # http://code.activestate.com/recipes/496741-object-proxying/
 # Author: Tomer Filiba
 
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 __all__ = ['UnsafeProxy', 'AnsibleUnsafe', 'wrap_var']