pyarmor 8.5.8__zip → 8.5.9__zip

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

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.8
+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.8 → pyarmor-8.5.9}/pyarmor/cli/__init__.py

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

{pyarmor-8.5.8 → 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.8 → pyarmor-8.5.9}/pyarmor/cli/default.cfg

@@ -3,10 +3,10 @@
 ;; Pyarmor version
 major = 8
 minor = 5
-patch = 8
+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.8 → 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.8 → pyarmor-8.5.9}/pyarmor/cli/generate.py

@@ -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

{pyarmor-8.5.8 → 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:

{pyarmor-8.5.8 → pyarmor-8.5.9}/pyarmor/cli/repack.py

@@ -2,14 +2,14 @@ import logging
 import marshal
 import os
 import shutil
-import struct
 import sys
-import tempfile
 
 from fnmatch import fnmatch
 from subprocess import check_call, DEVNULL
 
 # Only used by BundleRepacker, they could be removed with deprecated routines
+import struct
+import tempfile
 from importlib._bootstrap_external import _code_to_timestamp_pyc
 from PyInstaller.archive.writers import ZlibArchiveWriter, CArchiveWriter
 from PyInstaller.archive.readers import CArchiveReader
@@ -41,7 +41,7 @@ def autoclean_output(output, autoclean=True):
         shutil.rmtree(output)
 
 
-# This patch is used to modify the specfile generate by PyInstaller
+# This patch is used to modify the specfile generated by PyInstaller
 #
 # It mainly does:
 #
@@ -711,7 +711,8 @@ class BundleRepacker:
         logger.debug('one file mode is %s', bool(self.one_file_mode))
 
     def build(self):
-        self.repack(self.output, self.ctx.runtime_package_name)
+        obfpath = os.path.normpath(self.ctx.pack_obfpath)
+        self.repack(obfpath, self.ctx.runtime_package_name)
 
     def repack(self, obfpath, rtname, entry=None):
         buildpath = self.buildpath

{pyarmor-8.5.8 → pyarmor-8.5.9}/pyarmor/cli/resource.py

@@ -200,7 +200,7 @@ class PycResource(FileResource):
 class PathResource(Resource):
 
     def __init__(self, path, name=None, parent=None):
-        super().__init__(path, name=name, parent=parent)
+        super().__init__(path, name=os.path.basename(path), parent=parent)
         self.respaths = []
         self.resfiles = []
 

{pyarmor-8.5.8 → pyarmor-8.5.9}/pyarmor/config.py

@@ -1,6 +1,6 @@
 from sys import platform
 
-version = '8.5.8'
+version = '8.5.9'
 
 # The corresponding version of pytransform.so
 core_version = 'r52.6'

{pyarmor-8.5.8 → pyarmor-8.5.9}/pyarmor/packer.py

@@ -294,6 +294,8 @@ def _patch_specfile(obfdist, src, specfile, hookpath=None, encoding=None,
     end_lines = ("# Patch end.", "", "",)
 
     main_lines = (
+        "from PyInstaller.config import CONF",
+        "_code_cache = getattr(a.pure, '_code_cache', CONF['code_cache'].get(id(a.pure)))",
         "_src = %s" % repr(os.path.abspath(src)),
         "_obf = 0",
         "for i in range(len(a.scripts)):",
@@ -308,9 +310,9 @@ def _patch_specfile(obfdist, src, specfile, hookpath=None, encoding=None,
         "    if a.pure[i][1].startswith(_src):",
         "        x = a.pure[i][1].replace(_src, r'%s')" % p,
         "        if os.path.exists(x):",
-        "            if hasattr(a.pure, '_code_cache'):",
+        "            if _code_cache:",
         "                with open(x) as f:",
-        "                    a.pure._code_cache[a.pure[i][0]] = compile(f.read(), a.pure[i][1], 'exec')",
+        "                    _code_cache[a.pure[i][0]] = compile(f.read(), a.pure[i][1], 'exec')",
         "            a.pure[i] = a.pure[i][0], x, a.pure[i][2]",
     )
 

{pyarmor-8.5.8 → pyarmor-8.5.9}/pyarmor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.8
+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.9/pyarmor.egg-info/requires.txt

@@ -0,0 +1 @@
+pyarmor.cli.core~=6.5.2

{pyarmor-8.5.8 → pyarmor-8.5.9}/setup.py

@@ -113,7 +113,7 @@ setup(
     },
 
     install_requires=[
-        'pyarmor.cli.core~=6.5.1'
+        'pyarmor.cli.core~=6.5.2'
     ],
 
     entry_points={

pyarmor-8.5.8/pyarmor.egg-info/requires.txt

@@ -1 +0,0 @@
-pyarmor.cli.core~=6.5.1