Fix #76 #75

Author: artemlos

licensing/internal.py

@@ -161,14 +161,11 @@ def send_request(method, params):
 
             if HelperMethods.proxy_experimental == True:
                 proxies = urllib.request.getproxies()
-                if proxies != {}:
-                    
-                    if 'http' in proxies:
-                        req.set_proxy(proxies['http'], 'http')
-                    
-                    if 'https' in proxies:
-                        req.set_proxy(proxies['https'], 'https')
-                    
+                if HelperMethods.proxy_experimental:
+                    from urllib.parse import urlparse
+                    for scheme, proxy_uri in urllib.request.getproxies().items():
+                        req.set_proxy(urlparse(proxy_uri).netloc, scheme)
+                return urllib.request.urlopen(req).read().decode("utf-8") 
             else:
                 return urllib.request.urlopen(req).read().decode("utf-8")    
 

setup.cfg

@@ -1,3 +1,2 @@
 # Inside of setup.cfg
 [metadata]
-description-file = README.md

setup.py

@@ -1,20 +1,26 @@
-from distutils.core import setup
+from setuptools import setup  
+
 setup(
   name = 'licensing',         # How you named your package folder (MyLib)
   packages = ['licensing'],   # Chose the same as "name"
   version = '0.51',      # 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
+  #description_file = 'Client library for Cryptolens licensing Web API.',   # Give a short description about your library
+  long_description = 'Client library for Cryptolens Web API (software licensing).',
+  long_description_content_type="text/markdown",
   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_51.tar.gz',    # I explain this later on
+  download_url = 'https://github.com/Cryptolens/cryptolens-python/archive/v_51.tar.gz',
+  project_urls={                       # optional, shows on PyPI
+        "Source": "https://github.com/Cryptolens/cryptolens-python",
+        "Tracker": "https://github.com/Cryptolens/cryptolens-python/issues",
+    },
   keywords = ['software licensing', 'licensing library', 'cryptolens'],   # Keywords that define your package best
   classifiers=[
     #'Development Status :: 5 - Stable',      # Chose either "3 - Alpha", "4 - Beta" or "5 - Production/Stable" as the current state of your package
     'Intended Audience :: Developers',      # Define that your audience are developers
     'Topic :: Software Development :: Build Tools',
-    'License :: OSI Approved :: MIT License',   # Again, pick a license
     'Programming Language :: Python :: 3',      #Specify which pyhton versions that you want to support
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
@@ -30,4 +36,5 @@
     'Operating System :: Microsoft :: Windows',
     'Operating System :: MacOS :: MacOS X',
   ],
+
 )

test.py

@@ -13,9 +13,10 @@
 #from cryptolens_python2 import *
 pubKey = "<RSAKeyValue><Modulus>sGbvxwdlDbqFXOMlVUnAF5ew0t0WpPW7rFpI5jHQOFkht/326dvh7t74RYeMpjy357NljouhpTLA3a6idnn4j6c3jmPWBkjZndGsPL4Bqm+fwE48nKpGPjkj4q/yzT4tHXBTyvaBjA8bVoCTnu+LiC4XEaLZRThGzIn5KQXKCigg6tQRy0GXE13XYFVz/x1mjFbT9/7dS8p85n8BuwlY5JvuBIQkKhuCNFfrUxBWyu87CFnXWjIupCD2VO/GbxaCvzrRjLZjAngLCMtZbYBALksqGPgTUN7ZM24XbPWyLtKPaXF2i4XRR9u6eTj5BfnLbKAU5PIVfjIS+vNYYogteQ==</Modulus><Exponent>AQAB</Exponent></RSAKeyValue>"
 #HelperMethods.ironpython2730_legacy = True
+#HelperMethods.proxy_experimental=True
 res = Key.activate(token="WyIyNzMyIiwiYmx6NlJ6ZzdaWjFScmxFVFNCc283YTJyUG5kQURMZ0hucW1YdUZxKyJd",\
                    rsa_pub_key=pubKey,\
-                   product_id=3349, key="ICVLD-VVSZR-ZTICT-YKGXL", machine_code=Helpers.GetMachineCode(),\
+                   product_id=3349, key="ICVLD-VVSZR-ZTICT-YKGXL", machine_code=Helpers.GetMachineCode(v=2),\
                    friendly_name=socket.gethostname())
 
 if res[0] == None or not Helpers.IsOnRightMachine(res[0]):