pyarmor 8.5.0__zip → 8.5.2__zip

{pyarmor-8.5.0 → pyarmor-8.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.0
+Version: 8.5.2
 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.0 → pyarmor-8.5.2}/pyarmor/build_meta.py

@@ -32,11 +32,12 @@ from wheel.wheelfile import WheelFile
 from wheel.cli.pack import pack as wheel_pack
 from pyarmor.pyarmor import main as pyarmor_main
 
-from setuptools.build_meta import build_wheel as setuptools_build_wheel, \
-    get_requires_for_build_wheel, \
-    get_requires_for_build_sdist, \
-    prepare_metadata_for_build_wheel, \
-    build_sdist
+from setuptools.build_meta import build_wheel as setuptools_build_wheel
+
+try:
+    from distutils.util import get_platform
+except ModuleNotFoundError:
+    from polyfills import get_platform
 
 
 def _wheel_unpack(path, dest='.'):
@@ -82,7 +83,6 @@ def _fix_config(config_settings, obf_options):
     config_settings = config_settings or {}
     global_options = config_settings.get('--global-option', [])
 
-    from distutils.util import get_platform
     plat_name = get_platform().replace('-', '_').replace('.', '_')
     global_options.append('--plat-name=%s' % plat_name)
 

{pyarmor-8.5.0 → pyarmor-8.5.2}/pyarmor/cli/__init__.py

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

{pyarmor-8.5.0 → pyarmor-8.5.2}/pyarmor/cli/__main__.py

@@ -32,6 +32,7 @@ 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):
@@ -327,7 +328,7 @@ def cmd_reg(ctx, args):
 
 
 def cmd_man(ctx, args):
