Skip to content

Commit

Permalink
git-remote-testpy: call print as a function
Browse files Browse the repository at this point in the history
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>
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
johnkeeping authored and gitster committed Jan 25, 2013
1 parent d04c94a commit f9640ac
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions git-remote-testpy.py
Expand Up @@ -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)

Expand All @@ -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):
Expand All @@ -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):
Expand Down Expand Up @@ -164,15 +164,15 @@ 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')

repo = update_local_repo(repo)
repo.exporter.export_repo(repo.gitdir, refs)

print "done"
print("done")


def do_export(repo, args):
Expand All @@ -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 = {
Expand Down

0 comments on commit f9640ac

Please sign in to comment.