JSON: support python 2.5, too.

The json module is available in version 2.6 but we have simplejson in 2.5.

Signed-off-by: Torsten Werner <twerner@debian.org>

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 846addd7b37eb87cdd7cb519492bdeac13926f0e..1364539422961acf89e3a422e9cbf66a5f864e18 100755 (executable)
--- 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

diff --git a/tests/dbtest_ormobject.py b/tests/dbtest_ormobject.py
index a5b775535a28683ca2633175ce398d29b51f9ba0..d1c72de4552ccd99ddef3e68e235195c44d5e9c8 100755 (executable)
--- a/tests/dbtest_ormobject.py
+++ b/tests/dbtest_ormobject.py
@@ -4,7 +4,13 @@ from db_test import DBDakTestCase
 
 from daklib.dbconn import Architecture, Suite
 
-import json
+try:
+    # python >= 2.6
+    import json
+except:
+    # python <= 2.5
+    import simplejson as json
+
 import re
 import unittest