From ea7e9bf31a699382f6022e52e97c23456f29824f Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mnauw@users.sourceforge.net>
Date: Sat, 22 Oct 2022 18:45:42 +0200
Subject: [PATCH] helper: align getenv compatibility helper

---
 git-hg-helper | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/git-hg-helper b/git-hg-helper
index da97783..e3804fd 100755
--- a/git-hg-helper
+++ b/git-hg-helper
@@ -56,7 +56,13 @@ if sys.version_info[0] == 3:
         stdout = sys.stdout.buffer
         stderr = sys.stderr.buffer
         getcwd = os.getcwdb
-        getenv = os.getenvb if os.supports_bytes_environ else os.getenv
+        @staticmethod
+        def getenvb(val, default):
+            result = os.getenv(val.decode(), default.decode() if hasattr(default, 'decode') else default)
+             # if result is a string, get bytes instead
+            result = result.encode() if hasattr(result, 'encode') else result
+            return result
+        getenv = os.getenvb if os.supports_bytes_environ else getenvb
 else:
     class compat(basecompat):
         # life was simple in those days ...