From: Michael Haggerty <mhagger@alum.mit.edu>
To: John Keeping <john@keeping.me.uk>
Cc: git@vger.kernel.org, "Eric S. Raymond" <esr@thyrsus.com>,
Felipe Contreras <felipe.contreras@gmail.com>,
Sverre Rabbelier <srabbelier@gmail.com>
Subject: Re: [PATCH 2/8] git_remote_helpers: fix input when running under Python 3
Date: Sun, 13 Jan 2013 04:26:39 +0100 [thread overview]
Message-ID: <50F2296F.8030909@alum.mit.edu> (raw)
In-Reply-To: <a8c3aabfab64f49fa0cbb2d45bda79997a875ee8.1358018078.git.john@keeping.me.uk>
On 01/12/2013 08:23 PM, John Keeping wrote:
> Although 2to3 will fix most issues in Python 2 code to make it run under
> Python 3, it does not handle the new strict separation between byte
> strings and unicode strings. There is one instance in
> git_remote_helpers where we are caught by this.
>
> Fix it by explicitly decoding the incoming byte string into a unicode
> string. In this instance, use the locale under which the application is
> running.
>
> Signed-off-by: John Keeping <john@keeping.me.uk>
> ---
> git_remote_helpers/git/importer.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git_remote_helpers/git/importer.py b/git_remote_helpers/git/importer.py
> index e28cc8f..6814003 100644
> --- a/git_remote_helpers/git/importer.py
> +++ b/git_remote_helpers/git/importer.py
> @@ -20,7 +20,7 @@ class GitImporter(object):
> """Returns a dictionary with refs.
> """
> args = ["git", "--git-dir=" + gitdir, "for-each-ref", "refs/heads"]
> - lines = check_output(args).strip().split('\n')
> + lines = check_output(args).decode().strip().split('\n')
> refs = {}
> for line in lines:
> value, name = line.split(' ')
>
Won't this change cause an exception if the branch names are not all
valid strings in the current locale's encoding? I don't see how this
assumption is justified (e.g., see git-check-ref-format(1) for the rules
governing reference names).
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
next prev parent reply other threads:[~2013-01-13 3:28 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-12 19:23 [PATCH 0/8] Initial support for Python 3 John Keeping
2013-01-12 19:23 ` [PATCH 1/8] git_remote_helpers: Allow building with " John Keeping
2013-01-12 19:23 ` [PATCH 2/8] git_remote_helpers: fix input when running under " John Keeping
2013-01-13 3:26 ` Michael Haggerty [this message]
2013-01-13 16:17 ` John Keeping
2013-01-14 4:48 ` Michael Haggerty
2013-01-14 9:47 ` John Keeping
2013-01-15 19:48 ` [RFC/PATCH 2/8 v2] " John Keeping
2013-01-15 20:51 ` Junio C Hamano
2013-01-15 21:54 ` John Keeping
2013-01-15 22:04 ` Junio C Hamano
2013-01-15 22:40 ` [RFC/PATCH 2/8 v3] " John Keeping
2013-01-16 0:03 ` Pete Wyckoff
2013-01-16 9:45 ` John Keeping
2013-01-17 0:29 ` Pete Wyckoff
2013-01-12 19:23 ` [PATCH 3/8] git_remote_helpers: Force rebuild if python version changes John Keeping
2013-01-12 23:30 ` Pete Wyckoff
2013-01-13 16:26 ` John Keeping
2013-01-13 17:14 ` Pete Wyckoff
2013-01-13 17:52 ` John Keeping
2013-01-15 22:58 ` John Keeping
2013-01-17 0:27 ` Pete Wyckoff
2013-01-12 19:23 ` [PATCH 4/8] git_remote_helpers: Use 2to3 if building with Python 3 John Keeping
2013-01-12 19:23 ` [PATCH 5/8] svn-fe: allow svnrdump_sim.py to run " John Keeping
2013-01-12 19:23 ` [PATCH 6/8] git-remote-testpy: hash bytes explicitly John Keeping
2013-01-12 19:23 ` [PATCH 7/8] git-remote-testpy: don't do unbuffered text I/O John Keeping
2013-01-12 19:23 ` [PATCH 8/8] git-remote-testpy: call print as a function John Keeping
2013-01-12 23:43 ` [PATCH 0/8] Initial support for Python 3 Pete Wyckoff
2013-01-13 0:41 ` John Keeping
2013-01-13 12:34 ` John Keeping
2013-01-13 16:40 ` Pete Wyckoff
2013-01-13 17:35 ` John Keeping
2013-01-17 18:53 ` [PATCH v2 0/8] Initial Python 3 support John Keeping
2013-01-17 18:53 ` [PATCH v2 1/8] git_remote_helpers: allow building with Python 3 John Keeping
2013-01-17 18:53 ` [PATCH v2 2/8] git_remote_helpers: fix input when running under " John Keeping
2013-01-17 18:53 ` [PATCH v2 3/8] git_remote_helpers: force rebuild if python version changes John Keeping
2013-01-17 18:53 ` [PATCH v2 4/8] git_remote_helpers: use 2to3 if building with Python 3 John Keeping
2013-01-18 5:15 ` Sverre Rabbelier
2013-01-18 10:32 ` John Keeping
2013-01-19 7:52 ` Sverre Rabbelier
2013-01-17 18:53 ` [PATCH v2 5/8] svn-fe: allow svnrdump_sim.py to run " John Keeping
2013-01-17 18:53 ` [PATCH v2 6/8] git-remote-testpy: hash bytes explicitly John Keeping
2013-01-17 20:36 ` Junio C Hamano
2013-01-17 20:43 ` Junio C Hamano
2013-01-17 21:00 ` John Keeping
2013-01-17 21:05 ` John Keeping
2013-01-17 22:24 ` Junio C Hamano
2013-01-17 22:30 ` John Keeping
2013-01-17 22:57 ` Junio C Hamano
2013-01-17 18:54 ` [PATCH v2 7/8] git-remote-testpy: don't do unbuffered text I/O John Keeping
2013-01-18 3:50 ` Sverre Rabbelier
2013-01-17 18:54 ` [PATCH v2 8/8] git-remote-testpy: call print as a function John Keeping
2013-01-18 3:48 ` Sverre Rabbelier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50F2296F.8030909@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=esr@thyrsus.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=srabbelier@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).