pyarmor 9.0.3__zip → 9.0.4__zip

{pyarmor-9.0.3 → pyarmor-9.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 9.0.3
+Version: 9.0.4
 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-9.0.3 → pyarmor-9.0.4}/README.md

@@ -73,12 +73,17 @@ Please read the [Pyarmor EULA](LICENSE).
 5. **[Report bugs][issues] following the issue template.**
 6. **For business and security inquiries, send an email to <pyarmor@163.com>.**
 
+There are also some third-party learn platforms (not Pyarmor offical)
+
+- **[Ask Pyarmor Guru][gurubase], it is a Pyarmor-focused AI to answer your questions**
+
 [faq]: https://pyarmor.readthedocs.io/en/latest/questions.html
 [issues]: https://github.com/dashingsoft/pyarmor/issues
 [genindex]: https://pyarmor.readthedocs.io/en/stable/genindex.html
 [mastertoc]: https://pyarmor.readthedocs.io/en/stable/index.html#table-of-contents
 [asking]: https://pyarmor.readthedocs.io/en/latest/questions.html#asking-questions-in-github
 [doc]: https://pyarmor.readthedocs.io/
+[gurubase]: https://gurubase.io/g/pyarmor
 
 ## Resources
 
@@ -105,6 +110,6 @@ Make sure to read the changelog carefully before upgrading Pyarmor:
 
 **Full changelogs** at [releases][releases]
 
-**Upcoming features** at [Pyarmor Release Plan](ReleasePlan.md)
+**Upcoming features** at [Pyarmor Release Plan](docs/ReleasePlan.md)
 
 [releases]: https://github.com/dashingsoft/pyarmor/releases

{pyarmor-9.0.3 → pyarmor-9.0.4}/pyarmor/cli/__init__.py

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

{pyarmor-9.0.3 → pyarmor-9.0.4}/pyarmor/cli/__main__.py

@@ -32,7 +32,6 @@ from .shell import PyarmorShell
 from .plugin import Plugin
 from .generate import Builder
 from .bootstrap import check_prebuilt_runtime_library
-from .bug import find_solutions
 
 
 def _cmd_gen_key(builder, options):
@@ -344,7 +343,30 @@ def cmd_reg(ctx, args):
 
 
 def cmd_man(ctx, args):
-    logging.info('This feature is still developing ...')
+    from subprocess import check_call, check_output, STDOUT
+
+    try:
+        m = __import__('pyarmor.man')
+    except ModuleNotFoundError:
+        logger.info('pyarmor.man is still not installed')
+        if input('Install it now? (Y/n) ') not in ('Y', 'y'):
+            return
+        m = None
+
+    if m is None:
+        try:
+            logger.info('installing package "pyarmor.man"...')
+            check_output([sys.executable, '-m', 'pip',
+                          'install', '-U', 'pyarmor.man'],
+                         stderr=STDOUT)
+            logger.info('install package "pyarmor.man" OK')
+        except Exception:
+            logger.error('install package "pyarmor.man" failed')
+            logger.error('please install it manually:')
+            logger.error('\tpip install -U pyarmor.man')
+            return
+
+    check_call([sys.executable, '-m', 'pyarmor.man.shell'])
 
 
 def main_parser():
