python2to3

Author: Hongyi Bian

apikey/python/whois.py

@@ -1,4 +1,5 @@
-import urllib
+import urllib.parse
+import urllib.request
 import json
 import base64
 import hmac
@@ -21,7 +22,7 @@
 def generateDigest(username, timestamp, apikey, secret):
     digest = username + str(timestamp) + apikey
     hash = hmac.new(secret, digest, hashlib.md5)
-    return urllib.quote(str(hash.hexdigest()))
+    return urllib.parse.quote(str(hash.hexdigest()))
 
 def generateParameters(username, apikey, secret):
     timestamp = int(round(time.time() * 1000))
@@ -45,18 +46,18 @@ def printResponse(response):
     responseJson = json.loads(response)
     if 'WhoisRecord' in responseJson:
         if 'contactEmail' in responseJson['WhoisRecord']:
-            print "Contact Email: "
-            print responseJson['WhoisRecord']['contactEmail']
+            print ("Contact Email: ")
+            print (responseJson['WhoisRecord']['contactEmail'])
         if 'createdDate' in responseJson['WhoisRecord']:
-            print "Created date: "
-            print responseJson['WhoisRecord']['createdDate']
+            print ("Created date: ")
+            print (responseJson['WhoisRecord']['createdDate'])
         if 'expiresDate' in responseJson['WhoisRecord']:
-            print "Expires date: "
-            print responseJson['WhoisRecord']['expiresDate']
+            print ("Expires date: ")
+            print (responseJson['WhoisRecord']['expiresDate'])
 
 def request(url, username, timestamp, digest, domain):
     request = buildRequest(username, timestamp, digest, domain)
-    response = urllib.urlopen(url + request).read().decode('utf8')
+    response = urllib.request.urlopen(url + request).read().decode('utf8')
     return response
 
 timestamp, digest = generateParameters(username, apiKey, secret)
@@ -67,4 +68,4 @@ def request(url, username, timestamp, digest, domain):
         timestamp, digest = generateParameters(username, apiKey, secret)
         response = request(url, username, timestamp, digest, domain)
     printResponse(response)
-    print "---------------------------\n"
+    print ("---------------------------\n")