Refine code

jondy · jondy · commit fb604c22859e · 2022-01-22T09:52:11.000+08:00
diff --git a/src/pyarmor.py b/src/pyarmor.py
@@ -1586,8 +1586,8 @@ def main(argv):
 
     if args.func.__name__[1:] not in ('register', 'download'):
         pytransform_bootstrap(capsule=DEFAULT_CAPSULE, force=args.boot)
-        logging.info(_version_info(verbose=0))
 
+    logging.info(_version_info(verbose=0))
     logging.info('Python %d.%d.%d', *sys.version_info[:3])
     args.func(args)
 
diff --git a/src/utils.py b/src/utils.py
@@ -747,17 +747,17 @@ def make_project_command(platform, python, pyarmor, output):
 
 def get_registration_code():
     try:
-        code = pytransform.get_license_info()['CODE']
-    except Exception:
-        # Sometimes dynamic library _pytransform has not been loaded
-        licfile = os.path.join(HOME_PATH, 'license.lic')
-        with open(licfile, 'rb') as f:
-            lictext = b64decode(f.read())
-        i = lictext.find(b'pyarmor-vax-')
-        if i > 0:
-            code = lictext[i:i+18].encode()
+        if pytransform._pytransform:
+            code = pytransform.get_license_info()['CODE']
         else:
-            code = None
+            # Sometimes dynamic library _pytransform has not been loaded
+            licfile = os.path.join(HOME_PATH, 'license.lic')
+            with open(licfile, 'rb') as f:
+                lictext = b64decode(f.read())
+            i = lictext.find(b'pyarmor-vax-')
+            code = lictext[i:i+18].encode() if i > 0 else None
+    except Exception:
+        code = None
     return code
 
 
