diff options
| author | Barry Warsaw <barry@python.org> | 2015-01-26 12:41:04 -0500 |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2015-01-26 12:41:04 -0500 |
| commit | 926a3df79a10ede61967c60f48ff0670a36e689a (patch) | |
| tree | c43e2abc22d088ab7a19bb968c9392ebe5a110d3 | |
| parent | e085d5cec212757e0ffffaa1be470e315142a2aa (diff) | |
| download | vyos-cloud-init-926a3df79a10ede61967c60f48ff0670a36e689a.tar.gz vyos-cloud-init-926a3df79a10ede61967c60f48ff0670a36e689a.zip | |
More Python 3 test fixes.
| -rw-r--r-- | cloudinit/config/cc_write_files.py | 5 | ||||
| -rw-r--r-- | tests/unittests/test_datasource/test_opennebula.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cloudinit/config/cc_write_files.py b/cloudinit/config/cc_write_files.py index a73d6f4e..4b03ea91 100644 --- a/cloudinit/config/cc_write_files.py +++ b/cloudinit/config/cc_write_files.py @@ -18,6 +18,7 @@ import base64 import os +import six from cloudinit.settings import PER_INSTANCE from cloudinit import util @@ -25,7 +26,7 @@ from cloudinit import util frequency = PER_INSTANCE DEFAULT_OWNER = "root:root" -DEFAULT_PERMS = 0644 +DEFAULT_PERMS = 0o644 UNKNOWN_ENC = 'text/plain' @@ -79,7 +80,7 @@ def write_files(name, files, log): def decode_perms(perm, default, log): try: - if isinstance(perm, (int, long, float)): + if isinstance(perm, six.integer_types + (float,)): # Just 'downcast' it (if a float) return int(perm) else: diff --git a/tests/unittests/test_datasource/test_opennebula.py b/tests/unittests/test_datasource/test_opennebula.py index 1a8d2122..31c6232f 100644 --- a/tests/unittests/test_datasource/test_opennebula.py +++ b/tests/unittests/test_datasource/test_opennebula.py @@ -33,7 +33,7 @@ TEST_VARS = { } INVALID_CONTEXT = ';' -USER_DATA = '#cloud-config\napt_upgrade: true' +USER_DATA = b'#cloud-config\napt_upgrade: true' SSH_KEY = 'ssh-rsa AAAAB3NzaC1....sIkJhq8wdX+4I3A4cYbYP ubuntu@server-460-%i' HOSTNAME = 'foo.example.com' PUBLIC_IP = '10.0.0.3' |