Merge lp:~chris.macnaughton/mojo/py3001 into lp:~ost-maintainers/mojo/py3

[Chris MacNaughton]

[Ryan Beisner (1chb1n)]

There are a number of print(( changes which I think can just be print(. Happy to be proven incorrect, however.

review: Needs Fixing

[lp:~chris.macnaughton/mojo/py3001]

466. By Chris MacNaughton on 2018-01-18

Remove print((

[Ryan Beisner (1chb1n)]

Ignoring existing lint issues at lp:mojo trunk, let's land this and continue to iterate/fix stuff. Thank you.

review: Approve

=== modified file 'contrib/test/utils.py'
--- contrib/test/utils.py	2017-04-26 04:00:14 +0000
+++ contrib/test/utils.py	2018-01-18 11:04:49 +0000
@@ -44,6 +44,6 @@
     """
     try:
         subprocess.check_output(['juju', 'switch'])
-    except subprocess.CalledProcessError, OSError:
+    except subprocess.CalledProcessError as OSError:
         print('Error checking active Juju controller')
         sys.exit(1)
 
=== modified file 'mojo/cli.py'
--- mojo/cli.py	2017-11-08 14:58:22 +0000
+++ mojo/cli.py	2018-01-18 11:04:49 +0000
@@ -1,6 +1,6 @@
 # Copyright 2014, 2015 Canonical Ltd.  This software is licensed under the
 # GNU General Public License version 3 (see the file LICENSE).
-from __future__ import print_function
+
 import argparse
 import errno
 import logging
@@ -256,7 +256,7 @@
 
 
 def list_projects(args):
-    map(print, mojo.project.Project.list(args.mojo_root, only_names=args.names))
+    list(map(print, mojo.project.Project.list(args.mojo_root, only_names=args.names)))
 
 
 @warn_if_root
@@ -312,7 +312,7 @@
 
 def list_workspaces(args):
     project = mojo.project.Project(get_project_name(args), args.series, args.mojo_root)
-    map(print, project.workspace_list())
+    list(map(print, project.workspace_list()))
 
 
 def new_spec(args):
 
=== modified file 'mojo/contain.py'
--- mojo/contain.py	2017-12-14 10:13:12 +0000
+++ mojo/contain.py	2018-01-18 11:04:49 +0000
@@ -173,7 +173,7 @@
         self.timeout = 60
 
     def _check_mount(self):
-        if self.device_name in self.container.devices.keys():
+        if self.device_name in list(self.container.devices.keys()):
             return True
         return False
 
 
=== modified file 'mojo/info.py'
--- mojo/info.py	2016-05-25 11:59:42 +0000
+++ mojo/info.py	2018-01-18 11:04:49 +0000
@@ -1,6 +1,6 @@
 # Copyright 2014 Canonical Ltd.  This software is licensed under the
 # GNU General Public License version 3 (see the file LICENSE).
-from __future__ import print_function
+
 from mojo.cli import MojoArgumentParser
 from mojo.juju.status import Status
 import argparse
@@ -59,7 +59,7 @@
                         prop))
     else:
         if isinstance(values, list):
-            map(print, values)
+            list(map(print, values))
         else:
             print(values)
     sys.exit(0)
 
=== modified file 'mojo/juju/__init__.py'
--- mojo/juju/__init__.py	2016-10-05 16:58:34 +0000
+++ mojo/juju/__init__.py	2018-01-18 11:04:49 +0000
@@ -1,10 +1,10 @@
 import subprocess
 
-from debuglogs import DebugLogs
-from status import JujuStatusError, version, major_version
-from wait import JujuWaitException
+from .debuglogs import DebugLogs
+from .status import JujuStatusError, version, major_version
+from .wait import JujuWaitException
 
 if major_version == 1:
-    from status import Juju1Status as Status
+    from .status import Juju1Status as Status
 elif major_version == 2:
-    from status import Juju2Status as Status
+    from .status import Juju2Status as Status
 
=== modified file 'mojo/juju/check.py'
--- mojo/juju/check.py	2016-10-25 06:49:00 +0000
+++ mojo/juju/check.py	2018-01-18 11:04:49 +0000
@@ -6,8 +6,8 @@
 import inspect
 import sys
 
-import checks
-from status import Juju2Status, JujuStatusError
+from . import checks
+from .status import Juju2Status, JujuStatusError
 
 
 def main():
@@ -25,7 +25,7 @@
         if issubclass(clsmember, checks.JujuCheck):
             available_checks[clsmember.cmd_name] = clsmember
 
-    for check in available_checks.values():
+    for check in list(available_checks.values()):
         sub = sp.add_parser(check.cmd_name, description=check.help)
         check.setup_argparse(sub)
 
 
=== modified file 'mojo/juju/parse_status.py'
--- mojo/juju/parse_status.py	2017-12-07 15:09:39 +0000
+++ mojo/juju/parse_status.py	2018-01-18 11:04:49 +0000
@@ -4,7 +4,7 @@
 import argparse
 import sys
 
-from status import Juju2Status
+from .status import Juju2Status
 
 
 class StatusInfo:
@@ -39,11 +39,11 @@
     def run(self, args):
         ips = []
         if 'all' in args.applications:
-            for machine in self.status.yaml_status()['machines'].values():
+            for machine in list(self.status.yaml_status()['machines'].values()):
                 if 'dns-name' in machine:
                     ips.append(machine['dns-name'])
                 if 'containers' in machine:
-                    for container in machine['containers'].values():
+                    for container in list(machine['containers'].values()):
                         if 'dns-name' in container:
                             ips.append(container['dns-name'])
         else:
@@ -71,7 +71,7 @@
 
     # Setup all available StatusInfo classes as subparsers
     available_info = {'get_ips': GetIPs}
-    for cmd in available_info.values():
+    for cmd in list(available_info.values()):
         sub = sp.add_parser(cmd.name, description=cmd.help)
         cmd.setup_argparse(sub)
 
 
=== modified file 'mojo/juju/status.py'
--- mojo/juju/status.py	2017-11-21 09:59:26 +0000
+++ mojo/juju/status.py	2018-01-18 11:04:49 +0000
@@ -7,7 +7,7 @@
 
 from collections import Counter
 
-from wait import wait
+from .wait import wait
 
 try:
     with open(os.devnull, 'w') as devnull:
@@ -208,7 +208,7 @@
                     ['juju', 'status', '--format=tabular']))
                 raise JujuStatusError("Timed out checking Juju status for stable state")
             stable_state = []
-            for juju_objtype, check_info in checks.iteritems():
+            for juju_objtype, check_info in checks.items():
                 for check in check_info:
                     check_function = check['check_func']
                     states = check_function()
@@ -229,7 +229,7 @@
                 break
             time.sleep(5)
             self._get_status(force_update=True)
-        for juju_objtype, check_info in checks.iteritems():
+        for juju_objtype, check_info in checks.items():
             for check in check_info:
                 check_function = check['check_func']
                 states = check_function()
@@ -266,7 +266,7 @@
     def _service_info(self, svc):
         if svc == "ALL":
             units = {}
-            for service in self.yaml_status()['services'].values():
+            for service in list(self.yaml_status()['services'].values()):
                 for unit, data in service.get('units', {}).items():
                     units[unit] = data
         elif svc not in self.yaml_status()['services']:
@@ -304,20 +304,20 @@
     def service_ips(self, service):
         units = self._service_info(service)
         if units:
-            return [u.get('public-address') for u in units.values()
+            return [u.get('public-address') for u in list(units.values())
                     if u.get('public-address')]
         return units
 
     def service_units(self, service):
         units = self._service_info(service)
         if units:
-            return units.keys()
+            return list(units.keys())
         return units
 
     def service_machine_numbers(self, service):
         units = self._service_info(service)
         if units:
-            return [u.get('machine') for u in units.values()
+            return [u.get('machine') for u in list(units.values())
                     if u.get('machine')]
         return units
 
@@ -408,18 +408,18 @@
         if units is None:
             return []
 
-        return [u.get('public-address') for u in units.values() if u.get('public-address')]
+        return [u.get('public-address') for u in list(units.values()) if u.get('public-address')]
 
     def application_machine_numbers(self, application):
         units = self._get_units(application)
         if units is None:
             return None
 
-        return [u.get('machine') for u in units.values() if u.get('machine')]
+        return [u.get('machine') for u in list(units.values()) if u.get('machine')]
 
     def applications_list(self, exclude_subordinates=True):
         applications = []
-        for app in self.yaml_status()['applications'].keys():
+        for app in list(self.yaml_status()['applications'].keys()):
             if exclude_subordinates and 'subordinate-to' in self.yaml_status()['applications'][app]:
                 continue
             applications.append(app)
@@ -431,7 +431,7 @@
         if units is None:
             return None
 
-        return units.keys()
+        return list(units.keys())
 
     def applications_ready(self):
         """ Check status of all applications, raise JujuStatusError for an error state.
 
=== modified file 'mojo/phase.py'
--- mojo/phase.py	2017-12-21 11:27:44 +0000
+++ mojo/phase.py	2018-01-18 11:04:49 +0000
@@ -1,10 +1,10 @@
 # Copyright 2014 Canonical Ltd.  This software is licensed under the
 # GNU General Public License version 3 (see the file LICENSE).
-import commands
+import subprocess
 import os
 import logging
 import subprocess
-import charm_repo
+from . import charm_repo
 import re
 import shutil
 import tempfile
@@ -476,7 +476,7 @@
     if not modified:
         return
 
-    for service, changes in modified.iteritems():
+    for service, changes in modified.items():
         deployer_config_items = changes.get('cfg-config')
         if not deployer_config_items:
             # Something differs, e.g. constraints, but not the config.
@@ -485,7 +485,7 @@
         juju_set_command = ['juju', mojo.juju.utils.get_juju_command('set'), service]
         config_changes = []
 
-        for config_item, config_value in deployer_config_items.iteritems():
+        for config_item, config_value in deployer_config_items.items():
             # At some point, "juju set" started trimming newlines,
             # which I endorse; but we may get a false positive here.
             if identical_but_wrapped_in_newlines(
@@ -616,7 +616,7 @@
         # Take in MOJO_* variables from the environment
         tmpl_vars = {}
         env = os.environ.copy()
-        for key in env.iterkeys():
+        for key in env.keys():
             if 'MOJO_' in key:
                 tmpl_vars[key] = env[key]
         # Process the deployment configs as a Jinja2 template
@@ -948,7 +948,7 @@
 
         _run = super(VerifyPhase, self).run
 
-        for i in xrange(1, retry + 1):
+        for i in range(1, retry + 1):
             if i > 1:
                 logging.info(
                     "Retrying (attempt {} of {})".format(
@@ -1057,7 +1057,7 @@
                      '[ -f ${CHARMDIR}/codetree-collect-info.yaml ] && '
                      'cat ${CHARMDIR}/codetree-collect-info.yaml| sed -e "s/^/  /" || true; done')
         cmd = ['juju', 'ssh', machine_id, "'{}'".format(audit_cmd), "2>/dev/null"]
-        status, output = commands.getstatusoutput(" ".join(cmd))
+        status, output = subprocess.getstatusoutput(" ".join(cmd))
         if status != 0:
             raise CharmAuditPhaseException("Unknown error trying to run {}: {}".format(" ".join(cmd), output))
         return output
@@ -1065,7 +1065,7 @@
     def parse_charm_audit_output(self, audit_output):
         audit_info = yaml.safe_load(audit_output)
         parsed_audit_output = {}
-        for unit in audit_info.keys():
+        for unit in list(audit_info.keys()):
             try:
                 collect_url = audit_info[unit]['collect_url']
             except KeyError:
@@ -1074,7 +1074,7 @@
             application = audit_info[unit]['application']
 
             try:
-                collect_urls = parsed_audit_output[application].keys()
+                collect_urls = list(parsed_audit_output[application].keys())
             except KeyError:
                 collect_urls = []
             finally:
@@ -1119,7 +1119,7 @@
                     "sed 's/.*/(set -x; & \&\& echo MOJO_NAGIOS_OK) || echo MOJO_NAGIOS_FAIL /'" \
                     "|sudo -u nagios -s bash".format(skip_check_command)
         cmd = ['juju', 'ssh', unit, '"{}"'.format(check_cmd), "2>/dev/null"]
-        status, output = commands.getstatusoutput(" ".join(cmd))
+        status, output = subprocess.getstatusoutput(" ".join(cmd))
         error_output, ok_output = "", ""
         if status != 0:
             if 'No such file or directory' in output or 'sudo: unknown user: nagios' in output:
 
=== modified file 'mojo/project.py'
--- mojo/project.py	2017-06-18 23:54:07 +0000
+++ mojo/project.py	2018-01-18 11:04:49 +0000
@@ -206,7 +206,7 @@
                             "project".format(self.name, self.root))
         else:
             try:
-                mkdirs(self.root, self.owner, mode=0700)
+                mkdirs(self.root, self.owner, mode=0o700)
             except OSError as e:
                 raise ProjectCreationError(
                     "Could not create project root: {}".format(e.strerror))
@@ -216,7 +216,7 @@
                             "using it.".format(self.name, self.project_series))
         else:
             try:
-                mkdirs(self.project_series, self.owner, mode=0700)
+                mkdirs(self.project_series, self.owner, mode=0o700)
             except OSError as e:
                 raise ProjectCreationError(
                     "Could not create project project_series: "
@@ -246,7 +246,7 @@
             logging.info("Checking {} project dir {} ..."
                          "".format(self.name, self.container_project_series))
             if not os.path.exists(self.container_project_series):
-                mkdirs(self.container_project_series, self.owner, mode=0700)
+                mkdirs(self.container_project_series, self.owner, mode=0o700)
 
             sudoers_file = os.path.join(self.project_container_root, "etc", "sudoers.d",
                                         "ubuntu-all")
@@ -254,7 +254,7 @@
                          self.name, sudoers_file))
             with open(sudoers_file, "w") as f:
                 f.write("ubuntu ALL=(ALL) NOPASSWD: ALL\n")
-            os.chmod(sudoers_file, 0400)
+            os.chmod(sudoers_file, 0o400)
 
         if not os.path.exists(os.path.join(self.project_series, '.project')):
             self.write_project_info()
@@ -294,19 +294,19 @@
 
         # Validate the project exists
         if self.name not in self.list(self.mojo_root, True):
-            print "Project, '{}', does not appear to exist.".format(self.name)
-            print "Please run 'mojo project-new --series {} {}' to " \
-                  "create the project.".format(self.series, self.name)
-            print "Or check the file permissions on {}".format(self.root)
+            print("Project, '{}', does not appear to exist.".format(self.name))
+            print("Please run 'mojo project-new --series {} {}' to " \
+                  "create the project.".format(self.series, self.name))
+            print("Or check the file permissions on {}".format(self.root))
             sys.exit(1)
         if not self.container.exists() or not self.container.is_setup():
-            print "The container project and series path for {} does not appear " \
-                  "to exist at {}.".format(self.name, self.container_project_series)
-            print "Check to make sure the project and series exist and " \
-                  "permissions are set properly."
-            print "Please run 'mojo project-new --series {} {}' to " \
-                  "create the project if needed.".format(self.series, self.name)
-            print "Or check the file permissions on {}".format(self.container_project_series)
+            print("The container project and series path for {} does not appear " \
+                  "to exist at {}.".format(self.name, self.container_project_series))
+            print("Check to make sure the project and series exist and " \
+                  "permissions are set properly.")
+            print("Please run 'mojo project-new --series {} {}' to " \
+                  "create the project if needed.".format(self.series, self.name))
+            print("Or check the file permissions on {}".format(self.container_project_series))
             sys.exit(1)
 
         # If we're using nested directories for specs, make sure our workspace
 
=== modified file 'mojo/project_destroy.py'
--- mojo/project_destroy.py	2016-11-21 22:15:55 +0000
+++ mojo/project_destroy.py	2018-01-18 11:04:49 +0000
@@ -1,7 +1,7 @@
 # Copyright 2015 Canonical Ltd.  This software is licensed under the
 # GNU General Public License version 3 (see the file LICENSE).
 import os
-import cli
+from . import cli
 from .utils import setup_logging
 
 
 
=== modified file 'mojo/project_new.py'
--- mojo/project_new.py	2016-11-25 17:27:11 +0000
+++ mojo/project_new.py	2018-01-18 11:04:49 +0000
@@ -1,7 +1,7 @@
 # Copyright 2015 Canonical Ltd.  This software is licensed under the
 # GNU General Public License version 3 (see the file LICENSE).
 import os
-import cli
+from . import cli
 from .utils import setup_logging
 
 
 
=== modified file 'mojo/tests/test_debuglogs.py'
--- mojo/tests/test_debuglogs.py	2017-01-11 14:24:11 +0000
+++ mojo/tests/test_debuglogs.py	2018-01-18 11:04:49 +0000
@@ -19,7 +19,7 @@
     @mock.patch('subprocess.check_output')
     def test__resolve_remote_paths(self, _check_output):
         """Test _resolve_remote_paths"""
-        _check_output.return_value = u"['/etc/init.d/apache2']"
+        _check_output.return_value = "['/etc/init.d/apache2']"
         ws = None
         debug_logs = DebugLogs(ws, "production", None, None)
         self.assertEqual(debug_logs._resolve_remote_paths('apache2/0', '/etc/init.d/apache2'),
 
=== modified file 'mojo/tests/test_juju2.py'
--- mojo/tests/test_juju2.py	2017-12-08 10:58:48 +0000
+++ mojo/tests/test_juju2.py	2018-01-18 11:04:49 +0000
@@ -2,7 +2,7 @@
 # GNU General Public License version 3 (see the file LICENSE).
 import mock
 import os
-from StringIO import StringIO
+from io import StringIO
 import sys
 from unittest import TestCase
 
 
=== modified file 'mojo/tests/test_mojo.py'
--- mojo/tests/test_mojo.py	2017-05-11 01:27:01 +0000
+++ mojo/tests/test_mojo.py	2018-01-18 11:04:49 +0000
@@ -5,7 +5,7 @@
 from tempfile import mkdtemp
 from shutil import rmtree
 import subprocess
-import commands
+import subprocess
 import os
 import sys
 import time
@@ -260,7 +260,7 @@
                 ]
         for cmd in cmds:
             bc_status, bc_output = mojo.utils.bicommand(cmd)
-            c_status, c_output = commands.getstatusoutput(cmd)
+            c_status, c_output = subprocess.getstatusoutput(cmd)
 
             # We don't care about return codes, we just want to confirm they're
             # both returning zero or non-zero
 
=== modified file 'mojo/tests/utils.py'
--- mojo/tests/utils.py	2017-04-19 02:09:34 +0000
+++ mojo/tests/utils.py	2018-01-18 11:04:49 +0000
@@ -43,7 +43,7 @@
         with open(os.path.join(directory, manifest_path), 'w+') as fp:
             fp.write(content)
 
-    filenames = list(filenames) + manifests.keys()
+    filenames = list(filenames) + list(manifests.keys())
 
     with mojo.utils.chdir(directory):
         for filename in filenames:
 
=== modified file 'mojo/volattach.py'
--- mojo/volattach.py	2016-09-21 17:00:41 +0000
+++ mojo/volattach.py	2018-01-18 11:04:49 +0000
@@ -1,7 +1,7 @@
 # Copyright 2014 Canonical Ltd.  This software is licensed under the
 # GNU General Public License version 3 (see the file LICENSE).
 """A helper for attaching volumes to Juju instances"""
-from __future__ import print_function
+
 from subprocess import check_call
 import os
 import sys
@@ -132,7 +132,7 @@
         for volume_id in [v for (v, u) in unit_map.items() if u is None]:
             if status.service_units(service):
                 units = [u for u in status.service_units(service)
-                         if u not in unit_map.values()]
+                         if u not in list(unit_map.values())]
             else:
                 raise VolumeConfigError("No service {} found".format(service))
             if units:
 
=== modified file 'mojo/workspace.py'
--- mojo/workspace.py	2016-02-05 23:40:05 +0000
+++ mojo/workspace.py	2018-01-18 11:04:49 +0000
@@ -61,7 +61,7 @@
 
     def clean(self):
         "Reset the workspace"
-        map(shutil.rmtree, (d for d in self.all_dirs if os.path.exists(d)))
+        list(map(shutil.rmtree, (d for d in self.all_dirs if os.path.exists(d))))
         return self.prepare()
 
     def delete(self):
 
=== modified file 'tox.ini'
--- tox.ini	2018-01-18 10:03:30 +0000
+++ tox.ini	2018-01-18 11:04:49 +0000
@@ -13,5 +13,5 @@
 [testenv:mojo_exec]
 basepython = python3
 deps = -r{toxinidir}/requirements.txt
-commands = pip install .
+commands = pip install --upgrade .
            mojo --version