Merge pull request #36 from bhipple/py3/list

py3 prep: foo.values() does not return an indexable list

tests/functional/test_backups.py

@@ -2,7 +2,6 @@
 
 from os import path
 
-from nose import tools
 
 from tests.functional import generic_deployment_test
 
@@ -65,5 +64,5 @@ def backup_and_restore_path(self, path=""):
 
  def check_command(self, command):
  self.depl.evaluate()
- machine = self.depl.machines.values()[0]
+ machine = list(self.depl.machines.values())[0]
  return machine.run_command(command)

tests/functional/test_deploys_spot_instance.py

@@ -1,4 +1,3 @@
-from nose import tools
 from tests.functional import single_machine_test
 from os import path
 

tests/functional/test_ec2_rds_dbinstance.py

@@ -1,6 +1,5 @@
 from os import path
 
-from nose import tools
 
 from tests.functional import generic_deployment_test
 

tests/functional/test_ec2_with_nvme_device_mapping.py

@@ -1,6 +1,5 @@
 from os import path
 
-from nose import tools
 
 from tests.functional import generic_deployment_test
 
@@ -27,5 +26,5 @@ def test_ec2_with_nvme_device_mapping(self):
 
  def check_command(self, command):
  self.depl.evaluate()
- machine = self.depl.machines.values()[0]
+ machine = list(self.depl.machines.values())[0]
  return machine.run_command(command)

tests/functional/vpc.py

@@ -2,10 +2,8 @@
 import tempfile
 
 from nose import tools
-from nose.plugins.attrib import attr
-import boto3
 
-from nixops.nix_expr import RawValue, Function, Call, py2nix
+from nixops.nix_expr import py2nix
 import nixops.util
 from tests.functional import generic_deployment_test