Merge pull request #1471 from dmach/Password.encode

Fix Password.encode() on python < 3.8

osc/conf.py

@@ -119,6 +119,12 @@ def __format__(self, format_spec):
             return f"{self.__str__():{format_spec}}"
         return super().__format__(format_spec)
 
+    def encode(self, *args, **kwargs):
+        if sys.version_info < (3, 8):
+            # avoid returning the Password object on python < 3.8
+            return str(self).encode(*args, **kwargs)
+        return super().encode(*args, **kwargs)
+
 
 HttpHeader = NewType("HttpHeader", Tuple[str, str])
 

tests/test_credentials.py

@@ -0,0 +1,17 @@
+import unittest
+
+import osc.conf
+from osc.credentials import ObfuscatedConfigFileCredentialsManager
+
+
+class TestObfuscatedConfigFileCredentialsManager(unittest.TestCase):
+    def test_decode_password(self):
+        # obfuscated "opensuse"
+        password_str = "QlpoOTFBWSZTWeTSblkAAAGBgAIBygAgADDACGNEHxaYXckU4UJDk0m5ZA=="
+        password = osc.conf.Password(password_str)
+        decoded = ObfuscatedConfigFileCredentialsManager.decode_password(password)
+        self.assertEqual(decoded, "opensuse")
+
+
+if __name__ == "__main__":
+    unittest.main()