fix pylint error on python3.10 on ubuntu22.04

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

diff --git a/gitbuildsys/conf.py b/gitbuildsys/conf.py
index 333c59527b3c53d568cd32fa37bbea638b24ffff..0f46df31eaa9159dc1a011be13ec4b2dc08e8cf2 100644 (file)
--- a/gitbuildsys/conf.py
+++ b/gitbuildsys/conf.py
@@ -378,7 +378,7 @@ url = http://download.tizen.org/releases/daily/trunk/ivi/latest/
     def _get(self, opt, section='general'):
         'get value from multi-levels of config file'
         sect_found = True
-        global gerr
+        gerr = None
         for cfgparser in self._cfgparsers:
             try:
                 return cfgparser.get(section, opt)
@@ -393,12 +393,14 @@ url = http://download.tizen.org/releases/daily/trunk/ivi/latest/
     def options(self, section='general'):
         'merge and return options of certain section from multi-levels'
         sect_found = False
+        gerr = None
         options = set()
         for cfgparser in self._cfgparsers:
             try:
                 options.update(cfgparser.options(section))
                 sect_found = True
             except Error as err:
+                gerr = err
                 pass
 
         if not sect_found:

diff --git a/gitbuildsys/oscapi.py b/gitbuildsys/oscapi.py
index 23afe392cc1f0754a3b827166aa106c0ff10c3e3..3d5cbee731406d6a2872fc02da408e921809bbed 100644 (file)
--- a/gitbuildsys/oscapi.py
+++ b/gitbuildsys/oscapi.py
@@ -54,6 +54,8 @@ class OSC(object):
         if oscrc:
             try:
                 conf.get_config(override_conffile=oscrc)
+            except urllib.error.URLError:
+                raise ObsError("invalid service apiurl: %s" % apiurl)
             except OSError as err:
                 if err.errno == 1:
                     # permission problem, should be the chmod(0600) issue
@@ -61,8 +63,6 @@ class OSC(object):
                                    'for specified oscrc: %s' % oscrc)
 
                 raise # else
-            except urllib.error.URLError:
-                raise ObsError("invalid service apiurl: %s" % apiurl)
         else:
             conf.get_config()
 

diff --git a/tests/test_changelog.py b/tests/test_changelog.py
index a93c09f9daf6c8c574b8b63b7291fb50bd5ef9d6..68f7ab6328d744aa93d46205572dae8288f594fd 100644 (file)
--- a/tests/test_changelog.py
+++ b/tests/test_changelog.py
@@ -32,7 +32,7 @@ from gbp.git.repository import GitRepository
 
 from gitbuildsys.errors import GbsError
 
-GBS = SourceFileLoader("gbs", "./tools/gbs").load_module().main
+GBS = SourceFileLoader("gbs", "./tools/gbs").load_module("gbs").main
 ENV = {}
 
 TEST_SPEC_CONTENT = """

diff --git a/tests/test_export.py b/tests/test_export.py
index 007f5e2f1e048893d3baf8296c3765170087fe3b..a977439f00033af56f72115df9dbb103f8e26aba 100644 (file)
--- a/tests/test_export.py
+++ b/tests/test_export.py
@@ -8,7 +8,7 @@ import shutil
 import tempfile
 from nose.tools import eq_
 
-GBS = SourceFileLoader("gbs", "./tools/gbs").load_module().main
+GBS = SourceFileLoader("gbs", "./tools/gbs").load_module("gbs").main
 class TestExport(unittest.TestCase):
     """Test export output of gbs commands"""
 

diff --git a/tests/test_help.py b/tests/test_help.py
index 643fee5b252bdcdb06eb7623c88df49b916a7c74..76483ffee1a8382141a81e5f77a0b78aceef8cdc 100644 (file)
--- a/tests/test_help.py
+++ b/tests/test_help.py
@@ -23,7 +23,7 @@ from importlib.machinery import SourceFileLoader
 
 from nose.tools import eq_
 
-GBS = SourceFileLoader("gbs", "./tools/gbs").load_module().main
+GBS = SourceFileLoader("gbs", "./tools/gbs").load_module("gbs").main
 class TestHelp(unittest.TestCase):
     """Test help output of gbs commands"""
 

diff --git a/tests/test_import.py b/tests/test_import.py
index 494a7179adb0110d4432a5e3087ecfe18f61aa38..799e300366d75a0d5a9acc99c50df896bb1fb315 100644 (file)
--- a/tests/test_import.py
+++ b/tests/test_import.py
@@ -32,7 +32,7 @@ from gitbuildsys.errors import GbsError
 
 from gbp.git.repository import GitRepository
 
-GBS = SourceFileLoader("gbs", "./tools/gbs").load_module().main
+GBS = SourceFileLoader("gbs", "./tools/gbs").load_module("gbs").main
 
 def with_data(fname):
     """