-    pkgpath = os.path.normpath(os.path.dirname(__file__), '..', 'man')
+    pkgpath = os.path.join(os.path.dirname(__file__), '..', 'man')
     if not os.path.exists(pkgpath):
         from subprocess import check_output
         check_output([
@@ -746,36 +747,6 @@ def main_entry(argv):
         parser.print_help()
 
 
-def find_solutions(e):
-    '''Print quick solutions according to exception
-
-    If not enable debug, tell user try `pyarmor -d cmd...`
-
-    If it raises CliError, print possible solutions
-
-    For unknown error, print FAQ page link and `pyarmor man`
-
-    Pyarmor Man is designed to help Pyarmor users to learn
-    and use Pyarmor by web-ui, to find solution quickly when
-    something is wrong, to report bugs and ask questions in
-    standard form in order to save both Pyarmor team's and
-    Pyarmor users' time.
-    '''
-    # debug = logging.getLogger().getEffectiveLevel()
-    # clierr = isinstance(e, CliError)
-    logger.error('''somthing is wrong
-*===========================================================*
-*  Please check                                             *
-*    https://pyarmor.readthedocs.io/en/latest/questions.html*
-*  or run `pyarmor man` to find solutions quickly           *
-*                                                           *
-*  It's recommand to report issue by `pyarmor man` in order *
-*  to provide necessary information, and avoid dupcliated   *
-*  issues or unclear question.                              *
-*===========================================================*
-''')
-
-
 def main():
     logging.basicConfig(
         level=logging.INFO,

pyarmor-8.5.2/pyarmor/cli/bug.py

@@ -0,0 +1,119 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+#############################################################
+#                                                           #
+#      Copyright @ 2024 -  Dashingsoft corp.                #
+#      All rights reserved.                                 #
+#                                                           #
+#      Pyarmor                                              #
+#                                                           #
+#      Version: 8.5.1 -                                     #
+#                                                           #
+#############################################################
+#
+#
+#  @File: cli/bug.py
+#
+#  @Author: Jondy Zhao (pyarmor@163.com)
+#
+#  @Create Date: Tue Mar 12 15:19:41 CST 2024
+#
+import logging
+
+from string import Template
+
+BUG_FILE, LOG_FILE = 'pyarmor.report.bug', '.pyarmor/pyarmor.debug.log'
+
+BUG_TEMPLATE = Template('''[Bug] $title
+
+### Full command options and console output
+$cmdline
+
+$tracelog
+
+### Traceback
+$tb
+''')
+
+ENABLE_DEBUG_HINTS = '''somthing is wrong
+*=============================================================*
+*  Please enable debug option `-d` to run it again            *
+*    pyarmor -d gen options ...                               *
+*                                                             *
+*  Then check console log to find more information            *
+*                                                             *
+*  Please also check                                          *
+*    https://pyarmor.readthedocs.io/en/latest/questions.html  *
+*  or run `pyarmor man` to find solutions quickly             *
+*=============================================================*
+'''
+
+SOLUTION_HINTS = Template('''somthing is wrong
+*=============================================================*
+*  Please check                                               *
+*    https://pyarmor.readthedocs.io/en/latest/questions.html  *
+*  or run `pyarmor man` to find solutions quickly             *
+*                                                             *
+*  It's recommand to report issue by `pyarmor man` in order   *
+*  to provide necessary information, and avoid dupcliated     *
+*  issues or unclear question.                                *
+*=============================================================*
+''')
+
+
+def generate_bug_report(e, logfile=LOG_FILE, output=BUG_FILE):
+    'Generate file `pyarmor.report.bug` in current path'
+    from os.path import exists
+    from sys import argv
+    from traceback import format_exc
+
+    if exists(logfile):
+        with open(logfile, 'r') as f:
+            lines = f.readlines()
+            n = len(lines)
+            if n > 128:
+                tracelog = ''.join(lines[:100] + ['...\n'] + lines[n-20:n])
+            else:
+                tracelog = ''.join(lines[:n])
+    else:
+        tracelog = Template(
+            'TODO: no found logfile "$logfile", please paste console log '
+            'here manually').substitute(logfile=logfile)
+
+    title = '%s: %s' % (type(e).__name__, str(e))
+    with open(output, 'w') as f:
+        f.write(BUG_TEMPLATE.substitute(
+            title=title,
+            cmdline=' '.join(argv),
+            tracelog=tracelog,
+            tb=format_exc()
+        ))
+
+
+def find_solutions(e):
+    '''Print quick solutions according to exception
+
+    If not enable debug, tell user try `pyarmor -d cmd...`
+
+    If it raises CliError, print possible solutions
+
+    For unknown error, print FAQ page link and `pyarmor man`
+
+    Pyarmor Man is designed to help Pyarmor users to learn
+    and use Pyarmor by web-ui, to find solution quickly when
+    something is wrong, to report bugs and ask questions in
+    standard form in order to save both Pyarmor team's and
+    Pyarmor users' time.
+    '''
+    logger = logging.getLogger()
+    if logger.getEffectiveLevel() > logging.DEBUG:
+        logger.error(ENABLE_DEBUG_HINTS)
+        return
+
+    generate_bug_report(e)
+    logger.error(SOLUTION_HINTS.substitute(bugfile=BUG_FILE))
+
+
+if __name__ == '__main__':
+    pass

{pyarmor-8.5.0 → pyarmor-8.5.2}/pyarmor/cli/context.py

@@ -58,7 +58,7 @@ def __pyarmor__():
     def format_machine():
         mach = platform.machine().lower()
         arch_table = (
-            ('x86', ('i386', 'i486', 'i586', 'i686')),
+            ('x86', ('i386', 'i486', 'i586', 'i686', 'x86')),
             ('x86_64', ('x64', 'x86_64', 'amd64', 'intel')),
             ('arm', ('armv5',)),
             ('armv6', ('armv6l',)),
@@ -104,7 +104,7 @@ def format_platform(plat, arch):
     )
 
     arch_table = (
-        ('x86', ('i?86', )),
+        ('x86', ('i?86', 'x86')),
         ('x86_64', ('x64', 'x86_64', 'amd64', 'intel')),
         ('arm', ('armv5',)),
         ('armv6', ('armv6l',)),

{pyarmor-8.5.0 → pyarmor-8.5.2}/pyarmor/cli/default.cfg

@@ -3,7 +3,7 @@
 ;; Pyarmor version
 major = 8
 minor = 5
-patch = 0
+patch = 2
 
 ;; Compatible core version
 cli.core = 6.5.0

{pyarmor-8.5.0 → pyarmor-8.5.2}/pyarmor/config.py

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

{pyarmor-8.5.0 → pyarmor-8.5.2}/pyarmor/packer.py

@@ -44,7 +44,6 @@ import shutil
 import sys
 
 from codecs import open as codecs_open
-from distutils.util import get_platform
 from glob import glob
 from json import load as json_load
 from py_compile import compile as compile_file
@@ -54,6 +53,11 @@ from zipfile import PyZipFile
 
 import polyfills.argparse as argparse
 
+try:
+    from distutils.util import get_platform
+except ModuleNotFoundError:
+    from polyfills import get_platform
+
 # Default output path, library name, command options for setup script
 DEFAULT_PACKER = {
     'py2app': ('dist', 'library.zip', ['py2app', '--dist-dir']),

pyarmor-8.5.2/pyarmor/polyfills/__init__.py

@@ -0,0 +1,62 @@
+# Package pyarmor.polyfills
+
+# Polyfills for distutils.util.get_platform
+def get_platform ():
+    import os
+    import re
+    import sys
+
+    if os.name == 'nt':
+        if 'amd64' in sys.version.lower():
+            return 'win-amd64'
+        return sys.platform
+
+    # Set for cross builds explicitly
+    if "_PYTHON_HOST_PLATFORM" in os.environ:
+        return os.environ["_PYTHON_HOST_PLATFORM"]
+
+    if os.name != "posix" or not hasattr(os, 'uname'):
+        # XXX what about the architecture? NT is Intel or Alpha,
+        # Mac OS is M68k or PPC, etc.
+        return sys.platform
+
+    # Try to distinguish various flavours of Unix
+
+    (osname, host, release, version, machine) = os.uname()
+
+    # Convert the OS name to lowercase, remove '/' characters, and translate
+    # spaces (for "Power Macintosh")
+    osname = osname.lower().replace('/', '')
+    machine = machine.replace(' ', '_')
+    machine = machine.replace('/', '-')
+
+    if osname[:5] == "linux":
+        # At least on Linux/Intel, 'machine' is the processor --
+        # i386, etc.
+        # XXX what about Alpha, SPARC, etc?
+        return  "%s-%s" % (osname, machine)
+    elif osname[:5] == "sunos":
+        if release[0] >= "5":           # SunOS 5 == Solaris 2
+            osname = "solaris"
+            release = "%d.%s" % (int(release[0]) - 3, release[2:])
+            # We can't use "platform.architecture()[0]" because a
+            # bootstrap problem. We use a dict to get an error
+            # if some suspicious happens.
+            bitness = {2147483647:"32bit", 9223372036854775807:"64bit"}
+            machine += ".%s" % bitness[sys.maxsize]
+        # fall through to standard osname-release-machine representation
+    elif osname[:3] == "aix":
+        return "%s-%s.%s" % (osname, version, release)
+    elif osname[:6] == "cygwin":
+        osname = "cygwin"
+        rel_re = re.compile (r'[\d.]+', re.ASCII)
+        m = rel_re.match(release)
+        if m:
+            release = m.group()
+    elif osname[:6] == "darwin":
+        import _osx_support, sysconfig
+        osname, release, machine = _osx_support.get_platform_osx(
+                                        sysconfig.get_config_vars(),
+                                        osname, release, machine)
+
+    return "%s-%s-%s" % (osname, release, machine)

{pyarmor-8.5.0 → pyarmor-8.5.2}/pyarmor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.0
+Version: 8.5.2
 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.0 → pyarmor-8.5.2}/pyarmor.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ pyarmor.egg-info/top_level.txt
 pyarmor/cli/__init__.py
 pyarmor/cli/__main__.py
 pyarmor/cli/bootstrap.py
+pyarmor/cli/bug.py
 pyarmor/cli/config.py
 pyarmor/cli/context.py
 pyarmor/cli/core.data.1

pyarmor-8.5.0/pyarmor/polyfills/__init__.py

@@ -1 +0,0 @@
-# Package pyarmor.polyfills