pyarmor.cli 8.1.dev2__py2.py3-none-any.whl → 8.1.dev4__py2.py3-none-any.whl

pyarmor/cli/__main__.py

@@ -116,7 +116,7 @@ def check_cross_platform(ctx, platforms):
         from pyarmor.cli import runtime
     except ModuleNotFoundError:
         raise CliError('cross platform need pyarmor.cli.runtime, please '
-                       'run "pip install pyarmor.cli.runtime==1.0.1a2" first')
+                       'run "pip install pyarmor.cli.runtime==2.1.dev1" first')
 
     platnames = []
     for path in runtime.__path__:
@@ -546,10 +546,10 @@ def log_settings(ctx, args):
         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'):
-        tracelog = logging.getLogger('trace')
-        tracelog.propagate = False
-        tracelog.addHandler(logging.NullHandler())
         handler = logging.FileHandler(ctx.trace_logfile, mode='w')
         handler.setFormatter(logging.Formatter('%(name)-20s %(message)s'))
         handler.setLevel(logging.DEBUG if args.debug else logging.INFO)

pyarmor/cli/context.py

@@ -127,6 +127,9 @@ class Context(object):
         self.extra_libs = {}
         self.obfuscated_modules = set()
 
+        self.rft_auto_excludes = set()
+        self.rft_modules = set()
+
         self.runtime_key = None
 
         self.cmd_options = {}
@@ -184,6 +187,8 @@ class Context(object):
         extra_sect = ':'.join([name, sect])
         if self.cfg.has_section(extra_sect):
             options.update(self.cfg.items(extra_sect))
+        if sect in ('builder', 'finder'):
+            options.update(self.cmd_options)
         cfg = self._named_config(name + '.ruler')
         if cfg.has_section(sect):
             options.update(cfg.items(sect))
@@ -333,14 +338,14 @@ class Context(object):
     def pyexts(self):
         return self._opts('finder', 'pyexts').split()
 
-    @property
-    def enable_jit(self):
-        return self._optb('builder', 'enable_jit')
-
     @property
     def enable_themida(self):
         return self._optb('builder', 'enable_themida')
 
+    @property
+    def enable_jit(self):
+        return self._optb('builder', 'enable_jit')
+
     @property
     def enable_bcc(self):
         return self._optb('builder', 'enable_bcc')

pyarmor/cli/default.cfg

@@ -47,30 +47,68 @@ findall = 0
 ; hidden_imports =
 
 [builder]
+;;
+;; Part 1: only global/local settings, not in module level
+;;
+
 ;; File encoding to read scripts
 encoding = utf-8
 
+;; Trace obfuscation
+enable_trace = 0
+
+;; Use Themida to protect runtime package in windows
+enable_themida = 0
+
+;; Import prefix to import runtime package
+import_prefix = 0
+
+;; Sometimes __file__ is not defined, replace it with __name__ to fix this issue
+bootstrap_file = __file__
+
+;; Exclude co objects by co_name
+exclude_co_names = <lambda> <listcomp> <setcomp> <dictcomp> <generator>
+
+;; Common modules which are no restrict
+exclude_restrict_modules = __init__
+
+;; Outer key name
+outer_keyname = pyarmor.rkey
+
+;; inline_plugin = "# pyarmor: "
+inline_plugin = 1
+
+;; Using shared runtime package
+; use_runtime = /path/to/runtime
+
+;; How many loops for jit iv
+jit_iv_threshold = 100
+
+;;
+;; Part 2: global/local/module level options
+;;
+
 ;; The argument optimize specifies the optimization level of the
 ;; compiler; the default value of -1 selects the optimization level of
 ;; 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 = 1
-no_annotations = true
-no_type_comments = true
+
+;; It's not used now
+type_comments = false
+
+;; Write refactor result scripts
+trace_rft = 0
 
 enable_jit = 0
 enable_bcc = 0
 enable_rft = 0
-enable_themida = 0
 
 ;; assert: call import
 assert_call = 0
 assert_import = 0
 
-;; inline_plugin = "# pyarmor: "
-inline_plugin = 1
-
 ;; mix string constant
 mix_str = 0
 
@@ -83,15 +121,6 @@ obf_code = 1
 wrap_mode = 1
 
 restrict_module = 1
-exclude_restrict_modules = __init__
-
-import_prefix = 0
-
-;;
-;; Trace obfuscation
-;;
-enable_trace = 0
-trace_rft = 0
 
 ;;
 ;; Advanced features
@@ -106,21 +135,6 @@ clear_module_co = 1
 ;; clear frame.f_locals for wrap mode
 clear_frame_locals = 0
 
-;; Sometimes __file__ is not defined, replace it with __name__ to fix this issue
-bootstrap_file = __file__
-
-;; Exclude co objects by co_name
-exclude_co_names = <lambda> <listcomp> <setcomp> <dictcomp> <generator>
-
-;; Outer key name
-outer_keyname = pyarmor.rkey
-
-;; Using shared runtime package
-; use_runtime = /path/to/runtime
-
-;; How many loops for jit iv
-jit_iv_threshold = 100
-
 [runtime]
 
 ;; Generate extension for all Python3.7+
@@ -195,6 +209,7 @@ enables = builtin import function class method global local argument
 ; includes =
 ; excludes =
 
+auto_excludes = super
 mix_import_name = 0
 
 [assert.call]

pyarmor/cli/generate.py

@@ -139,6 +139,9 @@ class Builder(object):
         output = options.get('output', 'dist')
         self.ctx.outputs = output.split(',')
 
