Merge lp:~ltrager/maas/lp1604128_2.0 into lp:maas/2.0

[Lee Trager]

Work around sudden loss of pathlib.Path.path property in Python 3.5.2 release.

[Lee Trager (ltrager)]

Approved in https://code.launchpad.net/~allenap/maas/pathlib-regression--bug-1604128/+merge/300392

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~ltrager/maas/lp1604128_2.0 into lp:maas/2.0 failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com/ubuntu xenial-security InRelease [94.5 kB]
Hit:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [95.7 kB]
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/main Sources [167 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe Sources [83.4 kB]
Get:7 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/main amd64 Packages [324 kB]
Get:8 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/main Translation-en [123 kB]
Get:9 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe amd64 Packages [297 kB]
Get:10 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe Translation-en [99.8 kB]
Get:11 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/multiverse amd64 Packages [5,488 B]
Fetched 1,290 kB in 0s (2,640 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
archdetect-deb is already the newest version (1.117ubuntu2).
authbind is already the newest version (2.1.1+nmu1).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest vers...

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-07-15 17:41:27 +0000
+++ docs/changelog.rst	2016-07-18 23:46:14 +0000
@@ -21,6 +21,8 @@
 
 LP: #1598028    [2.0] Loading latest machine events can make web browser unresponsive
 
+LP: #1604128    [2.0rc2] Unable to add a public SSH Key due to lp1604147
+
 
 2.0.0 (rc2)
 ===========

=== modified file 'src/provisioningserver/refresh/tests/test_node_info_scripts.py'
--- src/provisioningserver/refresh/tests/test_node_info_scripts.py	2016-06-14 10:36:41 +0000
+++ src/provisioningserver/refresh/tests/test_node_info_scripts.py	2016-07-18 23:46:14 +0000
@@ -817,9 +817,9 @@
         script.write_text(VIRTUALITY_SCRIPT, "ascii")
         script.chmod(0o700)
         env = select_c_utf8_locale()
-        env["PATH"] = self.bindir.path
+        env["PATH"] = str(self.bindir)
         try:
-            return check_output((script.path,), stderr=STDOUT, env=env)
+            return check_output((str(script),), stderr=STDOUT, env=env)
         except CalledProcessError as error:
             self.addDetail("output", text_content(
                 error.output.decode("utf-8", "replace")))

=== modified file 'src/provisioningserver/refresh/tests/test_refresh.py'
--- src/provisioningserver/refresh/tests/test_refresh.py	2016-06-15 02:17:49 +0000
+++ src/provisioningserver/refresh/tests/test_refresh.py	2016-07-18 23:46:14 +0000
@@ -377,7 +377,7 @@
             with tempfile.TemporaryDirectory() as tmpdir:
                 tmpdir = Path(tmpdir).absolute()
                 return {
-                    entry.path for entry in tmpdir.parent.iterdir()
+                    str(entry) for entry in tmpdir.parent.iterdir()
                     if entry.is_dir() and entry != tmpdir
                 }
 

=== modified file 'src/provisioningserver/utils/sshkey.py'
--- src/provisioningserver/utils/sshkey.py	2016-06-14 15:28:01 +0000
+++ src/provisioningserver/utils/sshkey.py	2016-07-18 23:46:14 +0000
@@ -136,7 +136,7 @@
         try:
             with open(os.devnull, "r") as devnull:
                 rfc4716key = check_output(
-                    ("setsid", "-w", "ssh-keygen", "-e", "-f", keypath.path),
+                    ("setsid", "-w", "ssh-keygen", "-e", "-f", str(keypath)),
                     stdin=devnull, stderr=PIPE, env=env)
         except CalledProcessError:
             raise OpenSSHKeyError(
@@ -146,7 +146,7 @@
         try:
             with open(os.devnull, "r") as devnull:
                 opensshkey = check_output(
-                    ("setsid", "-w", "ssh-keygen", "-i", "-f", keypath.path),
+                    ("setsid", "-w", "ssh-keygen", "-i", "-f", str(keypath)),
                     stdin=devnull, stderr=PIPE, env=env)
         except CalledProcessError:
             # If this happens it /might/ be an OpenSSH bug. If we've managed