Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions zabbix/zabbix_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
__logger.log(10,"Starting logging")

try:
# Python 2.5+
import json
__logger.log(15,"Using native json library")
except ImportError:
# Python 2.4
# Separate module or Python <2.6
import simplejson as json
__logger.log(15,"Using simplejson library")
except ImportError:
# Python >=2.6
import json
__logger.log(15,"Using native json library")

class ZabbixAPIException(Exception):
""" generic zabbix api exception
Expand Down