From 0be4277dbfabbd0be144093c64c6dc3333319869 Mon Sep 17 00:00:00 2001
From: "biao716.wang" <biao716.wang@samsung.com>
Date: Wed, 9 Nov 2022 19:29:48 +0900
Subject: [PATCH] change imp module to importlib module in pytnon3

Change-Id: Ib4db90f56239667ef95d896b8cd0b23c9ba4f3e7
Signed-off-by: biao716.wang <biao716.wang@samsung.com>
---
 tests/test_changelog.py | 4 ++--
 tests/test_export.py    | 6 +++---
 tests/test_help.py      | 5 ++---
 tests/test_import.py    | 4 ++--
 tools/gbs               | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/tests/test_changelog.py b/tests/test_changelog.py
index e42da63..1078863 100644
--- 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 2408bf5..a1bfe16 100644
--- 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 186366a..ccb77f9 100644
--- 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 1eabbca..512dd71 100644
--- 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 7d920f0..e70c64b 100755
--- 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]
 
-- 
2.34.1