From e5346b8cf565ad97c73e6627287111c44836877e Mon Sep 17 00:00:00 2001
From: Robert Habermann <mail@rhab.de>
Date: Sun, 13 Nov 2016 11:54:46 +0100
Subject: [PATCH] update cli (remove webservice) and fix Py3 file permission
issue
---
cli/PyOTRS.py | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/cli/PyOTRS.py b/cli/PyOTRS.py
index 88218f5..e4c616f 100644
--- a/cli/PyOTRS.py
+++ b/cli/PyOTRS.py
@@ -23,7 +23,8 @@ def load_config(config_file):
click.secho("No config file found at: %s" % config_file, fg="yellow")
return
- if not oct(stat.S_IMODE(os.stat(config_file).st_mode)) == "0600":
+ config_file_permissions = oct(stat.S_IMODE(os.stat(config_file).st_mode))
+ if not (config_file_permissions == "0600" or config_file_permissions == "0o600"):
raise Exception("Permissions to %s too open. Should be 0600!" % config_file)
try:
@@ -50,7 +51,7 @@ def load_config(config_file):
raise Exception("An unexpected error occurred: %s" % err)
-@click.option('--config', 'config_file', type=click.Path(dir_okay=False),
+@click.option('-c', '--config', 'config_file', type=click.Path(dir_okay=False),
help='Config File')
@click.version_option(version=__version__)
@click.group(context_settings=CONTEXT_SETTINGS) # context enables -h as alias for --help
@@ -71,9 +72,6 @@ def cli(config_file=None):
@click.option('-u', '--username', type=click.STRING, prompt=True,
envvar="PYOTRS_USERNAME",
help='Username')
-@click.option('-w', '--webservicename', type=click.STRING, prompt=True,
- envvar="PYOTRS_WEBSERVICENAME",
- help='Webservice Name')
@click.option('-b', '--baseurl', type=click.STRING, prompt=True,
envvar="PYOTRS_BASEURL",
help='Base URL')
@@ -85,10 +83,10 @@ def get(baseurl=None, username=None, password=None, ticket_id=None):
client.session_create()
ticket = client.ticket_get_by_id(ticket_id)
if ticket:
- click.secho("Ticket: \t%s" % ticket.Title)
- click.secho("Queue: \t\t%s" % ticket.Queue)
- click.secho("State: \t\t%s" % ticket.State)
- click.secho("Priority: \t%s" % ticket.Priority)
+ click.secho("Ticket: \t%s" % ticket.field_get("Title"))
+ click.secho("Queue: \t\t%s" % ticket.field_get("Queue"))
+ click.secho("State: \t\t%s" % ticket.field_get("State"))
+ click.secho("Priority: \t%s" % ticket.field_get("Priority"))
click.secho("\nFull Ticket:")
print(ticket.to_dct())
--
GitLab