Merge pull request #2196 from coolo/fix_json

oqamaint: Take the default modules

oqamaint/cli.py

@@ -3,7 +3,7 @@
 # standard library
 import logging
 import os.path as opa
-import simplejson as json
+import json
 import sys
 
 # external dependency

oqamaint/openqabot.py

@@ -14,16 +14,8 @@ import ReviewBot
 
 from oqamaint.suse import SUSEUpdate
 
-try:
-    from xml.etree import cElementTree as ET
-except ImportError:
-    from xml.etree import ElementTree as ET
-
-
-try:
-    import simplejson as json
-except ImportError:
-    import json
+from xml.etree import cElementTree as ET
+import json
 
 QA_UNKNOWN = 0
 QA_INPROGRESS = 1