add 26 and 27 to tox.ini, fix things missed by pasteurize

Author: Elias Nygren

requirements.txt

@@ -1,6 +1,8 @@
+future==0.14.3
 mock==1.0.1
 py==1.4.26
 pytest==2.6.4
 requests==2.6.0
 responses==0.3.0
 six==1.9.0
+wheel==0.24.0

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py32, py33, py34, py35, pypy3
+envlist = py26, py27, py32, py33, py34, py35, pypy3
 
 [testenv]
 commands = py.test test/

upcloud/base.py

@@ -20,7 +20,7 @@ def __init__(self, token):
 	Handles errors with __error_middleware.
 	"""
 	def request(self, method, endpoint, body=None):
-		if(method not in {"GET", "POST", "PUT", "DELETE"}):
+		if(method not in set(["GET", "POST", "PUT", "DELETE"])):
 			raise Exception("Invalid/Forbidden HTTP method")
 
 		url = "/" + self.api_v + endpoint

upcloud/cloud_manager/ip_address_mixin.py

@@ -4,7 +4,7 @@
 from __future__ import absolute_import
 from future import standard_library
 standard_library.install_aliases()
-from builtins import object
+from builtins import object, str
 from ..ip_address import IP_address
 
 class IPManager(object):