Fix error handling and update version number

Author: artemlos

licensing/methods.py

@@ -47,7 +47,7 @@ def activate(token, rsa_pub_key, product_id, key, machine_code, fields_to_return
 
         pubkey = RSAPublicKey.from_string(rsa_pub_key)
 
-        if response.result == "1":
+        if response.result == 1:
             return (None, response.message)
         else:
             try:

licensing/models.py

@@ -138,7 +138,27 @@ def __init__(self, license_key, signature, result, message):
 
     def from_string(responseString):        
         obj = json.loads(responseString)
-        return Response(obj["licenseKey"], obj["signature"], obj["result"],obj["message"])
+        
+        licenseKey = ""
+        signature = ""
+        result = ""
+        message = ""
+        
+        if "licenseKey" in obj:
+            licenseKey = obj["licenseKey"]
+            
+        if "signature" in obj:
+            signature = obj["signature"]
+        
+        if "message" in obj:
+            message = obj["message"]
+            
+        if "result" in obj:
+            result = obj["result"]
+        else:
+            result = 1
+        
+        return Response(licenseKey, signature, result, message)
 
 class RSAPublicKey:
 

setup.py

@@ -2,13 +2,13 @@
 setup(
   name = 'licensing',         # How you named your package folder (MyLib)
   packages = ['licensing'],   # Chose the same as "name"
-  version = '0.6',      # Start with a small number and increase it with every change you make
+  version = '0.7',      # Start with a small number and increase it with every change you make
   license='MIT',        # Chose a license from here: https://help.github.com/articles/licensing-a-repository
   description = 'Client library for Cryptolens licensing Web API.',   # Give a short description about your library
   author = 'Cryptolens AB',                   # Type in your name
   author_email = '[email protected]',      # Type in your E-Mail
   url = 'https://cryptolens.io',   # Provide either the link to your github or to your website
-  download_url = 'https://github.com/Cryptolens/cryptolens-python/archive/v_06.tar.gz',    # I explain this later on
+  download_url = 'https://github.com/Cryptolens/cryptolens-python/archive/v_07.tar.gz',    # I explain this later on
   keywords = ['software licensing', 'licensing library', 'cryptolens'],   # Keywords that define your package best
   install_requires=[            # I get to this in a second
           'pycryptodome'

test.py

@@ -10,7 +10,7 @@
 
 pubKey = "<RSAKeyValue><Modulus>sGbvxwdlDbqFXOMlVUnAF5ew0t0WpPW7rFpI5jHQOFkht/326dvh7t74RYeMpjy357NljouhpTLA3a6idnn4j6c3jmPWBkjZndGsPL4Bqm+fwE48nKpGPjkj4q/yzT4tHXBTyvaBjA8bVoCTnu+LiC4XEaLZRThGzIn5KQXKCigg6tQRy0GXE13XYFVz/x1mjFbT9/7dS8p85n8BuwlY5JvuBIQkKhuCNFfrUxBWyu87CFnXWjIupCD2VO/GbxaCvzrRjLZjAngLCMtZbYBALksqGPgTUN7ZM24XbPWyLtKPaXF2i4XRR9u6eTj5BfnLbKAU5PIVfjIS+vNYYogteQ==</Modulus><Exponent>AQAB</Exponent></RSAKeyValue>"
 
-res = Key.activate(token="WyIyNjA1IiwiTjhZQUpIYXJPaVdBV0ozQUlKVC9tamdDbFZDRzhZRHpaU243L2R2eCJd",\
+res = Key.activate(token="WyIyNzMyIiwiYmx6NlJ6ZzdaWjFScmxFVFNCc283YTJyUG5kQURMZ0hucW1YdUZxKyJd",\
                    rsa_pub_key=pubKey,\
                    product_id=3349, key="ICVLD-VVSZR-ZTICT-YKGXL", machine_code=Helpers.GetMachineCode())