From 29f23e04401c8d15b46b7153887b96559b713c12 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Thu, 10 Mar 2016 14:52:25 +1100
Subject: sb: Fix configparser import on Python2 in version.py.

Updates #2619.
---
 source-builder/sb-set-builder | 2 --
 source-builder/sb/version.py  | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/source-builder/sb-set-builder b/source-builder/sb-set-builder
index 52e122b..561199e 100755
--- a/source-builder/sb-set-builder
+++ b/source-builder/sb-set-builder
@@ -24,8 +24,6 @@ import sys, os
 base = os.path.dirname(sys.argv[0])
 sys.path.insert(0, base + '/sb')
 
-import setbuilder
-
 try:
     import setbuilder
     setbuilder.run()
diff --git a/source-builder/sb/version.py b/source-builder/sb/version.py
index 8b67b4e..07ab018 100644
--- a/source-builder/sb/version.py
+++ b/source-builder/sb/version.py
@@ -50,7 +50,10 @@ def _load_released_version_config():
     top = _top()
     for ver in [top, '..']:
         if path.exists(path.join(ver, 'VERSION')):
-            import configparser
+            try:
+                import configparser
+            except ImportError:
+                import ConfigParser as configparser
             v = configparser.SafeConfigParser()
             v.read(path.join(ver, 'VERSION'))
             return v
-- 
cgit v1.2.3