Fix Punycode and Normal Text conversion.

Author: ip2whois

README.md

@@ -37,7 +37,7 @@ ip2whois_init = ip2whois.Api('YOUR_API_KEY')
 
 
 # Convert normal text to punycode
-result = ip2whois_init.getPunycode('xn--tst-qla.de')
+result = ip2whois_init.getPunycode('täst.de')
 print(result)
 ```
 
@@ -51,7 +51,7 @@ ip2whois_init = ip2whois.Api('YOUR_API_KEY')
 
 
 # Convert punycode to normal text
-result = ip2whois_init.getNormalText('täst.de')
+result = ip2whois_init.getNormalText('xn--tst-qla.de')
 print(result)
 ```
 

example.py

@@ -8,9 +8,9 @@
 print(results)
 
 # Convert normal text to punycode
-result = ip2whois_init.getPunycode('xn--tst-qla.de')
+result = ip2whois_init.getPunycode('täst.de')
 print(result)
 
 # Convert punycode to normal text
-result = ip2whois_init.getNormalText('täst.de')
+result = ip2whois_init.getNormalText('xn--tst-qla.de')
 print(result)

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="IP2WHOIS",
-    version="2.0.0",
+    version="2.1.0",
     author="IP2WHOIS",
     author_email="support@ip2whois.com",
     description="IP2WHOIS Python SDK to help user to check WHOIS information for a particular domain.",

src/ip2whois/api.py

@@ -48,16 +48,16 @@ def lookup(self, domain = ''):
              return None
 
     def getPunycode(self, domain = ''):
-         if sys.version < '3':
-            converted_result = unicode(domain if domain else '').encode('ascii').decode('idna')
+        domain = domain if domain else ''
+        if sys.version < '3':
+            converted_result = domain.encode('idna').decode('ascii')
             return converted_result.encode('utf-8')
-         else:
-            return domain.encode('ascii').decode('idna')
+        else:
+            return domain.encode('idna').decode('ascii')
 
     def getNormalText(self, domain = ''):
-        domain = domain if domain else ''
          if sys.version < '3':
-            converted_result = domain.encode('idna').decode('ascii')
+            converted_result = unicode(domain if domain else '').encode('ascii').decode('idna')
             return converted_result.encode('utf-8')
          else:
-            return domain.encode('idna').decode('ascii')
+            return domain.encode('ascii').decode('idna')

tests/test_api.py

@@ -36,10 +36,10 @@ def test_function_exist(global_data):
 
 def test_get_puny_code(global_data):
     ip2whois_init = ip2whois.Api(global_data["apikey"])
-    result = ip2whois_init.getPunycode('xn--tst-qla.de')
-    assert result == "täst.de"
+    result = ip2whois_init.getPunycode('täst.de')
+    assert result == "xn--tst-qla.de"
 
 def test_get_normal_text(global_data):
     ip2whois_init = ip2whois.Api(global_data["apikey"])
-    result = ip2whois_init.getNormalText('täst.de')
-    assert result == "xn--tst-qla.de"
+    result = ip2whois_init.getNormalText('xn--tst-qla.de')
+    assert result == "täst.de"