--- a/hgext/fastannotate/context.py	Fri Sep 01 12:11:11 2023 +0200
+++ b/hgext/fastannotate/context.py	Thu Aug 31 01:19:49 2023 +0200
@@ -151,7 +151,10 @@
 
 def hashdiffopts(diffopts):
     diffoptstr = stringutil.pprint(
-        sorted((k, getattr(diffopts, k)) for k in mdiff.diffopts.defaults)
+        sorted(
+            (k, getattr(diffopts, pycompat.sysstr(k)))
+            for k in mdiff.diffopts.defaults
+        )
     )
     return hex(hashutil.sha1(diffoptstr).digest())[:6]