From 4ad55574d921c608bf7a7fca1ebeee5e7d3c8a21 Mon Sep 17 00:00:00 2001 From: v-zhuravlev Date: Fri, 15 Feb 2019 23:47:28 +0300 Subject: [PATCH] renamed admin to Admin in docs --- README.rst | 4 ++-- docs/source/quickstart_guide.rst | 2 +- pyzabbix/api.py | 2 +- tests/test_api.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 54d2d7a..92d44ae 100644 --- a/README.rst +++ b/README.rst @@ -26,7 +26,7 @@ ZabbixAPI from pyzabbix.api import ZabbixAPI # Create ZabbixAPI class instance - zapi = ZabbixAPI(url='https://localhost/zabbix/', user='admin', password='zabbix') + zapi = ZabbixAPI(url='https://localhost/zabbix/', user='Admin', password='zabbix') # Get all monitored hosts result1 = zapi.host.get(monitored_hosts=1, output='extend') @@ -52,7 +52,7 @@ Or use 'with' statement to logout automatically: from pyzabbix.api import ZabbixAPI # Create ZabbixAPI class instance - with ZabbixAPI(url='https://localhost/zabbix/', user='admin', password='zabbix') as zapi + with ZabbixAPI(url='https://localhost/zabbix/', user='Admin', password='zabbix') as zapi # Get all monitored hosts result1 = zapi.host.get(monitored_hosts=1, output='extend') diff --git a/docs/source/quickstart_guide.rst b/docs/source/quickstart_guide.rst index 3989cdf..9ad892f 100644 --- a/docs/source/quickstart_guide.rst +++ b/docs/source/quickstart_guide.rst @@ -45,7 +45,7 @@ Get list of not monitored hosts from zabbix from pyzabbix import ZabbixAPI # Create ZabbixAPI class instance - zapi = ZabbixAPI(url='https://localhost/zabbix/', user='admin', password='zabbix') + zapi = ZabbixAPI(url='https://localhost/zabbix/', user='Admin', password='zabbix') # Get all disabled hosts result1 = zapi.host.get(status=1) diff --git a/pyzabbix/api.py b/pyzabbix/api.py index 1273e6b..a4c9c77 100644 --- a/pyzabbix/api.py +++ b/pyzabbix/api.py @@ -138,7 +138,7 @@ class ZabbixAPI(object): `user.login`. :type user: str - :param user: Zabbix user name. Default: `ZABBIX_USER` or `admin`. + :param user: Zabbix user name. Default: `ZABBIX_USER` or `'Admin'`. :type password: str :param password: Zabbix user password. Default `ZABBIX_PASSWORD` or diff --git a/tests/test_api.py b/tests/test_api.py index f5b7a79..5174b83 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -59,7 +59,7 @@ def test_api_version(self): self.assertEqual(res, '2.2.5') def test_login(self): - req = {'user': 'admin', 'password': 'zabbix'} + req = {'user': 'Admin', 'password': 'zabbix'} ret = { 'jsonrpc': '2.0', 'result': '0424bd59b807674191e7d77572075f33',