[GNUnet-SVN] [taler-taler-util] branch master updated: use assertIsNone method for tests, introduced in 3.1

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository taler-util.

The following commit(s) were added to refs/heads/master by this push:
     new 2f93844  use assertIsNone method for tests, introduced in 3.1
2f93844 is described below

commit 2f9384498f26f382452e41440dd0fa1f45935ea1
Author: ng0 <address@hidden>
AuthorDate: Tue Sep 24 17:18:18 2019 +0000

    use assertIsNone method for tests, introduced in 3.1
---
 .gitignore                |  1 +
 taler/util/gnunet_log.py  |  8 ++++----
 taler/util/talerconfig.py |  4 ++--
 tests/log_test.py         | 24 ++++++++++++------------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 633e0fc..6ad8695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ dist/
 *~
 \#*\#
 __pycache__
+*.pyc
\ No newline at end of file
diff --git a/taler/util/gnunet_log.py b/taler/util/gnunet_log.py
index 0753fbd..b5847cf 100755
--- a/taler/util/gnunet_log.py
+++ b/taler/util/gnunet_log.py
@@ -70,7 +70,7 @@ class LogDefinition:
         if match:
             return dict(min=int(match.group(1)),
                         max=int(match.group(3) if match.group(3) else 
match.group(1)))
-    
+
         # just match every line if bad interval was provided.
         return dict(min=0, max=float("inf"))
 
@@ -90,7 +90,7 @@ class GnunetLoglevel:
 
     def __str__(self):
         return self.string
-    
+
     def getLevel(self):
         return self.level
 
@@ -232,7 +232,7 @@ class GnunetLogger:
         # (1) GNUNET_FORCE_LOG was given and no definition was
         #     found for this component (neither forced nor unforced).
         #     Possibly, there also exists a default loglevel.
-        
+
         if self.loglevel:
             self.logger.setLevel(
                 level=self.loglevel.getLevel())
@@ -240,7 +240,7 @@ class GnunetLogger:
         # (2) GNUNET_FORCE_LOG was NOT given and neither was
         #     a default loglevel, and also a unforced definition
         #     wasn't found.  Must assign a made-up loglevel.
-        
+
         else:
             self.logger.setLevel(level=logging.INFO)
 
diff --git a/taler/util/talerconfig.py b/taler/util/talerconfig.py
index 9c72a1d..a0c2ce3 100644
--- a/taler/util/talerconfig.py
+++ b/taler/util/talerconfig.py
@@ -514,9 +514,9 @@ class TalerConfig:
     #
     # @param self the object itself, that will be dumped.
     def dump(self) -> None:
-        for kv_section in self.sections.items():
+        for kv_section in list(self.sections.items()):
             print("[%s]" % (kv_section[1].section_name,))
