X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=1364539422961acf89e3a422e9cbf66a5f864e18;hb=2c76e10042115760eed33fce79a9917d006118bf;hp=846addd7b37eb87cdd7cb519492bdeac13926f0e;hpb=a6b1715c117b4f306a7d301ecc4492c67c6ef98b;p=dak.git

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 846addd7..13645394 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -38,7 +38,14 @@ import re
 import psycopg2
 import traceback
 import commands
-import json
+
+try:
+    # python >= 2.6
+    import json
+except:
+    # python <= 2.5
+    import simplejson as json
+
 from datetime import datetime, timedelta
 from errno import ENOENT
 from tempfile import mkstemp, mkdtemp