Ver código fonte

python cli: add python2 support

Tested using python 3.7.4 and python 2.7.16
Nicola Murino 6 anos atrás
pai
commit
4009a93713
2 arquivos alterados com 16 adições e 3 exclusões
  1. 10 0
      scripts/README.md
  2. 6 3
      scripts/sftpgo_api_cli.py

+ 10 - 0
scripts/README.md

@@ -202,6 +202,16 @@ Command:
 python sftpgo_api_cli.py start_quota_scan test_username
 ```
 
+Output:
+
+```json
+{
+  "status": 201, 
+  "message": "Scan started", 
+  "error": ""
+}
+```
+
 ### Delete user
 
 Command:

+ 6 - 3
scripts/sftpgo_api_cli.py

@@ -1,10 +1,13 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 import argparse
 import json
 
 import requests
 
-import urllib.parse as urlparse
+try:
+	import urllib.parse as urlparse
+except ImportError:
+	import urlparse
 
 
 class SFTPGoApiRequests:
@@ -116,7 +119,7 @@ if __name__ == '__main__':
 	subparsers = parser.add_subparsers(dest="command", help='sub-command --help')
 	subparsers.required = True
 
-	parserAddUser = subparsers.add_parser("add_user", help="Adds a new SFTP user")
+	parserAddUser = subparsers.add_parser("add_user", help="Add a new SFTP user")
 	addCommonUserArguments(parserAddUser)
 
 	parserUpdateUser = subparsers.add_parser("update_user", help="Update an existing user")