Merge lp:~allenap/maas-test/onwards-python into lp:maas-test

[Gavin Panella]

Switch to Python 3.

[Gavin Panella (allenap)]

This all went fairly smoothly. We don't have to land this now, if we're not sure we can see it through to the end (i.e. if porting the integration tests is going to be too yak-shavey), but it's interested to see nonetheless.

There were only a couple of classes of error in our Python 2 code: assuming map() returns a list, and a few comparisons between unicode and byte strings. This is quite encouraging, because they're easy things to spot and fix.

[Jeroen T. Vermeulen (jtv)]

Very encouraging — let's try not to let this bit-rot! It'd be good to know that the API client will also work with python 3 before landing though. Maybe just put TODO comments in place for the changes that can't be done in a cross-dialect form?

The letters/ascii_letters change is compatible with Python 2, as are the list comprehensions to replace map() calls, so I'd land these no-brainer changes first as a separate branch.

[lp:~allenap/maas-test/onwards-python]

23. By Gavin Panella on 2013-11-12

Merge use-system-packages.

24. By Gavin Panella on 2013-11-12

Merge trunk, fixing various things.

25. By Gavin Panella on 2013-11-13

Merge trunk, fixing many conflicts.

26. By Gavin Panella on 2013-11-13

Remove some merge artifacts.

27. By Gavin Panella on 2013-11-13

Merge trunk, resolving conflicts.

28. By Gavin Panella on 2013-11-13

Merge trunk, resolving conflicts.

29. By Gavin Panella on 2013-11-13

Merge trunk.

30. By Gavin Panella on 2013-11-14

Merge trunk.

Unmerged revisions

30. By Gavin Panella on 2013-11-14

Merge trunk.

29. By Gavin Panella on 2013-11-13

Merge trunk.

28. By Gavin Panella on 2013-11-13

Merge trunk, resolving conflicts.

27. By Gavin Panella on 2013-11-13

Merge trunk, resolving conflicts.

26. By Gavin Panella on 2013-11-13

Remove some merge artifacts.

25. By Gavin Panella on 2013-11-13

Merge trunk, fixing many conflicts.

24. By Gavin Panella on 2013-11-12

Merge trunk, fixing various things.

23. By Gavin Panella on 2013-11-12

Merge use-system-packages.

22. By Gavin Panella on 2013-11-11

Merge use-system-packages.

21. By Gavin Panella on 2013-11-11

Switch to assertRegex.

=== modified file 'Makefile'
--- Makefile	2013-11-13 18:13:00 +0000
+++ Makefile	2013-11-14 12:24:22 +0000
@@ -1,7 +1,7 @@
 # Copyright 2013 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-PYTHON := python
+PYTHON := python3
 
 define virtualenv
 virtualenv --python=$(PYTHON) --quiet

=== modified file 'maastest/__init__.py'
--- maastest/__init__.py	2013-10-31 20:15:42 +0000
+++ maastest/__init__.py	2013-11-14 12:24:22 +0000
@@ -3,12 +3,4 @@
 
 """maastest."""
 
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-__metaclass__ = type
-__all__ = [
-    ]
+__all__ = []

=== modified file 'maastest/kvmfixture.py'
--- maastest/kvmfixture.py	2013-11-14 09:03:57 +0000
+++ maastest/kvmfixture.py	2013-11-14 12:24:22 +0000
@@ -3,13 +3,6 @@
 
 """Manage a KVM machine."""
 
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-__metaclass__ = type
 __all__ = [
     "KVMFixture",
     ]

=== modified file 'maastest/main.py'
--- maastest/main.py	2013-11-14 09:03:57 +0000
+++ maastest/main.py	2013-11-14 12:24:22 +0000
@@ -3,13 +3,6 @@
 
 """Test whether or not a node is compatible with MAAS."""
 
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-__metaclass__ = type
 __all__ = [
     "main",
     ]

=== modified file 'maastest/prepare.py'
--- maastest/prepare.py	2013-11-14 03:41:14 +0000
+++ maastest/prepare.py	2013-11-14 12:24:22 +0000
@@ -3,15 +3,6 @@
 
 """Helpers for setting up MAAS in a virtual machine."""
 
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-str = None
-
-__metaclass__ = type
 __all__ = [
     'determine_vm_series',
     'determine_vm_architecture',

=== modified file 'maastest/tests/test_kvmfixture.py'
--- maastest/tests/test_kvmfixture.py	2013-11-14 09:03:57 +0000
+++ maastest/tests/test_kvmfixture.py	2013-11-14 12:24:22 +0000
@@ -3,13 +3,6 @@
 
 """Tests for `maastest.kvmfixture`."""
 
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-__metaclass__ = type
 __all__ = []
 
 from datetime import timedelta
@@ -282,7 +275,7 @@
         earlier_fixture.generate_ssh_key()
 
         # We decode the file contents here to work around bug #1250483
-        # in FileContains later. This is for Python 3 compatibility.
+        # in FileContains later.
         earlier_private_key_contents = read_file(
             earlier_fixture.ssh_private_key_file).decode("ascii")
         earlier_public_key_contents = read_file(

=== modified file 'maastest/tests/test_main.py'
--- maastest/tests/test_main.py	2013-11-08 15:33:37 +0000
+++ maastest/tests/test_main.py	2013-11-14 12:24:22 +0000
@@ -3,13 +3,6 @@
 
 """Tests for `maastest.main`."""
 
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-__metaclass__ = type
 __all__ = []
 
 import testtools

=== modified file 'maastest/tests/test_prepare.py'
--- maastest/tests/test_prepare.py	2013-11-14 03:41:14 +0000
+++ maastest/tests/test_prepare.py	2013-11-14 12:24:22 +0000
@@ -3,15 +3,6 @@
 
 """Tests for the "prepare" command."""
 
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-str = None
-
-__metaclass__ = type
 __all__ = []
 
 import platform

=== modified file 'maastest/tests/test_utils.py'
--- maastest/tests/test_utils.py	2013-11-13 16:46:27 +0000
+++ maastest/tests/test_utils.py	2013-11-14 12:24:22 +0000
@@ -3,13 +3,6 @@
 
 """Tests for `maastest.utils`."""
 
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-__metaclass__ = type
 __all__ = []
 
 import os.path

=== modified file 'maastest/utils.py'
--- maastest/utils.py	2013-11-13 11:32:38 +0000
+++ maastest/utils.py	2013-11-14 12:24:22 +0000
@@ -3,13 +3,6 @@
 
 """maas-test utilities."""
 
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-__metaclass__ = type
 __all__ = [
     "BINARY",
     "binary_content",

=== modified file 'setup.py'
--- setup.py	2013-11-13 18:14:48 +0000
+++ setup.py	2013-11-14 12:24:22 +0000
@@ -4,14 +4,6 @@
 
 """Distutils installer for maas-test."""
 
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-__metaclass__ = type
-
 from setuptools import setup
 import six