mercurial/scmwindows.py

--- a/mercurial/scmwindows.py	Sun Oct 06 09:45:02 2019 -0400
+++ b/mercurial/scmwindows.py	Sun Oct 06 09:48:39 2019 -0400
@@ -17,7 +17,7 @@
     import winreg
 
 # MS-DOS 'more' is the only pager available by default on Windows.
-fallbackpager = 'more'
+fallbackpager = b'more'
 
 
 def systemrcpath():
@@ -25,39 +25,39 @@
     rcpath = []
     filename = win32.executablepath()
     # Use mercurial.ini found in directory with hg.exe
-    progrc = os.path.join(os.path.dirname(filename), 'mercurial.ini')
+    progrc = os.path.join(os.path.dirname(filename), b'mercurial.ini')
     rcpath.append(progrc)
     # Use hgrc.d found in directory with hg.exe
-    progrcd = os.path.join(os.path.dirname(filename), 'hgrc.d')
+    progrcd = os.path.join(os.path.dirname(filename), b'hgrc.d')
     if os.path.isdir(progrcd):
         for f, kind in util.listdir(progrcd):
-            if f.endswith('.rc'):
+            if f.endswith(b'.rc'):
                 rcpath.append(os.path.join(progrcd, f))
     # else look for a system rcpath in the registry
     value = util.lookupreg(
-        'SOFTWARE\\Mercurial', None, winreg.HKEY_LOCAL_MACHINE
+        b'SOFTWARE\\Mercurial', None, winreg.HKEY_LOCAL_MACHINE
     )
     if not isinstance(value, str) or not value:
         return rcpath
     value = util.localpath(value)
     for p in value.split(pycompat.ospathsep):
-        if p.lower().endswith('mercurial.ini'):
+        if p.lower().endswith(b'mercurial.ini'):
             rcpath.append(p)
         elif os.path.isdir(p):
             for f, kind in util.listdir(p):
-                if f.endswith('.rc'):
+                if f.endswith(b'.rc'):
                     rcpath.append(os.path.join(p, f))
     return rcpath
 
 
 def userrcpath():
     '''return os-specific hgrc search path to the user dir'''
-    home = os.path.expanduser('~')
-    path = [os.path.join(home, 'mercurial.ini'), os.path.join(home, '.hgrc')]
-    userprofile = encoding.environ.get('USERPROFILE')
+    home = os.path.expanduser(b'~')
+    path = [os.path.join(home, b'mercurial.ini'), os.path.join(home, b'.hgrc')]
+    userprofile = encoding.environ.get(b'USERPROFILE')
     if userprofile and userprofile != home:
-        path.append(os.path.join(userprofile, 'mercurial.ini'))
-        path.append(os.path.join(userprofile, '.hgrc'))
+        path.append(os.path.join(userprofile, b'mercurial.ini'))
+        path.append(os.path.join(userprofile, b'.hgrc'))
     return path