pyarmor 8.5.2__zip → 8.5.3__zip

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

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

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

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

@@ -107,6 +107,10 @@ def format_gen_args(ctx, args):
         options['no_runtime'] = True
         options['use_runtime'] = args.use_runtime
 
+    if (options.get('restrict_module', 0) == 2
+        and ctx.cfg['builder'].get('private_module_as_restrict', 0)):
+        options['restrict_module'] = 3
+
     if options.get('assert_call') or options.get('assert_import'):
         if options.get('restrict_module', 0) < 2:
             logger.debug('implicitly set restrict_module = 2')

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

@@ -701,3 +701,19 @@ class Context(object):
             port = http_proxy[j+1:]
         url = b'http://pyarmor.dashingsoft.com'
         return b'\x00'.join([host, port, url, header, b'\x00'])
+
+    def request_token(self, url, timeout=6.0):
+        from urllib.request import urlopen
+
+        def get_response(host):
+            try:
+                from ssl import _create_unverified_context
+                context = _create_unverified_context()
+                req = 'https://%s%s' % (host, url)
+            except Exception:
+                context = None
+                req = 'http://%s%s' % (host, url)
+            return urlopen(req, None, timeout, context=context)
+
+        with get_response('pyarmor.dashingsoft.com') as res:
+            return res.read()

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

@@ -3,10 +3,10 @@
 ;; Pyarmor version
 major = 8
 minor = 5
-patch = 2
+patch = 3
 
 ;; Compatible core version
-cli.core = 6.5.0
+cli.core = 6.5.1
 
 ;; Deprecated since Pyarmor 8.2.5
 ; cli.runtime = 3.2.5
@@ -192,6 +192,23 @@ clear_frame_locals = 0
 ;; Whether encrypt name in statement import
 rft_mix_import_name = 0
 
+;;
+;; Compatiable options
+;;
+
+;; Since pyarmor 8.5.3, pyarmor.core 6.5.1
+;;
+;; If private_module_same_as_restrict is set to 1, --private is same as --restrict, it's default behaviours in previous version. Both --private and --restrict don't allow plain scripts to import the obfsucated modules
+;;
+;; But the right way should be
+;;
+;;    --private allow
+;;    --restrict not allow
+;;
+;; When need this behaviours, set private_module_same_as_restrict is to 0
+;;
+private_module_same_as_restrict = 0
+
 [runtime]
 
 ;; Generate extension for all Python3.7+

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

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

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

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

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

{pyarmor-8.5.2 → pyarmor-8.5.3}/setup.py

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

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

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