[tracker/functional-test: 17/18] Data generators are now python2.3 friendly

[Ivan Frade <ifrade src gnome org>]

commit cb295728fe24ac949e013581f4042ca025a691d5
Author: Ivan Frade <ivan frade nokia com>
Date:   Wed Aug 18 19:16:01 2010 +0300

    Data generators are now python2.3 friendly

 utils/data-generators/barnum/gen_data.py |    1 -
 utils/data-generators/cc/gen_data.py     |    1 -
 utils/data-generators/cc/generate        |   22 +++++++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/utils/data-generators/barnum/gen_data.py b/utils/data-generators/barnum/gen_data.py
index 7179959..28202cf 100755
--- a/utils/data-generators/barnum/gen_data.py
+++ b/utils/data-generators/barnum/gen_data.py
@@ -28,7 +28,6 @@ import datetime
 import genpw
 import os
 import convert_data
-import subprocess
 
 DIRNAME = os.path.dirname(__file__)
 
diff --git a/utils/data-generators/cc/gen_data.py b/utils/data-generators/cc/gen_data.py
index b361f53..143ec2d 100755
--- a/utils/data-generators/cc/gen_data.py
+++ b/utils/data-generators/cc/gen_data.py
@@ -24,7 +24,6 @@ import calendar
 import datetime
 import os
 import convert_data
-import subprocess
 
 DIRNAME = os.path.dirname(__file__)
 
diff --git a/utils/data-generators/cc/generate b/utils/data-generators/cc/generate
index 45500f2..a046c98 100755
--- a/utils/data-generators/cc/generate
+++ b/utils/data-generators/cc/generate
@@ -5,6 +5,7 @@ import string
 import time
 import sys
 import ConfigParser
+import platform 
 
 import ontology_prefixes
 import tools
@@ -20,6 +21,13 @@ import nmo
 import mlo
 import tracker
 
+def recent_enough_python ():
+  """
+  True if it is 2.6 or more recent
+  """
+  print "Running generate with python", platform.python_version ()
+  version = platform.python_version_tuple ()
+  return (int(version[0]) >= 2 and int(version[1]) >= 6)
 
 ####################################################################################
 
@@ -31,13 +39,17 @@ if len(sys.argv) != 2:
 config = ConfigParser.RawConfigParser()
 try:
   loaded_files = config.read(sys.argv[1])
-except:
-  print "Failed to read configuration file %s" % (sys.argv[1])
+  # config.read 
+  #   in 2.3 return None
+  #   in 2.6+ returns a list of loaded files
+  if recent_enough_python ():
+    if (len (loaded_files) != 1):
+      print "Cannot open %s" % (sys.argv[1])
+      sys.exit (-1)
+except Exception, e:
+  print "Failed to read configuration file %s (%s)" % (sys.argv[1], e)
   sys.exit (-1)
 
-if (len(loaded_files) != 1):
-  print "Cannot open %s" % (sys.argv[1])
-  sys.exit (-1)
 
 # set up all known types
 tools.addType( 'nco#EmailAddress', 10 )