change imp module to importlib module in pytnon3

Change-Id: Ib4db90f56239667ef95d896b8cd0b23c9ba4f3e7
Signed-off-by: biao716.wang <biao716.wang@samsung.com>

diff --git a/tests/test_changelog.py b/tests/test_changelog.py
index e42da6373324ed99b983edfa63b99f810a59f92f..1078863a2411c095eb1c5654244ffcdf517bf29c 100644 (file)
--- a/tests/test_changelog.py
+++ b/tests/test_changelog.py
@@ -22,7 +22,7 @@ import os
 import shutil
 import unittest
 import tempfile
-import imp
+from importlib.machinery import SourceFileLoader
 import datetime
 import time
 
@@ -32,7 +32,7 @@ from gbp.git.repository import GitRepository
 
 from gitbuildsys.errors import GbsError
 
-GBS = imp.load_source("gbs", "./tools/gbs").main
+GBS = SourceFileLoader("gbs", "../tools/gbs").load_module().main
 ENV = {}
 
 TEST_SPEC_CONTENT = """

diff --git a/tests/test_export.py b/tests/test_export.py
index 2408bf5a0ef2d7535fa52d54f9e642805a0f9f4f..a1bfe16c53a90ecce7b9525a41312c64ddf8f184 100644 (file)
--- a/tests/test_export.py
+++ b/tests/test_export.py
@@ -1,14 +1,14 @@
 """Functionality tests for gbs export."""
 
 import unittest
-import imp
+from importlib.machinery import SourceFileLoader
+
 import os
 import shutil
 import tempfile
 from nose.tools import eq_
 
-GBS = imp.load_source("gbs", "./tools/gbs").main
-
+GBS = SourceFileLoader("gbs", "../tools/gbs").load_module().main
 class TestExport(unittest.TestCase):
     """Test export output of gbs commands"""
 

diff --git a/tests/test_help.py b/tests/test_help.py
index 186366a034cf89476811f570372d24e60adc6e3c..ccb77f9c078ea96f3566778fe4e67b4566b75035 100644 (file)
--- a/tests/test_help.py
+++ b/tests/test_help.py
@@ -19,12 +19,11 @@
 """Functionality tests for gbs help."""
 
 import unittest
-import imp
+from importlib.machinery import SourceFileLoader
 
 from nose.tools import eq_
 
-GBS = imp.load_source("gbs", "./tools/gbs").main
-
+GBS = SourceFileLoader("gbs", "../tools/gbs").load_module().main
 class TestHelp(unittest.TestCase):
     """Test help output of gbs commands"""
 

diff --git a/tests/test_import.py b/tests/test_import.py
index 1eabbca7ef96acd06c236a3d24edbe1063649eb4..512dd713403c919376c4e10c024ff5efea6ac9c8 100644 (file)
--- a/tests/test_import.py
+++ b/tests/test_import.py
@@ -22,7 +22,7 @@ import os
 import shutil
 import unittest
 import tempfile
-import imp
+from importlib.machinery import SourceFileLoader
 
 from functools import wraps
 
@@ -32,7 +32,7 @@ from gitbuildsys.errors import GbsError
 
 from gbp.git.repository import GitRepository
 
-GBS = imp.load_source("gbs", "./tools/gbs").main
+GBS = SourceFileLoader("gbs", "../tools/gbs").load_module().main
 
 def with_data(fname):
     """

diff --git a/tools/gbs b/tools/gbs
index 7d920f01d4ae95e0ada46d481a0fafe1a7fe1246..e70c64b85106ee4dc04da335433c3075d088e263 100755 (executable)
--- a/tools/gbs
+++ b/tools/gbs
@@ -702,7 +702,7 @@ def main(argv):
 
     # collect aliases
     aliases = {}
-    for name, obj in globals().iteritems():
+    for name, obj in globals().items():
         if name.endswith('_parser') and callable(obj):
             aliases[obj(subparsers).get_default('alias')] = name.split('_')[0]