Merge branch 'develop' into 'master'

修复因 python3.7 中要求必须在 argparse 模块的 add_subparsers 增加 required 参数的问题

See merge request bge/bge-python-sdk!8

Author: zhanglei3

.gitignore

@@ -14,3 +14,4 @@ test_env.sh
 .eggs/
 .pytest_cache/
 .python-version
+htmlcov/

bgesdk/__main__.py

@@ -27,10 +27,19 @@ def init_parser():
         help='显示当前 BGE 开放平台 Python SDK 版本号。',
         version='version {}'.format(version.__version__)
     )
-    subparsers = parser.add_subparsers(
-        dest='command',
-        help='SDK 命令行工具可选子命令。'
-    )
+    try:
+        subparsers = parser.add_subparsers(
+            dest='command',
+            help='SDK 命令行工具可选子命令。'
+        )
+    except TypeError:
+        # required: Whether or not a subcommand must be provided, 
+        # by default False (added in 3.7)
+        subparsers = parser.add_subparsers(
+            dest='command',
+            help='SDK 命令行工具可选子命令。',
+            required=False
+        )
     command_names = get_commands()
     sort_items = []
     for sub_command_name in command_names:

bgesdk/management/commands/api/__init__.py

@@ -21,10 +21,19 @@ class Command(BaseCommand):
     help='BGE 开放平台接口测试工具，可调用部分平台接口。'
 
     def add_arguments(self, parser):
-        api_subparsers = parser.add_subparsers(
-            dest='subcommand',
-            help='可选子命令。'
-        )
+        try:
+            api_subparsers = parser.add_subparsers(
+                dest='subcommand',
+                help='可选子命令。'
+            )
+        except TypeError:
+            # required: Whether or not a subcommand must be provided, 
+            # by default False (added in 3.7)
+            api_subparsers = parser.add_subparsers(
+                dest='subcommand',
+                help='可选子命令。',
+                required=False
+            )
         commands_dir = posixpath.join(__path__[0], 'commands')
         command_names = find_commands(commands_dir)
         sort_items = []

bgesdk/management/commands/config.py

@@ -29,10 +29,17 @@ class Command(BaseCommand):
     project_help = '全局配置项目名。'
 
     def add_arguments(self, parser):
-        sub_ps = parser.add_subparsers(
-            help='新增、删除、显示 OAuth2 配置',
-            required=False
-        )
+        try:
+            sub_ps = parser.add_subparsers(
+                help='新增、删除、显示 OAuth2 配置'
+            )
+        except TypeError:
+            # required: Whether or not a subcommand must be provided, 
+            # by default False (added in 3.7)
+            sub_ps = parser.add_subparsers(
+                help='新增、删除、显示 OAuth2 配置',
+                required=False
+            )
         add_p = sub_ps.add_parser(
             'add',
             formatter_class=argparse.ArgumentDefaultsHelpFormatter,

bgesdk/management/commands/model.py

@@ -173,11 +173,19 @@ class Command(BaseCommand):
 
     def add_arguments(self, parser):
         home = get_home()
-        model_subparsers = parser.add_subparsers(
-            dest='subcommand',
-            help='可选子命令。'
-        )
-
+        try:
+            model_subparsers = parser.add_subparsers(
+                dest='subcommand',
+                help='可选子命令。'
+            )
+        except TypeError:
+            # required: Whether or not a subcommand must be provided, 
+            # by default False (added in 3.7)
+            model_subparsers = parser.add_subparsers(
+                dest='subcommand',
+                help='可选子命令。',
+                required=False
+            )
         # 初始化脚手架命令
         init_p = model_subparsers.add_parser(
             'init',

bgesdk/management/commands/model_doc.py

@@ -41,11 +41,17 @@ class Command(BaseCommand):
 
     def add_arguments(self, parser):
         home = get_home()
-        doc_ps = parser.add_subparsers(
-            help='对模型文档进行预览和发布',
-            required=False
-        )
-
+        try:
+            doc_ps = parser.add_subparsers(
+                help='对模型文档进行预览和发布'
+            )
+        except TypeError:
+            # required: Whether or not a subcommand must be provided, 
+            # by default False (added in 3.7)
+            doc_ps = parser.add_subparsers(
+                help='对模型文档进行预览和发布',
+                required=False
+            )
         init_p = doc_ps.add_parser(
             'init',
             formatter_class=argparse.ArgumentDefaultsHelpFormatter,