+        rft_auto_excludes = self.ctx.cfg['rft'].get('auto_excludes').split()
+        self.ctx.rft_auto_excludes.update(rft_auto_excludes)
+
         finder = Finder(self.ctx)
         finder.process(pack=pack)
 

pyarmor/cli/register.py

@@ -246,6 +246,8 @@ class WebRegister(Register):
 
         lines = []
         if upgrade:
+            if not (rcode and rcode.startswith('pyarmor-vax-')):
+                raise RuntimeError('old code "%s" can not be upgraded' % rcode)
             if info['upgrade']:
                 lines.append(upgrade_to_pro_info.substitute(rcode=rcode))
             else:

{pyarmor.cli-8.1.dev2.dist-info → pyarmor.cli-8.1.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyarmor.cli
-Version: 8.1.dev2
+Version: 8.1.dev4
 Summary: A comand line tool to obfuscate python scripts
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao

{pyarmor.cli-8.1.dev2.dist-info → pyarmor.cli-8.1.dev4.dist-info}/RECORD

@@ -1,18 +1,18 @@
 pyarmor/cli/__init__.py,sha256=6igxhRpSlFLtDHnn5QGkbtE8YAtX5juBbSZQ4vc6X90,22
-pyarmor/cli/__main__.py,sha256=0SZd-xucjH_KnnI366TR4nzdCjr7Zh8DfRKntOiekZg,20064
+pyarmor/cli/__main__.py,sha256=ro7uSNe491Z0jv27vDvLe5qZYQOtBqyJPMQx6UlpDAY,20053
 pyarmor/cli/config.py,sha256=HbCIOkJ2Zd7aGeanB1tUpBhWTj1LhyMiSwWGdmFgN0A,8608
-pyarmor/cli/context.py,sha256=-lz2Nxkyqx1eG3esjBhxirmGaEWjR_BFSdBIgSGOBjI,15336
-pyarmor/cli/default.cfg,sha256=h7wuSy93GlHaq66osQZ2cZyKI_tpOE-CwFA-w3D1yPc,7112
+pyarmor/cli/context.py,sha256=tuwMJZTrHxc1CRW7cxIGXZf47y5DQUd82XInjQxCvpU,15496
+pyarmor/cli/default.cfg,sha256=yGxPoGFKgSxj-oAevYLx0d0PdpVLLOBCpQuwlR6tTZc,7416
 pyarmor/cli/errors.py,sha256=gNlPhcqgCS4OVdU9H8V23YxThyvHKtFI3LKAu-sxH60,880
-pyarmor/cli/generate.py,sha256=7GnIcVG2G8MlaH60-7a2UcCsyedu5Cr0OH_IoOix_GQ,5603
+pyarmor/cli/generate.py,sha256=eeEEWVZrhzhFp_SesNSamBs5JvqS2gaRJjN239R8diw,5742
 pyarmor/cli/mixer.py,sha256=CQOttISF-h55lWEbRUaywsNZybxe8KsXC7axO1ISxUE,4008
 pyarmor/cli/public_capsule.zip,sha256=1r4u42ixfocGPMQc0OklpoHF3nvVW6GA1f4SwcEJWVI,2487
-pyarmor/cli/register.py,sha256=Wbr6Q1zTPPzXOO0PoIbo65dtCMZyi5lj1n2nJBWnulw,10826
+pyarmor/cli/register.py,sha256=Wc6Av9GgI20iZVVgpwwAgsxPaaZqO3CEcmcuGtYeGlw,10971
 pyarmor/cli/repack.py,sha256=JTmb-KAzPLNu_VttJTym53uJg5GJlPkmNZQ-LjM8gS8,11386
 pyarmor/cli/resource.py,sha256=VX-0rqR3xqTVdKoou9ZTl0Bk2LP7hW8qlciDVDeiGwo,6179
 pyarmor/cli/shell.py,sha256=S1yJ5RQZhTIysQgXk3H4E_cJsV2Lymh-w-_GdnHFngU,2193
-pyarmor.cli-8.1.dev2.dist-info/METADATA,sha256=8bctLLfGzNp4P0fsZVfLqjlJV1Z2xtBvudITZwBi0VQ,2405
-pyarmor.cli-8.1.dev2.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
-pyarmor.cli-8.1.dev2.dist-info/entry_points.txt,sha256=MODwyeC-iHX4KItYshzQRa5kWWQnMhIuT64w5bqKFR0,41
-pyarmor.cli-8.1.dev2.dist-info/top_level.txt,sha256=UE1ovZ_90YzwF_lZ3LV7o8HKLe-RgzUaUUvdH5UTUus,8
-pyarmor.cli-8.1.dev2.dist-info/RECORD,,
+pyarmor.cli-8.1.dev4.dist-info/METADATA,sha256=QAbtUNJ8Oy_6Dlhu1qBMEZPWURmZMArrKoBWOJkKKQ4,2405
+pyarmor.cli-8.1.dev4.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
+pyarmor.cli-8.1.dev4.dist-info/entry_points.txt,sha256=MODwyeC-iHX4KItYshzQRa5kWWQnMhIuT64w5bqKFR0,41
+pyarmor.cli-8.1.dev4.dist-info/top_level.txt,sha256=UE1ovZ_90YzwF_lZ3LV7o8HKLe-RgzUaUUvdH5UTUus,8
+pyarmor.cli-8.1.dev4.dist-info/RECORD,,