some subtle py3-related fixes (bytes vs str in config-related actions)

mercurial_keyring.py

@@ -269,7 +269,7 b' class PwdCache(object):'
         return self._cache.get(cache_key)
 
 
-_re_http_url = re.compile(r'^https?://')
+_re_http_url = re.compile(b'^https?://')
 
 
 def is_http_path(url):
@@ -457,12 +457,13 b' class HTTPPasswordHandler(object):'
         from mercurial.httpconnection import readauthforuri
         ui.debug(meu.ui_string("keyring: checking for hgrc info about url %s, user %s\n",
                                parsed_url, user))
-        res = readauthforuri(ui, str(parsed_url), user)
+
+        res = readauthforuri(ui, bytes(parsed_url), user)
         # If it user-less version not work, let's try with added username to handle
         # both config conventions
         if (not res) and user:
             parsed_url.user = user
-            res = readauthforuri(ui, str(parsed_url), user)
+            res = readauthforuri(ui, bytes(parsed_url), user)
             parsed_url.user = None
         if res:
             group, auth_token = res
@@ -470,15 +471,15 b' class HTTPPasswordHandler(object):'
             auth_token = None
 
         if auth_token:
-            username = auth_token.get('username')
-            password = auth_token.get('password')
-            prefix = auth_token.get('prefix')
+            username = auth_token.get(b'username')
+            password = auth_token.get(b'password')
+            prefix = auth_token.get(b'prefix')
         else:
             username = user
             password = None
             prefix = None
 
-        password_url = self.password_url(str(parsed_url), prefix)
+        password_url = self.password_url(bytes(parsed_url), prefix)
 
         ui.debug(meu.ui_string("keyring: Password url: %s, user: %s, password: %s (prefix: %s)\n",
                                password_url, username,
@@ -519,15 +520,15 b' class HTTPPasswordHandler(object):'
         """Calculates actual url identifying the password. Takes
         configured prefix under consideration (so can be shorter
         than repo url)"""
-        if not prefix or prefix == '*':
+        if not prefix or prefix == b'*':
             return base_url
-        scheme, hostpath = base_url.split('://', 1)
-        p = prefix.split('://', 1)
+        scheme, hostpath = base_url.split(b'://', 1)
+        p = prefix.split(b'://', 1)
         if len(p) > 1:
             prefix_host_path = p[1]
         else:
             prefix_host_path = prefix
-        password_url = scheme + '://' + prefix_host_path
+        password_url = scheme + b'://' + prefix_host_path
         return password_url
 
     @staticmethod
@@ -787,7 +788,7 b' def cmd_keyring_check(ui, repo, *path_ar'
     are HTTP-like.
     """
     defined_paths = [(name, url)
-                     for name, url in ui.configitems('paths')]
+                     for name, url in ui.configitems(b'paths')]
     if path_args:
         # Maybe parameter is an alias
         defined_paths_dic = dict(defined_paths)