pyarmor 8.0.16__zip → 8.0.18__zip

{pyarmor-8.0.16 → pyarmor-8.0.18}/PKG-INFO

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

@@ -125,14 +125,14 @@ It's important to read this carefully before upgrading pyarmor.
 
 ## Import Notes for Pyarmor prior to 8.0
 
-In future only bug fix for old modes, no new features for old modes.
+In future only bug fix for old commands, no new features for old commands.
 
-Most of the old commands could be used normally, but there still have some
-changes.
+The old commands `obfuscate`, `licenses` etc. still could be used, but there
+have some changes.
 
 There are 3 cases for old users after Pyarmor 8.0 is released:
 
-1. Never upgrade to 8.0+
+### 1. Never upgrade to 8.0+
 
   - SPP mode doesn't work
 
@@ -148,33 +148,30 @@ There are 3 cases for old users after Pyarmor 8.0 is released:
   - Registering Pyarmor by `pyarmor register pyarmor-regcode-xxxxxx.txt` can be
     used no more than 10 times
 
-    If using Pyarmor in CI server or docker, regsiter Pyarmor by the second
+    In order to use Pyarmor in new machine, CI server or docker, check the second
     method described in the registration file "pyarmor-regcode-xxxxxx.txt":
 
-    Downloading "pyarmor-regfile-xxxxxx.zip" once, use this `.zip` file to
-    register Pyarmor later.
+        Downloading "pyarmor-regfile-xxxxxx.zip" once, use this `.zip` file to
+        register Pyarmor later.
 
-2. Upgrade to 8.0 but only use old features
+### 2. Upgrade to 8.0 but only use old features
 
-  - Command `pyarmor -v` only checks and prints new Pyarmor License
-  - Command `pyarmor -h` only prints help for new cli
+  By default, command `pyarmor` only accepts new commands, there are 3 ways to
+  use old commands such as `obfuscate`, `licenses`:
 
-  There are 3 ways to use old commands `obfuscate`, `licenses` etc.:
+  - Use `pyarmor-7` instead `pyarmor`
+  - Export environment variable `PYARMOR_CLI=7`, then still use `pyarmor`
+  - Any way to call entry point `pyarmor.pyarmor:main_entry`
 
-  - Export environment variable `PYARMOR_CLI=7`
-  - Use command `pyarmor-7`
-  - Any way to call `pyarmor.pyarmor:main_entry` or recreate command `pyarmor`
-    link to this entry point
+### 3. Upgrade to 8.0 and use new features
 
-3. Upgrade to 8.0 and use new features
-
-  - Follow new [EULA of Pyarmor](LICENSE). Especially for old personal license,
-    because new license only allows one proudct.
+  - Follow new [EULA of Pyarmor](LICENSE). It's a big change for old personal
+    license, because new license only allows one proudct.
 
   - Not all old licenses could be upgraded to new license freely, refer to
     [Pyarmor licenses][licenses]
 
-  - The old features need not internect connection, but new features need
+  - The old commands need not internect connection, but new command need
 
-  - The old features support Python 2.7~3.10, but new features only support
+  - The old commands support Python 2.7~3.10, but new command only support
     Python 3.7+

{pyarmor-8.0.16 → pyarmor-8.0.18}/pyarmor.egg-info/PKG-INFO

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

@@ -38,6 +38,7 @@ src/cli/default.cfg
 src/cli/errors.py
 src/cli/generate.py
 src/cli/mixer.py
+src/cli/public_capsule.zip
 src/cli/register.py
 src/cli/repack.py
 src/cli/resource.py

{pyarmor-8.0.16 → pyarmor-8.0.18}/pyarmor.egg-info/entry_points.txt

@@ -1,4 +1,5 @@
 [console_scripts]
 pyarmor = pyarmor.pyarmor:main_entry_8
 pyarmor-7 = pyarmor.pyarmor:main_entry
+pyarmor-8 = pyarmor.cli.__main__:main
 

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

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

