pyarmor.cli 9.2.7__tar.gz → 9.2.8__tar.gz

{pyarmor_cli-9.2.7 → pyarmor_cli-9.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyarmor.cli
-Version: 9.2.7
+Version: 9.2.8
 Summary: A comand line tool to obfuscate python scripts
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao

{pyarmor_cli-9.2.7 → pyarmor_cli-9.2.8}/pyarmor/cli/__init__.py

@@ -1,6 +1,6 @@
 import logging
 
-__VERSION__ = '9.2.7'
+__VERSION__ = '9.2.8'
 
 logger = logging.getLogger('cli')
 

{pyarmor_cli-9.2.7 → pyarmor_cli-9.2.8}/pyarmor/cli/context.py

@@ -743,23 +743,25 @@ class Context(object):
         else:
             host = http_proxy[i:j]
             port = http_proxy[j+1:]
-        url = b'http://pyarmor.dashingsoft.com'
+        url = b'http://api.dashingsoft.com'
         return b'\x00'.join([host, port, url, header, b'\x00'])
 
     def request_token(self, url, timeout=6.0):
         from urllib.request import urlopen
 
-        def get_response(host):
+        parts = url.split('?', 1)
+        parts[0] = self._opts('pyarmor', 'tokurl')
+        url = '?'.join(parts)
+
+        def get_response(url):
             try:
                 from ssl import _create_unverified_context
                 context = _create_unverified_context()
-                req = 'https://%s%s' % (host, url)
             except Exception:
                 context = None
-                req = 'http://%s%s' % (host, url)
-            return urlopen(req, None, timeout, context=context)
+            return urlopen(url, None, timeout, context=context)
 
-        with get_response('pyarmor.dashingsoft.com') as res:
+        with get_response(url) as res:
             return res.read()
 
     #

{pyarmor_cli-9.2.7 → pyarmor_cli-9.2.8}/pyarmor/cli/default.cfg

@@ -3,7 +3,7 @@
 ;; Pyarmor version
 major = 9
 minor = 2
-patch = 7
+patch = 8
 
 ;; Compatible core version for package: pyarmor.cli.core
 cli.core = 8.1.2
@@ -23,6 +23,7 @@ timeout = 6
 regurl = https://api.dashingsoft.com/product/key/enter/%s/?
 buyurl = https://jondy.github.io/paypal/index.html
 docurl = https://pyarmor.readthedocs.io/{lang}/latest
+tokurl = https://api.dashingsoft.com/product/auth/r2/
 
 [finder]
 recursive = 0

{pyarmor_cli-9.2.7 → pyarmor_cli-9.2.8}/pyarmor/cli/hdinfo.py

@@ -59,7 +59,18 @@ def main(argv):
         'or harddisk name like "/dev/sda"'))
     args = parser.parse_args(argv)
 
-    print('Machine ID: %s' % get_hd_info(GROUP_LICENSE_MACHINE_FLAG)[1:])
+    machid = get_hd_info(GROUP_LICENSE_MACHINE_FLAG)[1:]
+    if machid[1] == '-':
+        machid2 = machid.replace('-', 'm', 1)
+    else:
+        machid2 = get_hd_info(GROUP_LICENSE_MACHINE_FLAG)[1:]
+
+    if machid == machid2:
+        print('This device is stable device')
+        print('Machine ID: %s' % machid2)
+    else:
+        print('This device is unstable device')
+        print('Machind ID is unstable in this device')
 
     if not args.devname:
         print('Default Harddisk Serial Number: %s' % get_hd_info(HT_HARDDISK))

{pyarmor_cli-9.2.7 → pyarmor_cli-9.2.8}/pyarmor/cli/merge.py

@@ -139,6 +139,8 @@ def merge_runtimes(paths, rname, output):
         if not os.path.exists(rpath):
             raise RuntimeError('no runtime package found')
         for x in os.scandir(rpath):
+            if x.name == '__pycache__':
+                continue
             if x.is_dir():
                 logger.info('copy runtime files "%s" to "%s"', x.name, dest)
                 shutil.copytree(x.path, os.path.join(dest, x.name))

{pyarmor_cli-9.2.7 → pyarmor_cli-9.2.8}/pyarmor/cli/register.py

@@ -219,6 +219,8 @@ class Register(object):
             [x[7:] for x in namelist if x.startswith('tokens')]))
         for idver in MACHFLAGS:
             machid = self._get_machine_id(idver).decode('utf-8')
+            if machid.startswith('-'):
+                raise CliError('group license not works in unstable device')
             logger.debug('got machine id: %s', machid)
             name = '/'.join(['tokens', machid])
             if name in namelist:
@@ -379,6 +381,8 @@ class Register(object):
         uinfo = uname()
         devflag = self.ctx.cfg['builder'].getint('group_device_flag', 21)
         machid = self._get_machine_id(devflag).decode('utf-8')
+        if machid.startswith('-'):
+            raise CliError('group license not works in unstable device')
         logger.info('current machine id is "%s"', machid)
         tpl = Template('\n'.join([
             '# Generated by Pyarmor $rev, $timestamp',

{pyarmor_cli-9.2.7 → pyarmor_cli-9.2.8}/pyarmor.cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyarmor.cli
-Version: 9.2.7
+Version: 9.2.8
 Summary: A comand line tool to obfuscate python scripts
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao

{pyarmor_cli-9.2.7 → pyarmor_cli-9.2.8}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-__VERSION__ = ' 9.2.7'
+__VERSION__ = ' 9.2.8'
 
 with open('README.rst') as f:
     long_description = f.read()