Merge pull request #9527 from UnderGreen/devel

Delete import json. Several syntax changes.
2014-11-10 08:54:09 -05:00 · 2014-11-10 08:54:09 -05:00 · 7812c70d3b
parent 3ff8f01087 8e32dda2e2
commit 7812c70d3b
1 changed files with 3 additions and 4 deletions
--- a/plugins/inventory/zabbix.py
+++ b/plugins/inventory/zabbix.py
@ -31,7 +31,6 @@ Tested with Zabbix Server 2.0.6.
 """

 import os, sys
-import json
 import argparse
 import ConfigParser