From: John Keeping <john@keeping.me.uk>
To: Pete Wyckoff <pw@padd.com>
Cc: git@vger.kernel.org, "Eric S. Raymond" <esr@thyrsus.com>,
Felipe Contreras <felipe.contreras@gmail.com>,
Sverre Rabbelier <srabbelier@gmail.com>,
Sebastian Morr <sebastian@morr.cc>
Subject: Re: [PATCH 0/8] Initial support for Python 3
Date: Sun, 13 Jan 2013 12:34:04 +0000 [thread overview]
Message-ID: <20130113123404.GJ4574@serenity.lan> (raw)
In-Reply-To: <20130113004129.GH4574@serenity.lan>
On Sun, Jan 13, 2013 at 12:41:30AM +0000, John Keeping wrote:
> On Sat, Jan 12, 2013 at 06:43:04PM -0500, Pete Wyckoff wrote:
>> Can you give me some hints about the byte/unicode string issues
>> in git-p4.py? There's really only one place that does:
>>
>> p4 = subprocess.Popen("p4 -G ...")
>> marshal.load(p4.stdout)
>>
>> If that's the only issue, this might not be too paniful.
>
> The problem is that what gets loaded there is a dictionary (encoded by
> p4) that maps byte strings to byte strings, so all of the accesses to
> that dictionary need to either:
>
> 1) explicitly call encode() on a string constant
> or 2) use a byte string constant with a "b" prefix
>
> Or we could re-write the dictionary once, which handles the keys... but
> some of the values are also used as strings and we can't handle that as
> a one-off conversion since in other places we really do want the byte
> string (think content of binary files).
>
> Basically a thorough audit of all access to variables that come from p4
> would be needed, with explicit decode()s for authors, dates, etc.
Having thought about this a bit more, another possibility would be to
apply this transformation once using something like this (completely
untested, I haven't looked up the keys of interest):
-- >8 --
def _noop(s):
return s
def _decode(s):
return s.decode('utf-8')
CONVERSION_MAP = {
'user': _decode,
'data': _decode
}
d = marshal.load(p4.stdout)
retval = {}
for k, v in d.items():
key = k.decode('utf-8')
retval[key] = CONVERSION_MAP.get(key, _noop)(v)
return retval
-- 8< --
Obviously this isn't ideal but without p4 gaining a Python 3 output mode
I suspect this would be the best we could do.
John
next prev parent reply other threads:[~2013-01-13 12:34 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
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 [this message]
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=20130113123404.GJ4574@serenity.lan \
--to=john@keeping.me.uk \
--cc=esr@thyrsus.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=pw@padd.com \
--cc=sebastian@morr.cc \
--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).