@@ -363,7 +385,7 @@ def main_parser():
     )
     parser.add_argument(
         '-d', '--debug', action='store_true',
-        help='print debug informations in the console'
+        help='generate debug file "pyarmor.debug.log"'
     )
     parser.add_argument(
         '-i', dest='interactive', action='store_true',
@@ -647,19 +669,18 @@ https://pyarmor.readthedocs.io/en/stable/reference/man.html#pyarmor-reg
 
 
 def man_parser(subparsers):
-    '''Open Pyarmor.Man in web-browser
+    '''Start Pyarmor Man shell
 
     Pyarmor Man is designed to help Pyarmor users to learn and use
     Pyarmor, to find solution quickly when something is wrong, to
-    report bug and ask question by wizard in order to save both
-    Pyarmor team's and Pyarmor users' time.
+    report bug by template in order to save both Pyarmor team's
+    and users' time.
     '''
-
     cparser = subparsers.add_parser(
         'man',
         formatter_class=argparse.RawDescriptionHelpFormatter,
         description=man_parser.__doc__,
-        help='register Pyarmor or upgrade old Pyarmor license'
+        help='start Pyarmor Man shell'
     )
 
     cparser.set_defaults(func=cmd_man)
@@ -667,43 +688,45 @@ def man_parser(subparsers):
 
 
 def log_settings(ctx, args):
-    if args.debug:
-        root = logging.getLogger()
-        root.setLevel(logging.DEBUG)
-        handler = logging.FileHandler(ctx.debug_logfile,
-                                      mode='w',
-                                      encoding='utf-8')
-        handler.setFormatter(logging.Formatter('%(asctime)s %(message)s'))
-        handler.setLevel(logging.DEBUG)
-        root.addHandler(handler)
-
-    tracelog = logging.getLogger('trace')
-    tracelog.propagate = False
-    tracelog.addHandler(logging.NullHandler())
-    if ctx.cfg.getboolean('builder', 'enable_trace'):
-        handler = logging.FileHandler(ctx.trace_logfile,
-                                      mode='w',
-                                      encoding='utf-8')
-        handler.setFormatter(logging.Formatter('%(name)-20s %(message)s'))
-        handler.setLevel(logging.DEBUG if args.debug else logging.INFO)
-        tracelog.addHandler(handler)
+    import logging.config
+    logging.config.fileConfig(ctx.default_config)
 
     if args.silent:
-        logging.getLogger().setLevel(100)
+        logger.setLevel(logging.ERROR)
+
+    elif args.debug:
+        logger.setLevel(logging.DEBUG)
+        logger.handlers[1].setLevel(logging.DEBUG)
+
+    if ctx.cfg.getboolean('builder', 'enable_trace'):
+        level = logging.DEBUG if args.debug else logging.INFO
+        logging.getLogger('trace').setLevel(level)
+
+
+def log_bug(e):
+    parser = main_parser()
+    args = parser.parse_args(sys.argv[1:])
+    ctx = Context(*get_home_paths(args))
+    cmdline = ' '.join(sys.argv)
+    buglog = logging.getLogger('cli.bug')
 
+    buglog.info('[BUG]: %s\n', e)
+    buglog.info('## Command Line\n%s\n', cmdline)
+    buglog.info('## Environments', )
+    buglog.info('Python %d.%d.%d', *sys.version_info[:3])
+    buglog.info('Pyarmor %s', ctx.version_info())
+    buglog.info('Platform %s', ctx.pyarmor_platform)
+    buglog.info('Native %s', ctx.native_platform)
+    buglog.info('Home %s', ctx.home_path)
+    buglog.info('')
 
-def log_exception(e):
-    logger.debug('unknown error, please check pyarmor.error.log')
-    handler = logging.FileHandler('pyarmor.error.log',
-                                  mode='w',
-                                  encoding='utf-8')
-    fmt = '%(process)d %(processName)s %(asctime)s'
-    handler.setFormatter(logging.Formatter(fmt))
-    log = logging.getLogger('error')
-    log.propagate = False
-    log.addHandler(logging.NullHandler())
-    log.addHandler(handler)
-    log.exception(e)
+    if not isinstance(e, CliError):
+        from traceback import format_exc
+        buglog.info('## Traceback\n%s\n', format_exc())
+
+    # reference/errors.html
+    # reference/solutions.html
+    # questions.html
 
 
 def print_version(ctx):
@@ -729,14 +752,13 @@ def main_entry(argv):
     parser = main_parser()
     args = parser.parse_args(argv)
 
+    ctx = Context(*get_home_paths(args))
+    log_settings(ctx, args)
+
     x, y = sys.version_info[:2]
     if not (x == 3 and y > 6 and y < 13):
         raise CliError('Python %s.%s is not supported' % (x, y))
 
-    ctx = Context(*get_home_paths(args))
-
-    log_settings(ctx, args)
-
     if args.version:
         print_version(ctx)
         parser.exit()
@@ -750,6 +772,7 @@ def main_entry(argv):
 
     logger.debug('native platform %s', ctx.native_platform)
     logger.debug('home path: %s', ctx.home_path)
+    logger.debug('args: %s', argv)
 
     if hasattr(args, 'func'):
         return args.func(ctx, args)
@@ -758,22 +781,12 @@ def main_entry(argv):
 
 
 def main():
-    logging.basicConfig(
-        level=logging.INFO,
-        format='%(levelname)-8s %(message)s',
-    )
-
     try:
         main_entry(sys.argv[1:])
-    except CliError as e:
-        logger.error(e)
-        find_solutions(e)
-        sys.exit(1)
     except Exception as e:
-        log_exception(e)
         logger.error(e)
-        find_solutions(e)
-        sys.exit(2)
+        log_bug(e)
+        sys.exit(1 if isinstance(e, CliError) else 2)
 
 
 if __name__ == '__main__':

{pyarmor-9.0.3 → pyarmor-9.0.4}/pyarmor/cli/bug.py

@@ -18,7 +18,14 @@
 #  @Author: Jondy Zhao (pyarmor@163.com)
 #
 #  @Create Date: Tue Mar 12 15:19:41 CST 2024
-#
+
+
+#############################################################
+#                                                           #
+# Deprecated since Pyarmor 9, use `pyarmor man` instead     #
+#                                                           #
+#############################################################
+
 import logging
 
 from string import Template

{pyarmor-9.0.3 → pyarmor-9.0.4}/pyarmor/cli/context.py

@@ -301,7 +301,7 @@ class Context(object):
             return rev
 
         licinfo = self.license_info
-        lictype = 'basic' if licinfo['features'] == 1 else \
+        lictype = 'basic' if licinfo['features'] in (1, 17) else \
             'pro' if licinfo['features'] == 7 else \
             'group' if licinfo['features'] == 15 else \
             'ci' if licinfo['features'] == 23 else \

{pyarmor-9.0.3 → pyarmor-9.0.4}/pyarmor/cli/default.cfg

@@ -3,10 +3,10 @@
 ;; Pyarmor version
 major = 9
 minor = 0
-patch = 3
+patch = 4
 
 ;; Compatible core version
-cli.core = 7.6.0
+cli.core = 7.6.1
 
 ;; Deprecated since Pyarmor 8.2.5
 ; cli.runtime = 3.2.5
@@ -18,11 +18,7 @@ timeout = 6
 
 regurl = https://api.dashingsoft.com/product/key/enter/%s/?
 buyurl = https://jondy.github.io/paypal/index.html
-
-[logging]
-
-debug_logfile = .pyarmor/pyarmor.debug.log
-trace_logfile = .pyarmor/pyarmor.trace.log
+docurl = https://pyarmor.readthedocs.io/{lang}/latest
 
 [finder]
 recursive = 0
@@ -455,3 +451,77 @@ cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables
 
 [freebsd.x86_64.bcc]
 cflags = -O3 -Wno-unsequenced -fno-asynchronous-unwind-tables -fno-unwind-tables -fPIC -fno-stack-protector -c
+
+;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; Logging settings
+;;
+;;;;;;;;;;;;;;;;;;;;;;
+[loggers]
+keys=root,cli,trace,bug
+
+[handlers]
+keys=console,trace,debug,bug
+
+[formatters]
+keys=console,debug,trace,bug
+
+[logger_root]
+handlers=console
+
+[logger_cli]
+level=INFO
+handlers=console,debug
+qualname=cli
+propagate=0
+
+[logger_trace]
+level=ERROR
+handlers=trace
+qualname=trace
+propagate=0
+
+[logger_bug]
+level=INFO
+handlers=bug
+qualname=cli.bug
+propagate=0
+
+[handler_console]
+class=StreamHandler
+level=INFO
+formatter=console
+args=(sys.stderr,)
+
+[handler_debug]
+class=FileHandler
+level=CRITICAL
+formatter=debug
+args=('pyarmor.debug.log', 'w')
+kwargs={'delay': True}
+
+[handler_trace]
+class=FileHandler
+level=DEBUG
+formatter=trace
+args=('pyarmor.trace.log', 'w')
+kwargs={'delay': True}
+
+[handler_bug]
+class=FileHandler
+level=INFO
+formatter=bug
+args=('pyarmor.bug.log', 'w')
+kwargs={'delay': True}
+
+[formatter_console]
+format=%(levelname)-8s %(message)s
+
+[formatter_debug]
+format=%(asctime)s %(message)s
+
+[formatter_trace]
+format=%(name)-20s %(message)s
+
+[formatter_bug]
+format=%(message)s

{pyarmor-9.0.3 → pyarmor-9.0.4}/pyarmor/cli/register.py

@@ -180,7 +180,7 @@ class Register(object):
         return parse_token(self.ctx.read_token())
 
     def _license_type(self, info):
-        return 'basic' if info['features'] == 1 else \
+        return 'basic' if info['features'] in (1, 17) else \
             'pro' if info['features'] == 7 else \
             'group' if info['features'] == 15 else \
             'ci' if info['features'] == 23 else \
@@ -687,8 +687,8 @@ class WebRegister(Register):
                     f.write(data[n:])
                 self._write_reg_info(filename, data[i:n])
             else:
-                # TBD: it should not happened
-                logger.warning('no REGINFO found')
+                # Only for request group token
+                logger.debug('no REGINFO found')
                 with open(filename, 'wb') as f:
                     f.write(data)
             return filename

{pyarmor-9.0.3 → pyarmor-9.0.4}/pyarmor/cli/shell.py

@@ -21,7 +21,6 @@
 #
 import configparser
 import cmd
-import os
 
 
 class PyarmorShell(cmd.Cmd):

{pyarmor-9.0.3 → pyarmor-9.0.4}/pyarmor/config.py

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

{pyarmor-9.0.3 → pyarmor-9.0.4}/pyarmor/plugins/README.md

@@ -1,5 +1,9 @@
 # Plugins
 
+***This document is written for Pyarmor 7***
+
+***All examples in this folder not work in Pyarmor 8+***
+
 Plugin usually is used to extend license type, or insert some extra check code
 to obfuscated scripts to improve the security.
 

{pyarmor-9.0.3 → pyarmor-9.0.4}/pyarmor.egg-info/PKG-INFO

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

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

{pyarmor-9.0.3 → pyarmor-9.0.4}/setup.py

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

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

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