Merge pull request #8 from ziadsawalha/py33

Python 3.x Compatiblity

requirements.txt

@@ -2,3 +2,4 @@ pbr>=0.5.21,<1.0
 python-novaclient==2.15.0
 tldextract
 pythonwhois
+six==1.5.2

satori/discovery.py

@@ -27,6 +27,7 @@ Example usage:
 from __future__ import print_function
 
 from novaclient.v1_1 import client
+import six
 
 from satori import dns
 
@@ -62,7 +63,7 @@ def find_nova_host(address, config):
                          region_name=config.region,
                          service_type="compute")
     for server in nova.servers.list():
-        for network_addresses in server.addresses.itervalues():
+        for network_addresses in six.itervalues(server.addresses):
             for ipaddress in network_addresses:
                 if ipaddress['addr'] == address:
                     return server

satori/dns.py

@@ -15,8 +15,8 @@
 import datetime
 import logging
 import socket
-import urlparse
 
+from six.moves.urllib import parse as urlparse
 import pythonwhois
 import tldextract
 

satori/shell.py

@@ -26,6 +26,8 @@ import argparse
 import os
 import sys
 
+import six
+
 from satori import discovery
 
 
@@ -137,7 +139,7 @@ def output_results(discovered_target, results):
 
         print(u"\tip-addresses:")
         addresses = host.get('addresses') or {}
-        for name, address_list in addresses.iteritems():
+        for name, address_list in six.iteritems(addresses):
             print(u"\t\t%s:" % name)
             for server_address in address_list:
                 print(u"\t\t\t%s:" % server_address['addr'])