From: Sverre Rabbelier <srabbelier@gmail.com>
To: John Keeping <john@keeping.me.uk>
Cc: Junio C Hamano <gitster@pobox.com>,
Michael Haggerty <mhagger@alum.mit.edu>,
Git List <git@vger.kernel.org>, Pete Wyckoff <pw@padd.com>
Subject: Re: [PATCH v2 8/8] git-remote-testpy: call print as a function
Date: Thu, 17 Jan 2013 19:48:49 -0800 [thread overview]
Message-ID: <CAGdFq_hbstcUUUab42485oacdov4TS-f48e=spBSgi_jvBPCjw@mail.gmail.com> (raw)
In-Reply-To: <88502ee7b090454352b46d496741029817b27482.1358448207.git.john@keeping.me.uk>
Looks harmless enough.
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
On Thu, Jan 17, 2013 at 10:54 AM, John Keeping <john@keeping.me.uk> wrote:
> This is harmless in Python 2, which sees the parentheses as redundant
> grouping, but is required for Python 3. Since this is the only change
> required to make this script just run under Python 3 without needing
> 2to3 it seems worthwhile.
>
> The case of an empty print must be handled specially because in that
> case Python 2 will interpret '()' as an empty tuple and print it as
> '()'; inserting an empty string fixes this.
>
> Signed-off-by: John Keeping <john@keeping.me.uk>
> ---
> git-remote-testpy.py | 28 ++++++++++++++--------------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/git-remote-testpy.py b/git-remote-testpy.py
> index bc5e3cf..ccdb2dc 100644
> --- a/git-remote-testpy.py
> +++ b/git-remote-testpy.py
> @@ -87,9 +87,9 @@ def do_capabilities(repo, args):
> """Prints the supported capabilities.
> """
>
> - print "import"
> - print "export"
> - print "refspec refs/heads/*:%s*" % repo.prefix
> + print("import")
> + print("export")
> + print("refspec refs/heads/*:%s*" % repo.prefix)
>
> dirname = repo.get_base_path(repo.gitdir)
>
> @@ -98,11 +98,11 @@ def do_capabilities(repo, args):
>
> path = os.path.join(dirname, 'git.marks')
>
> - print "*export-marks %s" % path
> + print("*export-marks %s" % path)
> if os.path.exists(path):
> - print "*import-marks %s" % path
> + print("*import-marks %s" % path)
>
> - print # end capabilities
> + print('') # end capabilities
>
>
> def do_list(repo, args):
> @@ -115,16 +115,16 @@ def do_list(repo, args):
>
> for ref in repo.revs:
> debug("? refs/heads/%s", ref)
> - print "? refs/heads/%s" % ref
> + print("? refs/heads/%s" % ref)
>
> if repo.head:
> debug("@refs/heads/%s HEAD" % repo.head)
> - print "@refs/heads/%s HEAD" % repo.head
> + print("@refs/heads/%s HEAD" % repo.head)
> else:
> debug("@refs/heads/master HEAD")
> - print "@refs/heads/master HEAD"
> + print("@refs/heads/master HEAD")
>
> - print # end list
> + print('') # end list
>
>
> def update_local_repo(repo):
> @@ -164,7 +164,7 @@ def do_import(repo, args):
> ref = line[7:].strip()
> refs.append(ref)
>
> - print "feature done"
> + print("feature done")
>
> if os.environ.get("GIT_REMOTE_TESTGIT_FAILURE"):
> die('Told to fail')
> @@ -172,7 +172,7 @@ def do_import(repo, args):
> repo = update_local_repo(repo)
> repo.exporter.export_repo(repo.gitdir, refs)
>
> - print "done"
> + print("done")
>
>
> def do_export(repo, args):
> @@ -192,8 +192,8 @@ def do_export(repo, args):
> repo.non_local.push(repo.gitdir)
>
> for ref in changed:
> - print "ok %s" % ref
> - print
> + print("ok %s" % ref)
> + print('')
>
>
> COMMANDS = {
> --
> 1.8.1.1.260.g99b33f4.dirty
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Cheers,
Sverre Rabbelier
prev parent reply other threads:[~2013-01-18 3:49 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
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 [this message]
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='CAGdFq_hbstcUUUab42485oacdov4TS-f48e=spBSgi_jvBPCjw@mail.gmail.com' \
--to=srabbelier@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=mhagger@alum.mit.edu \
--cc=pw@padd.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).