pyarmor 8.5.10__zip → 8.5.12__zip

{pyarmor-8.5.10 → pyarmor-8.5.12}/PKG-INFO

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

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

{pyarmor-8.5.10 → pyarmor-8.5.12}/pyarmor/cli/__main__.py

@@ -238,8 +238,8 @@ def cmd_gen(ctx, args):
         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)
+        packer.build()
     else:
         builder.process(options)
         Plugin.post_build(ctx)
@@ -304,6 +304,7 @@ def cmd_reg(ctx, args):
             logger.error('invalid registeration file "%s"', regfile)
             raise CliError('please use ".zip" file to register group device')
         regsvr = WebRegister(ctx)
+        regsvr.check_request_interval()
         regsvr.register_group_device(regfile, args.device)
         logger.info('The device regfile has been generated successfully')
 
@@ -315,6 +316,7 @@ def cmd_reg(ctx, args):
 
     else:
         regsvr = WebRegister(ctx)
+        regsvr.check_request_interval()
         info, msg = regsvr.prepare(regfile, args.product, upgrade=upgrade)
         prompt = 'Are you sure to continue? (yes/no) '
         if args.confirm:
@@ -335,19 +337,7 @@ def cmd_reg(ctx, args):
 
 
 def cmd_man(ctx, args):
-    pkgpath = os.path.join(os.path.dirname(__file__), '..', 'man')
-    if not os.path.exists(pkgpath):
-        from subprocess import check_output
-        check_output([
-            sys.executable, '-m', 'pip', 'install',
-            '--disable-pip-version-check', 'pyarmor.man'
-        ])
-
-    from pyarmor.man.cli import main_entry
-    try:
-        main_entry(args)
-    except KeyboardInterrupt:
-        logging.info('Quit from Pyarmor.Man, Bye-Bye')
+    logging.info('This feature is still developing ...')
 
 
 def main_parser():

{pyarmor-8.5.10 → pyarmor-8.5.12}/pyarmor/cli/context.py

@@ -40,7 +40,7 @@ def __pyarmor__():
 
     def format_system():
         plat = platform.system().lower()
-        plat = ('windows' if plat.startswith('cygwin') else
+        plat = ('cygwin' if plat.startswith('cygwin') else
                 'linux' if plat.startswith('linux') else
                 'freebsd' if plat.startswith(
                     ('freebsd', 'openbsd', 'isilon onefs')) else plat)
@@ -209,12 +209,20 @@ class Context(object):
         return cfg
 
     def _named_config(self, name, encoding=None):
-        flist = [os.path.join(x, name)
-                 for x in (self.global_path, self.local_path)]
+        nlist = []
+        if self.cfg.getboolean('builder', 'propagate_package_options'):
+            i = name.find('.')
+            while i > -1:
+                nlist.append(name[:i])
+                i = name.find('.', i+1)
+        nlist.append(name)
+        flist = [os.path.join(b, a)
+                 for a in nlist
+                 for b in (self.global_path, self.local_path)]
         return self._read_config(flist, encoding=encoding)
 
     def read_token(self):
-        for filename in (self.license_token, self.license_group_token):
+        for filename in (self.license_group_token, self.license_token):
             if os.path.exists(filename):
                 with open(filename, 'rb') as f:
                     return f.read()
@@ -269,7 +277,8 @@ class Context(object):
         if self.cfg.has_section(extra_sect):
             options.update(self.cfg.items(extra_sect))
         if name:
-            cfg = self._named_config(name + '.ruler')
+            # If input path is '.', package name will start with '..'
+            cfg = self._named_config(name.strip('.') + '.ruler')
             if cfg.has_section(sect):
                 options.update(cfg.items(sect))
         return options

{pyarmor-8.5.10 → pyarmor-8.5.12}/pyarmor/cli/default.cfg

@@ -3,7 +3,7 @@
 ;; Pyarmor version
 major = 8
 minor = 5
-patch = 10
+patch = 12
 
 ;; Compatible core version
 cli.core = 6.5.3
@@ -102,6 +102,11 @@ rft_dev_mode = 0
 ;; Export module and classes
 ; rft_export_names = pkg.mod pkg.mod.cls pkg.mod.attr
 
+;; How to reform import statement
+;;   0 Convert import statement to security form
+;;   1 Simple rename the imported name
+rft_simple_import = 0
+
 ;; Extra paths to find dependent package
 ; pypaths =
 
@@ -115,6 +120,13 @@ rft_dev_mode = 0
 ;; Group device flag for machine id
 group_device_flag = 22
 
+;; Whether propagate package private configuration to module
+;;
+;; If enable, "pkg.mod" will inherit "pkg" configuration
+;;
+;; Otherwise, "pkg.mod" doesn't merge "pkg" configuration
+propagate_package_options = 0
+
 ;;
 ;; Part 2: global/local/module level options
 ;;
@@ -193,6 +205,7 @@ clear_frame_locals = 0
 ;; Whether encrypt name in statement import
 rft_mix_import_name = 0
 
+;; Unused, now this option isn't used
 ;; Strip leading name package
 strip_package_name = 1
 
@@ -398,7 +411,7 @@ enable_comprehension = 1
 
 [windows.x86_64.bcc]
 cc = clang.exe
-cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables --target=x86_64-elf-windows -c
+cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables --target=x86_64-elf-windows -c -DENABLE_BCC_MEMSET
 
 [windows.x86.bcc]
 cc = clang.exe
@@ -417,7 +430,7 @@ cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables
 cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-stack-protector -shared -nostdlib -Tlinux.armv7.ldscript
 
 [darwin.x86_64.bcc]
-cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables --target=x86_64-elf-gnu_linux -fPIC -c
+cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables --target=x86_64-elf-gnu_linux -fPIC -c -DENABLE_BCC_MEMSET
 
 [darwin.aarch64.bcc]
 cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables --target=arm64-macho-darwin -fPIC -fno-addrsig -fno-stack-protector -shared -nostdlib -lsystem

{pyarmor-8.5.10 → pyarmor-8.5.12}/pyarmor/cli/register.py

@@ -151,6 +151,11 @@ class Register(object):
     def register_regfile(self, regfile, clean=True):
         from zipfile import ZipFile
 
+        for x in (self.ctx.license_group_token, self.ctx.license_token):
+            if os.path.exists(x):
+                logger.info('remove old token "%s"', x)
+                os.remove(x)
+
         path = self.ctx.reg_path
         with ZipFile(regfile, 'r') as f:
             for item in ('license.lic', '.pyarmor_capsule.zip'):
@@ -357,6 +362,24 @@ class WebRegister(Register):
         conn.request("GET", url[k:])
         return conn.getresponse()
 
+    def check_request_interval(self, delta=30.0):
+        """Make sure no more than 2 requests in 1 minute"""
+        tspath = os.path.join(self.ctx.reg_path, 'last_register')
+        try:
+            st = os.stat(tspath)
+        except FileNotFoundError:
+            os.makedirs(tspath)
+        else:
+            from time import sleep, time
+            d = delta - (time() - st.st_mtime)
+            if d > 0:
+                logger.info('last register was within %d seconds, '
+                            'waiting for %d seconds', delta, d)
+            while time() - st.st_mtime < delta:
+                logger.info('waiting ...')
+                sleep(3.0)
+            os.utime(tspath)
+
     def _send_request(self, url, timeout=6.0):
         try:
             return self._request(url)

{pyarmor-8.5.10 → pyarmor-8.5.12}/pyarmor/config.py

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

{pyarmor-8.5.10 → pyarmor-8.5.12}/pyarmor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.10
+Version: 8.5.12
 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