Merge branch 'master' into case_sensitive_user

README.rst

@@ -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')

pyzabbix/api.py

@@ -95,7 +95,7 @@ def fn(*args, **kwargs):
 
 def ssl_context_compat(func):
     def inner(req):
-        # We shoul explicitly disable cert verification to support
+        # We should explicitly disable cert verification to support
         # self-signed certs with urllib2 since Python 2.7.9 and 3.4.3
 
         default_version = (2, 7, 9)

pyzabbix/logger.py

@@ -23,7 +23,7 @@
 class NullHandler(logging.Handler):
     """Null logger handler.
 
-    :class:`NullHandler` will used if there are no other logger handlers.
+    :class:`NullHandler` will be used if there are no other logger handlers.
     """
 
     def emit(self, record):

pyzabbix/sender.py

@@ -407,7 +407,7 @@ def _chunk_send(self, metrics):
                 raise socket.timeout
             except Exception as err:
                 # In case of error we should close connection, otherwise
-                # we will close it afret data will be received.
+                # we will close it after data will be received.
                 logger.warn('Sending failed: %s', getattr(err, 'msg', str(err)))
                 connection.close()
                 raise Exception(err)