Rename to PyArmor

jondy · jondy · commit 2d45ba992311 · 2019-01-18T15:30:09.000+08:00
diff --git a/src/README.rst b/src/README.rst
@@ -1,7 +1,7 @@
-Protect Python Scripts By Pyarmor
+Protect Python Scripts By PyArmor
 =================================
 
-Pyarmor is a command line tool used to obfuscate python scripts, bind
+PyArmor is a command line tool used to obfuscate python scripts, bind
 obfuscated scripts to fixed machine or expire obfuscated scripts. It
 protects Python scripts by the following ways:
 
@@ -10,7 +10,7 @@ protects Python scripts by the following ways:
 * Clear f_locals of frame as soon as code object completed execution.
 * Verify the license file of obfuscated scripts while running it.
 
-Look at what happened after ``foo.py`` is obfuscated by Pyarmor. Here
+Look at what happened after ``foo.py`` is obfuscated by PyArmor. Here
 are the files list in the output path ``dist``::
 
     foo.py
@@ -74,7 +74,7 @@ Generate an expired license and run obfuscated scripts with new license::
     cd dist/
     python queens.py
 
-Start webui, open web page in browser for basic usage of Pyarmor::
+Start webui, open web page in browser for basic usage of PyArmor::
 
     pyarmor-webui
 
diff --git a/src/config.py b/src/config.py
@@ -3,11 +3,11 @@
 version = '4.6.2'
 
 version_info = '''
-Pyarmor is a tool used to import or run the encrypted python scripts.
+PyArmor is a tool used to import or run the encrypted python scripts.
 Only by a few extra files, pyarmor can run and imported encrypted
 files in the normal python environments.
 
-Pyarmor just likes an enhancement which let python could run or import
+PyArmor just likes an enhancement which let python could run or import
 encrypted files.
 
 '''
@@ -18,7 +18,7 @@
 encrypted files are encrypted by same key.
 
 A registration code is required to generate random project capsule.
-If Pyarmor is helpful for you, please purchase one by visiting
+If PyArmor is helpful for you, please purchase one by visiting
 
   https://order.shareit.com/cart/add?vendorid=200089125&PRODUCT[300871197]=1
 
diff --git a/src/examples/README-ZH.md b/src/examples/README-ZH.md
@@ -1,6 +1,6 @@
 # 示例（[English Version](README.md)）
 
-好的示例就是最好的老师，是最快的学习方式。在 Pyarmor 发布的包里面，就包
+好的示例就是最好的老师，是最快的学习方式。在 PyArmor 发布的包里面，就包
 含了针对不同使用场景的脚本模板。这些脚本里面的注释很详细，按照里面的说
 明进行正确的设置，就可以快速加密 Python 脚本。扩展名为 `.bat` 在
 Windows 下使用，`.sh` 的在 Linux，MacOS 等上面使用。他们都存放在子目录
@@ -27,10 +27,10 @@ Windows 下使用，`.sh` 的在 Linux，MacOS 等上面使用。他们都存放
 
 
 除了这些脚本之外，这里还有一些真实的例子。现在打开一个命令窗口，按照下
-面文档中的说明，一步一步来学习 Pyarmor 的常用功能。
+面文档中的说明，一步一步来学习 PyArmor 的常用功能。
 
 在下面的章节中，假定 Python 已经安装，并且可以使用 `python` 直接调用，
-Pyarmor 的安装路径是 `/path/to/pyarmor`
+PyArmor 的安装路径是 `/path/to/pyarmor`
 
 示例命令格式是 Linux 的脚本命令，Windows 上使用需要转换成为对应的命令。
 
@@ -157,7 +157,7 @@ Pyarmor 的安装路径是 `/path/to/pyarmor`
 
 * 如何使用命令 `pack` 来打包加密的脚本
 
-Pyarmor 需要使用第三方的打包工具，推荐工具是 `PyInstaller`, 首先安装
+PyArmor 需要使用第三方的打包工具，推荐工具是 `PyInstaller`, 首先安装
 
     pip install pyinstaller
 
diff --git a/src/examples/README.md b/src/examples/README.md
@@ -1,7 +1,7 @@
 # Exmaples ([中文版](README-ZH.md))
 
 A good example maybe is the best teacher. There are several sample
