Import json if python supports it

Python 2.7 do not need simplejson

Import json if python supports it
Python 2.7 do not need simplejson
fba941d0 · Rafael Monnerat · cd855a47 · fba941d0
Commit fba941d0 authored 13 years ago by Rafael Monnerat
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

slapos/slap/slap.py slapos/slap/slap.py +5 -1

No files found.
--- a/slapos/slap/slap.py
+++ b/slapos/slap/slap.py
@@ -32,7 +32,11 @@ __all__ = ["slap", "ComputerPartition", "Computer", "SoftwareRelease",
 from interface import slap as interface
 import httplib
-import simplejson as json
+try:
+  import json
+except ImportError:
+  import simplejson as json
 import socket
 import ssl
 import urllib