{pyarmor-8.0.16 → pyarmor-8.0.18}/setup.py

@@ -109,17 +109,18 @@ setup(
     package_dir={'pyarmor': 'src'},
     package_data={
         'pyarmor': pyarmor_data_files + platform_data_files,
-        'pyarmor.cli': ['default.cfg'],
+        'pyarmor.cli': ['default.cfg', 'public_capsule.zip'],
     },
 
     install_requires=[
-        'pyarmor.cli.core~=1.0.6'
+        'pyarmor.cli.core~=1.0.7'
     ],
 
     entry_points={
         'console_scripts': [
             'pyarmor=pyarmor.pyarmor:main_entry_8',
             'pyarmor-7=pyarmor.pyarmor:main_entry',
+            'pyarmor-8=pyarmor.cli.__main__:main',
         ],
     },
 )

{pyarmor-8.0.16 → pyarmor-8.0.18}/src/cli/__main__.py

@@ -85,6 +85,11 @@ def format_gen_args(ctx, args):
         options['no_runtime'] = True
         options['use_runtime'] = args.use_runtime
 
+    if options.get('assert_call') or options.get('assert_import'):
+        if options.get('restrict_module', 0) < 2:
+            logger.debug('implicitly set restrict_module = 2')
+            options['restrict_module'] = 2
+
     if options.get('restrict_module', 0) > 1:
         options['mix_coname'] = 1
 

{pyarmor-8.0.16 → pyarmor-8.0.18}/src/cli/context.py

@@ -253,15 +253,18 @@ class Context(object):
     def local_config(self):
         return os.path.join(self.local_path, 'config')
 
+    def _make_public_capsule(self, filename):
+        from shutil import copy
+        os.makedirs(os.path.dirname(filename), exist_ok=True)
+        path = os.path.dirname(__file__)
+        public_capsule = os.path.join(path, 'public_capsule.zip')
+        copy(public_capsule, filename)
+
     @property
     def private_capsule(self):
         filename = os.path.join(self.reg_path, '.pyarmor_capsule.zip')
         if not os.path.exists(filename):
-            from shutil import copy
-            path = os.path.dirname(__file__)
-            public_capsule = os.path.join(path, '..', 'public_capsule.zip')
-            os.makedirs(self.reg_path, exist_ok=True)
-            copy(public_capsule, filename)
+            self._make_public_capsule(self.reg_path)
         return filename
 
     @property

{pyarmor-8.0.16 → pyarmor-8.0.18}/src/cli/default.cfg

@@ -3,7 +3,7 @@
 ;; Pyarmor version
 major = 8
 minor = 0
-patch = 16
+patch = 18
 
 ;; Core version
 core = 1
@@ -55,7 +55,7 @@ encoding = utf-8
 ;; the interpreter as given by -O options. Explicit levels are 0 (no
 ;; optimization; __debug__ is true), 1 (asserts are removed, __debug__
 ;; is false) or 2 (docstrings are removed too).
-optimize = 2
+optimize = 1
 no_annotations = true
 no_type_comments = true
 
@@ -100,9 +100,6 @@ clear_module_co = 1
 ;; Sometimes __file__ is not defined, replace it with __name__ to fix this issue
 bootstrap_file = __file__
 
-;; Do not obfuscate len(co.co_code) < this value
-co_threshold = 8
-
 ;; Exclude co objects by co_name
 exclude_co_names = <lambda> <listcomp> <setcomp> <dictcomp> <generator>
 

{pyarmor-8.0.16 → pyarmor-8.0.18}/src/cli/register.py

@@ -263,7 +263,7 @@ class WebRegister(Register):
             '',
         ])
         if info['product'] == 'non-profits':
-            lines.append('This license is about to be ussd for non-profits')
+            lines.append('This license is about to be used for non-profits')
 
         lines.extend(['', ''])
         return '\n'.join(lines)

{pyarmor-8.0.16 → pyarmor-8.0.18}/src/config.py

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

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

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