-            for kv_option in kv_section[1].items():
+            for kv_option in list(kv_section[1].items()):
                 print("%s = %s # %s" % \
                       (kv_option[1].option,
                        kv_option[1].value,
diff --git a/tests/log_test.py b/tests/log_test.py
index 098dc53..268e176 100755
--- a/tests/log_test.py
+++ b/tests/log_test.py
@@ -104,8 +104,8 @@ class TestGnunetLog(TestCase):
     @patch("logging.basicConfig")
     def test_no_env_and_no_setup(self, mocked_basicConfig, mocked_setLevel):
         # Double-check no env variable gets in the way.
-        assert None == os.environ.get("GNUNET_FORCE_LOG")
-        assert None == os.environ.get("GNUNET_LOG")
+        self.assertIsNone(os.environ.get("GNUNET_FORCE_LOG"))
+        self.assertIsNone(os.environ.get("GNUNET_LOG"))
         gl = GL("gnunet-pylog")
         gl.log("msg", gl.DEBUG)
         mocked_setLevel.assert_called_with(level=logging.INFO)
@@ -124,7 +124,7 @@ class TestGnunetLog(TestCase):
     @patch("logging.Logger.setLevel")
     @patch("logging.basicConfig")
     def test_non_forced_env(self, mocked_basicConfig, mocked_setLevel):
-        assert None == os.environ.get("GNUNET_FORCE_LOG")
+        self.assertIsNone(os.environ.get("GNUNET_FORCE_LOG"))
         os.environ["GNUNET_LOG"] = 
"gnunet-pylog;log_test.py;test_non_forced_env;99;ERROR" # lineno is not 100% 
accurate.
         gl = GL("gnunet-pylog")
         gl.log("msg", gl.DEBUG)
@@ -143,7 +143,7 @@ class TestGnunetLog(TestCase):
     @patch("logging.Logger.setLevel")
     @patch("logging.basicConfig")
     def test_only_forced_env(self, mocked_basicConfig, mocked_setLevel):
-        assert None == os.environ.get("GNUNET_LOG")
+        self.assertIsNone(os.environ.get("GNUNET_LOG"))
         os.environ["GNUNET_FORCE_LOG"] = 
"gnunet-pylog;log_test.py;test_only_forced_env;90-200;ERROR"
         gl = GL("gnunet-pylog")
         gl.log("msg", gl.DEBUG)
@@ -161,8 +161,8 @@ class TestGnunetLog(TestCase):
     @patch("logging.Logger.setLevel")
     @patch("logging.basicConfig")
     def test_only_manual_loglevel_setup(self, mocked_basicConfig, 
mocked_setLevel):
-        assert None == os.environ.get("GNUNET_LOG")
-        assert None == os.environ.get("GNUNET_FORCE_LOG")
+        self.assertIsNone(os.environ.get("GNUNET_LOG"))
+        self.assertIsNone(os.environ.get("GNUNET_FORCE_LOG"))
         gl = GL("gnunet-pylog")
         gl.setup(gl.ERROR)
         gl.log("msg", gl.DEBUG)
@@ -182,8 +182,8 @@ class TestGnunetLog(TestCase):
     @patch("logging.Logger.setLevel")
     @patch("logging.basicConfig")
     def test_manual_loglevel_AND_forced_env(self, mocked_basicConfig, 
mocked_setLevel):
-        assert None == os.environ.get("GNUNET_LOG")
-        assert None == os.environ.get("GNUNET_FORCE_LOG")
+        self.assertIsNone(os.environ.get("GNUNET_LOG"))
+        self.assertIsNone(os.environ.get("GNUNET_FORCE_LOG"))
 
         # forced env definition (*before* object creation)
         os.environ["GNUNET_FORCE_LOG"] = ";;;;ERROR"
@@ -208,8 +208,8 @@ class TestGnunetLog(TestCase):
     @patch("logging.Logger.setLevel")
     @patch("logging.basicConfig")
     def test_manual_loglevel_AND_nonforced_env(self, mocked_basicConfig, 
mocked_setLevel):
-        assert None == os.environ.get("GNUNET_LOG")
-        assert None == os.environ.get("GNUNET_FORCE_LOG")
+        self.assertIsNone(os.environ.get("GNUNET_LOG"))
+        self.assertIsNone(os.environ.get("GNUNET_FORCE_LOG"))
         os.environ["GNUNET_LOG"] = ";;;;DEBUG"
         gl = GL("gnunet-pylog")
         gl.setup(gl.ERROR)
@@ -229,8 +229,8 @@ class TestGnunetLog(TestCase):
     @patch("logging.Logger.setLevel")
     @patch("logging.basicConfig")
     def test_forced_env_AND_nonforced_env(self, mocked_basicConfig, 
mocked_setLevel):
-        assert None == os.environ.get("GNUNET_LOG")
-        assert None == os.environ.get("GNUNET_FORCE_LOG")
+        self.assertIsNone(os.environ.get("GNUNET_LOG"))
+        self.assertIsNone(os.environ.get("GNUNET_FORCE_LOG"))
         os.environ["GNUNET_LOG"] = ";;;;DEBUG"
         os.environ["GNUNET_FORCE_LOG"] = ";;;;ERROR"
         gl = GL("gnunet-pylog")

-- 
To stop receiving notification emails like this one, please contact
address@hidden.