-shell scripts distributed with source package of Pyarmor. All of them
+shell scripts distributed with source package of PyArmor. All of them
 are rich comment used to obfuscate Python scripts in different cases,
 `.bat` for Windows, `.sh` for Linux and MacOS. Find them in the path
 `examples`, edit the variables in it according to actual enviroments,
@@ -33,11 +33,11 @@ then run it to obfuscate your python scripts quickly.
     `PyInstaller`, `py2exe`, `py2app` or `cx_Freeze`.
 
 Not only those scripts, but also some really examples are distributed
-with Pyarmor. Just open a command window, follow the instructions in
-this document, learn how to use Pyarmor by these examples.
+with PyArmor. Just open a command window, follow the instructions in
+this document, learn how to use PyArmor by these examples.
 
 In the rest sections, assume that Python is installed, it can be
-called `python`. And Pyarmor has been installed in the
+called `python`. And PyArmor has been installed in the
 `/path/to/pyarmor`.
 
 Shell commands will shown for Unix-based systems. Windows has
diff --git a/src/examples/build-for-exe.bat b/src/examples/build-for-exe.bat
@@ -31,7 +31,7 @@ Set ENTRY_NAME=hello
 Set ENTRY_SCRIPT=%ENTRY_NAME%.py
 Set ENTRY_EXE=%ENTRY_NAME%.exe
 
-REM TODO: Pyarmor project path to save project config file
+REM TODO: PyArmor project path to save project config file
 Set PROJECT=C:\Python34\Lib\site-packages\pyarmor\build-for-py2exe
 
 REM TODO: Comment next line if not to test obfuscated scripts
@@ -59,7 +59,7 @@ If NOT ERRORLEVEL 0 (
     Goto END
 )
 
