pyarmor 8.5.7__zip → 8.5.9__zip

{pyarmor-8.5.7 → pyarmor-8.5.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.7
+Version: 8.5.9
 Summary: A tool used to obfuscate python scripts, bind obfuscated scripts to fixed machine or expire obfuscated scripts.
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao

{pyarmor-8.5.7 → pyarmor-8.5.9}/pyarmor/cli/__init__.py

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

{pyarmor-8.5.7 → pyarmor-8.5.9}/pyarmor/cli/__main__.py

@@ -209,10 +209,10 @@ def check_gen_context(ctx, args):
         raise CliError('--outer conflicts with any -e, --period, -b')
 
     if args.pack:
-        choices = 'auto', 'onefile', 'onedir', 'F', 'D', 'FC', 'DC'
+        choices = 'onefile', 'onedir', 'F', 'D', 'FC', 'DC'
         if args.pack not in choices and not os.path.isfile(args.pack):
-            raise CliError('--pack must be an executable file, '
-                           '"auto", "onefile" or "onedir"')
+            raise CliError('--pack must be an executable file, specfile, '
+                           '"onefile" or "onedir"')
         if args.no_runtime:
             raise CliError('--pack conficts with --no-runtime, --use-runtime')
         if ctx.import_prefix:
@@ -232,18 +232,13 @@ def cmd_gen(ctx, args):
         return _cmd_gen_key(builder, options)
     elif args.inputs[0].lower() in ('runtime', 'run', 'r'):
         _cmd_gen_runtime(builder, options)
-    elif args.pack in ('auto', 'onefile', 'onedir', 'F', 'D', 'FC', 'DC'):
-        from .repack import Repacker6
-        packer = Repacker6(ctx, args.pack, options['inputs'], args.output)
-        packer.check()
-        builder.process(options, packer)
-        Plugin.post_build(ctx, pack=args.pack)
     elif args.pack:
-        from .repack import Repacker
-        codesign = ctx.cfg['pack'].get('codesign_identify', None)
-        packer = Repacker(args.pack, ctx.pack_basepath, codesign=codesign)
+        from .repack import find_packer
+        Repacker = find_packer(args.pack)
+        packer = Repacker(ctx, args.pack, options['inputs'], args.output)
         packer.check()
         builder.process(options, packer=packer)
+        packer.build()
         Plugin.post_build(ctx, pack=args.pack)
     else:
         builder.process(options)

{pyarmor-8.5.7 → pyarmor-8.5.9}/pyarmor/cli/bug.py

@@ -36,7 +36,7 @@ $tracelog
 $tb
 ''')
 
-ENABLE_DEBUG_HINTS = '''somthing is wrong
+ENABLE_DEBUG_HINTS = '''something is wrong
 *=============================================================*
 *  Please enable debug option `-d` to run it again            *
 *    pyarmor -d gen options ...                               *
@@ -49,7 +49,7 @@ ENABLE_DEBUG_HINTS = '''somthing is wrong
 *=============================================================*
 '''
 
-SOLUTION_HINTS = Template('''somthing is wrong
+SOLUTION_HINTS = Template('''something is wrong
 *=============================================================*
 *  Please check                                               *
 *    https://pyarmor.readthedocs.io/en/latest/questions.html  *

{pyarmor-8.5.7 → pyarmor-8.5.9}/pyarmor/cli/context.py

@@ -110,7 +110,11 @@ def format_platform(plat, arch):
         ('armv6', ('armv6l',)),
         ('armv7', ('armv7l',)),
         ('aarch32', ('aarch32',)),
-        ('aarch64', ('aarch64', 'arm64'))
+        ('aarch64', ('aarch64', 'arm64')),
+        ('ppc64le', ('ppc64le',)),
+        ('mips32el', ('mipsel', 'mips32el')),
+        ('mips64el', ('mips64el',)),
+        ('riscv64', ('riscv64',)),
     )
 
     for alias, platlist in plat_table:

{pyarmor-8.5.7 → pyarmor-8.5.9}/pyarmor/cli/default.cfg

@@ -3,10 +3,10 @@
 ;; Pyarmor version
 major = 8
 minor = 5
-patch = 7
+patch = 9
 
 ;; Compatible core version
-cli.core = 6.5.1
+cli.core = 6.5.2
 
 ;; Deprecated since Pyarmor 8.2.5
 ; cli.runtime = 3.2.5
@@ -93,6 +93,7 @@ rft_enables = builtin import function class method global local
 rft_auto_exclude = 1
 
 ;; Export all the names in module attribute __all__
+;; It means leave all the names in the __all__ as they're
 rft_auto_export = 1
 
 ;; Enable dev mode for rft
@@ -255,18 +256,14 @@ on_error = 0
 ;;   3600s
 ;;   60m
 ;;   1h
-;;   1
+;;   1 = 1h
 ; period = 1
 
-;; Expired runtime key. Check local time if there is leading '.',
-;; otherwise check ntp time
+;; Expired runtime key, support 2 forms:
 ;;
-;;     30
+;;     30: expired in 30 days
 ;;     2025-12-31
 ;;
-;;     .30
-;;     .2025-12-30
-;;
 ; expired =
 
 ;; Check network time by those servers

{pyarmor-8.5.7 → pyarmor-8.5.9}/pyarmor/cli/docker.py

@@ -32,6 +32,7 @@ from .register import Register, MACHFLAGS
 
 
 CONFIG = {
+    'host': '0.0.0.0',
     'port': 29092,
     'home': os.path.expanduser(os.path.join('~', '.pyarmor', 'docker')),
     'machid': None,
@@ -110,6 +111,7 @@ def main_entry():
     parser = argparse.ArgumentParser()
     parser.add_argument('-d', '--debug', action='store_true',
                         help='Enable debug mode')
+    parser.add_argument('--host', type=str, default=CONFIG['host'])
     parser.add_argument('-p', '--port', type=int, default=CONFIG['port'],
                         help=argparse.SUPPRESS)
     parser.add_argument('-s', '--sock', default='/var/run/docker.sock',
@@ -135,9 +137,9 @@ def main_entry():
     CONFIG['machid'] = [Pytransform3.get_hd_info(x) for x in MACHFLAGS]
     logging.debug('machine id: %s', CONFIG['machid'])
 
-    host, port = '0.0.0.0', args.port
+    host, port = args.host, args.port
     with socketserver.TCPServer((host, port), DockerAuthHandler) as server:
-        logging.info('listen container auth request on %s:%s', host, args.port)
+        logging.info('listen container auth request on %s:%s', host, port)
         server.serve_forever()
 
 

{pyarmor-8.5.7 → pyarmor-8.5.9}/pyarmor/cli/generate.py

@@ -67,7 +67,7 @@ class Finder(object):
         for res in self._build_resource(resources):
             if res.pkgname not in resnames:
                 self.ctx.obfuscated_modules.add(res.pkgname)
-                self.ctx.extra_resources.append(res)
+                self.ctx.resources.append(res)
 
     def process(self):
         logger.info('search inputs ...')
@@ -99,6 +99,21 @@ class Builder(object):
             self.ctx.runtime_key = self.generate_runtime_key()
         Pytransform3.generate_runtime_package(self.ctx, output)
 
+    def _generate_obfuscated_script(self, res):
+        try:
+            return Pytransform3.generate_obfuscated_script(self.ctx, res)
+        except RuntimeError as e:
+            if str(e) != 'out of license':
+                raise
+
+    def _copy_script(self, path, res):
+        logger.warning('%s is not obfuscated because out of license', res)
+        fullpath = os.path.join(path, res.output_filename)
+        output = os.path.dirname(fullpath)
+        os.makedirs(output, exist_ok=True)
+        logger.info('write %s (not obfuscated)', fullpath)
+        shutil.copy2(res.fullpath, output)
+
     def _obfuscate_scripts(self):
         rev = self.ctx.version_info()
         template = self.ctx.bootstrap_template
@@ -126,7 +141,10 @@ class Builder(object):
                     continue
 
                 logger.info('obfuscating %s', r)
-                code = Pytransform3.generate_obfuscated_script(self.ctx, r)
+                code = self._generate_obfuscated_script(r)
+                if code is None:
+                    self._copy_script(path, r)
+                    continue
                 source = r.generate_output(
                     template, code, relative=relative, pkgname=pkgname,
                     bootpath=bootpath, rev=rev
@@ -156,13 +174,10 @@ class Builder(object):
         finder = Finder(self.ctx)
         finder.process()
 
-        if packer:
-            if options.get('self_contained'):
-                finder.process_extra(packer.contents)
-            if hasattr(packer, 'analysis'):
-                auto_resources = packer.analysis()
-                logger.info('find extra resources: %s', auto_resources)
-                finder.append(auto_resources)
+        if packer and hasattr(packer, 'analysis'):
+            auto_resources = packer.analysis()
+            logger.info('find extra resources: %s', auto_resources)
+            finder.append(auto_resources)
 
         Pytransform3.pre_build(self.ctx)
 
@@ -177,6 +192,3 @@ class Builder(object):
         logger.info('obfuscate scripts OK')
 
         Pytransform3.post_build(self.ctx)
-
-        if packer:
-            packer.repack(output, self.ctx.runtime_package_name)

{pyarmor-8.5.7 → pyarmor-8.5.9}/pyarmor/cli/plugin.py

@@ -236,10 +236,11 @@ def find_runtime_package(ctx, output):
         return os.path.join(output, rtname)
     if isinstance(prefix, str):
         return os.path.join(output, prefix.replace('.', os.path.sep), rtname)
-    for entry in os.scandir(output):
-        if entry.is_dir():
-            if rtname in os.listdir(entry.path):
-                return os.path.join(entry.path, rtname)
+    with os.scandir(output) as iterator:
+        for entry in iterator:
+            if entry.is_dir():
+                if rtname in os.listdir(entry.path):
+                    return os.path.join(entry.path, rtname)
 
 
 class DarwinUniversalPlugin: