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

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 Return-Path: <mercurial-devel-bounces@mercurial-scm.org> MIME-Version: 1.0 Subject: [PATCH 2 of 2] py3: convert string to bytes Message-Id: <f0e12f639da1cbb824dd.1489526551@bunty> In-Reply-To: <edfffaa46e84e546decb.1489526550@bunty> References: <edfffaa46e84e546decb.1489526550@bunty> User-Agent: Mercurial-patchbomb/4.1+268-a187fb369df5 Date: Wed, 15 Mar 2017 02:52:31 +0530 From: Rishabh Madan <rishabhmadan96@gmail.com> To: mercurial-devel@mercurial-scm.org Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

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

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

Comments

Patch