Patchwork [2,of,2] py3: convert string to bytes

login
register
mail settings
Submitter Rishabh Madan
Date March 14, 2017, 9:22 p.m.
Message ID <f0e12f639da1cbb824dd.1489526551@bunty>
Download mbox | patch
Permalink /patch/19341/
State Changes Requested
Headers show

Comments

Rishabh Madan - March 14, 2017, 9:22 p.m.
# HG changeset patch
# User Rishabh Madan <rishabhmadan96@gmail.com>
# Date 1489522681 -19800
#      Wed Mar 15 01:48:01 2017 +0530
# Node ID f0e12f639da1cbb824dd43870734969888ba369d
# Parent  edfffaa46e84e546decb48107bc303888ee5501d
py3: convert string to bytes
Pulkit Goyal - March 15, 2017, 8:49 a.m.
We will not require this one when we fix the open call.

On Wed, Mar 15, 2017 at 2:52 AM, Rishabh Madan <rishabhmadan96@gmail.com>
wrote:

> # HG changeset patch
> # User Rishabh Madan <rishabhmadan96@gmail.com>
> # Date 1489522681 -19800
> #      Wed Mar 15 01:48:01 2017 +0530
> # Node ID f0e12f639da1cbb824dd43870734969888ba369d
> # Parent  edfffaa46e84e546decb48107bc303888ee5501d
> py3: convert string to bytes
>
> diff -r edfffaa46e84 -r f0e12f639da1 mercurial/match.py
> --- a/mercurial/match.py        Wed Mar 15 00:02:12 2017 +0530
> +++ b/mercurial/match.py        Wed Mar 15 01:48:01 2017 +0530
> @@ -763,7 +763,7 @@
>              except KeyError:
>                  if warn:
>                      warn(_("%s: ignoring invalid syntax '%s'\n") %
> -                         (filepath, s))
> +                         (filepath, s.encode('latin-1')))
>              continue
>
>          linesyntax = syntax
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>

Patch

diff -r edfffaa46e84 -r f0e12f639da1 mercurial/match.py
--- a/mercurial/match.py	Wed Mar 15 00:02:12 2017 +0530
+++ b/mercurial/match.py	Wed Mar 15 01:48:01 2017 +0530
@@ -763,7 +763,7 @@ 
             except KeyError:
                 if warn:
                     warn(_("%s: ignoring invalid syntax '%s'\n") %
-                         (filepath, s))
+                         (filepath, s.encode('latin-1')))
             continue
 
         linesyntax = syntax