From 4009a9371329b4f012e56e1913fb0e78a39f239b Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Mon, 5 Aug 2019 11:11:29 +0200 Subject: [PATCH] python cli: add python2 support Tested using python 3.7.4 and python 2.7.16 --- scripts/README.md | 10 ++++++++++ scripts/sftpgo_api_cli.py | 9 ++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/scripts/README.md b/scripts/README.md index 2bd911eb..462d7b59 100644 --- a/scripts/README.md +++ b/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: diff --git a/scripts/sftpgo_api_cli.py b/scripts/sftpgo_api_cli.py index 89ca8042..2337eb2d 100644 --- a/scripts/sftpgo_api_cli.py +++ b/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")