-REM Check Pyarmor
+REM Check PyArmor
 If NOT EXIST "%PYARMOR_PATH%\pyarmor.py" (
     Echo.
     Echo No pyarmor found, check value of variable PYARMOR_PATH
diff --git a/src/examples/build-for-freeze.bat b/src/examples/build-for-freeze.bat
@@ -58,7 +58,7 @@ If NOT ERRORLEVEL 0 (
     Goto END
 )
 
-REM Check Pyarmor
+REM Check PyArmor
 If NOT EXIST "%PYARMOR_PATH%\pyarmor.py" (
     Echo.
     Echo No pyarmor found, check value of variable PYARMOR_PATH
diff --git a/src/examples/testpkg/mypkg/__init__.py b/src/examples/testpkg/mypkg/__init__.py
@@ -1 +1 @@
-title = 'Pyarmor Test Case'
+title = 'PyArmor Test Case'
diff --git a/src/mechanism.md b/src/mechanism.md
@@ -1,21 +1,21 @@
-# How to Obfuscate Python Script by Pyarmor
+# How to Obfuscate Python Script by PyArmor
 
-From Pyarmor 3.3, a new mode is introduced. By this way, no import
+From PyArmor 3.3, a new mode is introduced. By this way, no import
 hooker, no setprofile, no settrace. The performance of running or
 importing obfuscation python script has been remarkably improved.
 
-Pyarmor protects Python scripts by the following ways:
+PyArmor protects Python scripts by the following ways:
 
 * Obfuscate source file to protect constants and literal strings.
 * Obfuscate byte code of each code object.
 * Clear f_locals of frame as soon as code object completed execution.
 
-There are 2 different cases for Pyarmor to protect Python scripts:
+There are 2 different cases for PyArmor to protect Python scripts:
 
 * Application, also called standalone package
 * Package used by others
 
-In the first case, Pyarmor obfuscates all the Python Scripts belong to
+In the first case, PyArmor obfuscates all the Python Scripts belong to
 standalone application, and doesn't allow to import those obfuscated
 scripts from any other clear script. So a simple way can be apply, it
 called **Restrict Mode**.
@@ -26,7 +26,7 @@ accessed in outer. It need more work to protect Python scripts.
 
 ## Mechanism in Restrict Mode
 
-In restrict mode, Pyarmor will restore obfuscated byte code when this
+In restrict mode, PyArmor will restore obfuscated byte code when this
 code object is called first time, and not obfuscate it again. It's
 efficient and enough, because code object can't be accessed from any
 other scripts, except obfuscated scripts.
@@ -172,7 +172,7 @@ This feature is introuced from v3.9.0
 
 When restrict mode is disabled, it means obfuscated scripts can be
 imported from any other scripts. So every code object must be
-obfuscated again as soon as it returns. Pyarmor insert a
+obfuscated again as soon as it returns. PyArmor insert a
 `try...finally` block in each code object, it will modify each code
 object as the following way:
 
@@ -211,7 +211,7 @@ locals in this frame.
 
 ### Implementation
 
-From Pyarmor 3.9.0, there are 2 ways
+From PyArmor 3.9.0, there are 2 ways
 
 * Use Command `obfuscate` with option `--no-restrict`
 
@@ -269,7 +269,7 @@ From Pyarmor 3.9.0, there are 2 ways
 
 ## Performance Analaysis
 
-With default configuration, Pyarmor will do the following extra work
+With default configuration, PyArmor will do the following extra work
 to run or import obfuscated bytecode:
 
 - Load library _pytransform at startup
@@ -379,7 +379,7 @@ It's even faster than no obfuscated scripts!
 
 # DEPRECATED Mode
 
-The following modes are used by Pyarmor before v3.2.0. It requires
+The following modes are used by PyArmor before v3.2.0. It requires
 import hooker, for example, sys.meta_path, and sys.setprofile or
 sys.settrace. Especially the latter, it could dramatically effect
 performance.
diff --git a/src/packer.py b/src/packer.py
@@ -216,7 +216,7 @@ def update_specfile(project, obfdist, src, entry, specfile):
         lines = f.readlines()
 
     patched_lines = (
-    "", "# Patched by Pyarmor",
+    "", "# Patched by PyArmor",
     "a.scripts[0] = '%s', '%s', 'PYSOURCE'" % (
         entry[:-3], os.path.join(obfdist, entry)),
     "for i in range(len(a.pure)):",
diff --git a/src/platforms/README.md b/src/platforms/README.md
@@ -1,10 +1,10 @@
-# Downloads for Pyarmor Prebuilt Dynamic Library #
+# Downloads for PyArmor Prebuilt Dynamic Library #
 
 Latest version: **4.0.5**
 
 Build date: 2018-12-27
 
-The core of Pyarmor is written by C, the prebuilt dynamic libraries
+The core of PyArmor is written by C, the prebuilt dynamic libraries
 include the common platforms and some embeded platforms. It's not
 difficult to build for any other platform, even for embeded system
 (the only dependency is libc).
diff --git a/src/pyarmor-deprecated.py b/src/pyarmor-deprecated.py
@@ -81,10 +81,10 @@ def checklicense(func):
     def wrap(*arg, **kwargs):
         code = _get_registration_code()
         if code == '':
-            sys.stderr.write('Pyarmor Trial Version %s\n' % version)
+            sys.stderr.write('PyArmor Trial Version %s\n' % version)
             sys.stderr.write(trial_info)
         else:
-            sys.stderr.write('Pyarmor Version %s\n' % version)
+            sys.stderr.write('PyArmor Version %s\n' % version)
         try:
             func(*arg, **kwargs)
         except RuntimeError:
@@ -99,7 +99,7 @@ def wrap(*arg, **kwargs):
 def show_version_info(verbose=True):
     code = _get_registration_code()
     trial = ' Trial' if  code == '' else ''
-    print('Pyarmor%s Version %s' % (trial, version))
+    print('PyArmor%s Version %s' % (trial, version))
     if verbose:
         print(version_info)
         if code == '':
@@ -242,7 +242,7 @@ def do_capsule(argv):
 
 Generate a capsule which used to encrypt/decrypt python scripts later,
 it will generate random capsule when run this command again. Note that
-the trial version of Pyarmor will always generate same project capsule
+the trial version of PyArmor will always generate same project capsule
 
 Generately, one project, one capsule.
 
diff --git a/src/pyarmor.py b/src/pyarmor.py
@@ -116,7 +116,7 @@ def _init(args):
 
     logging.info('Create pyarmor command ...')
     script = make_command(plat_name, sys.executable, sys.argv[0], path)
-    logging.info('Pyarmor command %s created', script)
+    logging.info('PyArmor command %s created', script)
 
     logging.info('Project init successfully.')
 
@@ -148,7 +148,7 @@ def _clone(args):
 
     logging.info('Create pyarmor command ...')
     script = make_command(plat_name, sys.executable, sys.argv[0], path)
-    logging.info('Pyarmor command %s created', script)
+    logging.info('PyArmor command %s created', script)
 
     logging.info('Project init successfully.')
 
@@ -256,7 +256,7 @@ def _build(args):
         logging.info('Make runtime files to %s', routput)
         make_runtime(capsule, routput)
         if project.get('disable_restrict_mode'):
-            licode = '*FLAGS:%c*CODE:Pyarmor-Project' % chr(1)
+            licode = '*FLAGS:%c*CODE:PyArmor-Project' % chr(1)
             licfile = os.path.join(routput, license_filename)
             logging.info('Generate no restrict mode license file: %s', licfile)
             make_project_license(capsule, licode, licfile)
@@ -449,7 +449,7 @@ def _obfuscate(args):
     logging.info('Make runtime files')
     make_runtime(capsule, output)
     if not args.restrict:
-        licode = '*FLAGS:%c*CODE:Pyarmor-Project' % chr(1)
+        licode = '*FLAGS:%c*CODE:PyArmor-Project' % chr(1)
         licfile = os.path.join(output, license_filename)
         logging.info('Generate no restrict mode license file: %s', licfile)
         make_project_license(capsule, licode, licfile)
@@ -502,15 +502,15 @@ def _hdinfo(args):
 def _version_info():
     rcode = get_registration_code()
     if rcode == '':
-        return 'Pyarmor Trial Version %s\n' % version
+        return 'PyArmor Trial Version %s\n' % version
     else:
-        return 'Pyarmor Version %s\n\nRegistration code: %s' % (version, rcode)
+        return 'PyArmor Version %s\n\nRegistration code: %s' % (version, rcode)
 
 def main(args):
     parser = argparse.ArgumentParser(
         prog='pyarmor',
         formatter_class=argparse.RawDescriptionHelpFormatter,
-        description='Pyarmor is a command line tool used to obfuscate ' \
+        description='PyArmor is a command line tool used to obfuscate ' \
                     'python scripts, bind obfuscated scripts to fixed ' \
                     'machine or expire obfuscated scripts.',
         epilog=__doc__,
diff --git a/src/usage.md b/src/usage.md
@@ -2,14 +2,14 @@
 
 # Basic Usages
 
-Here are some exampes to show basic usage of [Pyarmor].
+Here are some exampes to show basic usage of [PyArmor].
 
 All of first,
 
-- Open a command box, enter the path of [Pyarmor] installed
+- Open a command box, enter the path of [PyArmor] installed
 - Run pyarmor.py with your favor python
 
-Then following the steps below to learn how to use [Pyarmor]
+Then following the steps below to learn how to use [PyArmor]
 
 ## Run and Import encrypted module
 
@@ -87,7 +87,7 @@ All of the .py files here are obfuscated like this:
 ## Bind encrypted script to fix machine or expired it
 
 Maybe you want to import encrypted scripts only in some special
-machine, or expired it at some point. Pyarmor command "license" is
+machine, or expired it at some point. PyArmor command "license" is
 just for this case.
 
 Command "encrypt" generates some extra files include "license.lic". In
@@ -162,7 +162,7 @@ There is a odoo module "odoo_web_login":
       
 ```
 
-Now run the following command in the src path of Pyarmor:
+Now run the following command in the src path of PyArmor:
 
 ```
     # Generate capsule at first
@@ -290,4 +290,4 @@ or pyarmor capsule
 
 ```
 
-[Pyarmor]: https://github.com/dashingsoft/pyarmor
+[PyArmor]: https://github.com/dashingsoft/pyarmor
diff --git a/src/user-guide.md b/src/user-guide.md
diff --git a/src/utils.py b/src/utils.py
diff --git a/tests/function-test.sh b/tests/function-test.sh
diff --git a/tests/packer-test.sh b/tests/packer-test.sh
diff --git a/tests/python-test.sh b/tests/python-test.sh
diff --git a/tests/system-test.sh b/tests/system-test.sh

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ If NOT ERRORLEVEL 0 (`
`58`	`58`	`Goto END`
`59`	`59`	`)`
`60`	`60`
`61`		`-REM Check Pyarmor`
	`61`	`+REM Check PyArmor`
`62`	`62`	`If NOT EXIST "%PYARMOR_PATH%\pyarmor.py" (`
`63`	`63`	`Echo.`
`64`	`64`	`Echo No pyarmor found, check value of variable PYARMOR_PATH`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-title = 'Pyarmor Test Case'`
	`1`	`+title = 'PyArmor Test Case'`