subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1742840 - in /subversion/trunk: build/ contrib/client-side/ contrib/client-side/svnmerge/ contrib/hook-scripts/ contrib/server-side/ contrib/server-side/fsfsfixer/fixer/ notes/directory-index/ subversion/tests/cmdline/svntest/ subversion/t...
Date Sun, 08 May 2016 17:34:41 GMT
Author: stefan2
Date: Sun May  8 17:34:40 2016
New Revision: 1742840

URL: http://svn.apache.org/viewvc?rev=1742840&view=rev
Log:
Yet another round of making our usage of "print" syntactically compatible
with Python 2 and 3 alike.

This is probably the last mass change in the py2/3 compatibility patch set.
Following commits will be a lot more local and specific.

* build/run_tests.py
* contrib/client-side/incremental-update.py
* contrib/client-side/svn_export_empty_files.py
* contrib/client-side/svn-hgmerge.py
* contrib/client-side/svnmerge/svnmerge-migrate-history.py
* contrib/client-side/svnmerge/svnmerge.py
* contrib/client-side/svn-merge-vendor.py
* contrib/hook-scripts/hook_toolbox.py
* contrib/hook-scripts/remove-zombie-locks.py
* contrib/server-side/fsfsfixer/fixer/find_good_id.py
* contrib/server-side/fsfsfixer/fixer/fix-rev.py
* contrib/server-side/fsfsverify.py
* notes/directory-index/dirindex.py
* subversion/tests/cmdline/svntest/main.py
* subversion/tests/manual/tree-conflicts-add-vs-add.py
* tools/dev/benchmarks/RepoPerf/win_repo_bench.py
* tools/dev/benchmarks/suite1/benchmark.py
* tools/dev/gen-py-errors.py
* tools/dev/merge-graph.py
* tools/dev/wc-ng/bump-to-19.py
* tools/dist/collect_sigs.py
* tools/server-side/svnpubsub/irkerbridge.py
  ():  Make sure to use parantheses in print statements to make them
       function calls in py3.  Where we print to stderr / stdout, write
       the to respective sys streams.

Modified:
    subversion/trunk/build/run_tests.py
    subversion/trunk/contrib/client-side/incremental-update.py
    subversion/trunk/contrib/client-side/svn-hgmerge.py
    subversion/trunk/contrib/client-side/svn-merge-vendor.py
    subversion/trunk/contrib/client-side/svn_export_empty_files.py
    subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py
    subversion/trunk/contrib/client-side/svnmerge/svnmerge.py
    subversion/trunk/contrib/hook-scripts/hook_toolbox.py
    subversion/trunk/contrib/hook-scripts/remove-zombie-locks.py
    subversion/trunk/contrib/server-side/fsfsfixer/fixer/find_good_id.py
    subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py
    subversion/trunk/contrib/server-side/fsfsverify.py
    subversion/trunk/notes/directory-index/dirindex.py
    subversion/trunk/subversion/tests/cmdline/svntest/main.py
    subversion/trunk/subversion/tests/manual/tree-conflicts-add-vs-add.py
    subversion/trunk/tools/dev/benchmarks/RepoPerf/win_repo_bench.py
    subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py
    subversion/trunk/tools/dev/gen-py-errors.py
    subversion/trunk/tools/dev/merge-graph.py
    subversion/trunk/tools/dev/wc-ng/bump-to-19.py
    subversion/trunk/tools/dist/collect_sigs.py
    subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py

Modified: subversion/trunk/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Sun May  8 17:34:40 2016
@@ -476,7 +476,7 @@ class TestHarness:
     for t in threads:
       t.join()
 
-    print
+    print()
 
     # Aggregate and log the results
     failed = 0
@@ -748,7 +748,7 @@ class TestHarness:
   def _run_c_test(self, progabs, progdir, progbase, test_nums, dot_count):
     'Run a c test, escaping parameters as required.'
     if self.opts.list_tests and self.opts.milestone_filter:
-      print 'WARNING: --milestone-filter option does not currently work with C tests'
+      print('WARNING: --milestone-filter option does not currently work with C tests')
 
     if not os.access(progbase, os.X_OK):
       print("\nNot an executable file: " + progbase)
@@ -929,7 +929,7 @@ class TestHarness:
     # we printed a "Running all tests in ..." line, add the test result.
     if self.log:
       if self.opts.list_tests:
-        print ''
+        print()
       else:
         if failed:
           print(TextColors.FAILURE + 'FAILURE' + TextColors.ENDC)

Modified: subversion/trunk/contrib/client-side/incremental-update.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/incremental-update.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/incremental-update.py (original)
+++ subversion/trunk/contrib/client-side/incremental-update.py Sun May  8 17:34:40 2016
@@ -173,7 +173,7 @@ def main():
     current = 0
     for dir in dirs:
         current = current + 1
-        print format_string % (current, num_dirs, dir)
+        print(format_string % (current, num_dirs, dir))
         os.system('%s update --quiet --revision %d %s %s'
                   % (SVN_BINARY, head_revision, args, dir))
 

Modified: subversion/trunk/contrib/client-side/svn-hgmerge.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svn-hgmerge.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/svn-hgmerge.py (original)
+++ subversion/trunk/contrib/client-side/svn-hgmerge.py Sun May  8 17:34:40 2016
@@ -38,7 +38,7 @@ def do_hgmerge(base, repo, local, merged
   shutil.copyfile(local, temp_file)
   args = [HGMERGE_BINARY, temp_file, base, repo]
   status = os.spawnvp(os.P_WAIT, HGMERGE_BINARY, args)
-  print status
+  print(status)
   if status == 0:
     os.unlink(merged)
     shutil.copyfile(temp_file, merged)

Modified: subversion/trunk/contrib/client-side/svn-merge-vendor.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svn-merge-vendor.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/svn-merge-vendor.py (original)
+++ subversion/trunk/contrib/client-side/svn-merge-vendor.py Sun May  8 17:34:40 2016
@@ -282,7 +282,7 @@ def fine_tune(wc_dir):
 def alert(messages):
     """Wait the user to <ENTER> or abort the program"""
     for message in messages:
-        print >> sys.stderr, message
+        sys.stderr.write(message + "\n")
     try:
         return sys.stdin.readline()
     except KeyboardInterrupt:

Modified: subversion/trunk/contrib/client-side/svn_export_empty_files.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svn_export_empty_files.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/svn_export_empty_files.py (original)
+++ subversion/trunk/contrib/client-side/svn_export_empty_files.py Sun May  8 17:34:40 2016
@@ -334,9 +334,10 @@ what you are looking for.  This script w
 non-working working copy that can be crawled with find or find's
 locate utility to make it easier to find files."""
 
-    print >>sys.stderr, message1 % sys.argv[0]
+    sys.stderr.write(message1 % sys.argv[0])
+    sys.stderr.write("\n")
     if verbose_usage:
-        print >>sys.stderr, message2
+        sys.stderr.write(message2 + "\n")
     sys.exit(1)
 
 if __name__ == '__main__':

Modified: subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py (original)
+++ subversion/trunk/contrib/client-side/svnmerge/svnmerge-migrate-history.py Sun May  8 17:34:40
2016
@@ -40,11 +40,11 @@ try:
   import svn.fs
   import svn.repos
 except ImportError as e:
-  print >> sys.stderr, \
+  sys.stderr.write(\
         "ERROR: Unable to import Subversion's Python bindings: '%s'\n" \
         "Hint: Set your PYTHONPATH environment variable, or adjust your " \
         "PYTHONSTARTUP\nfile to point to your Subversion install " \
-        "location's svn-python directory." % e
+        "location's svn-python directory.\n" % e)
   sys.exit(1)
 
 # Convenience shortcut.
@@ -105,7 +105,7 @@ class Migrator:
   def log(self, message, only_when_verbose=True):
     if only_when_verbose and not self.verbose:
       return
-    print message
+    print(message)
 
   def run(self):
     self.repos = svn.repos.open(self.repos_path)

Modified: subversion/trunk/contrib/client-side/svnmerge/svnmerge.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svnmerge/svnmerge.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/svnmerge/svnmerge.py (original)
+++ subversion/trunk/contrib/client-side/svnmerge/svnmerge.py Sun May  8 17:34:40 2016
@@ -319,7 +319,7 @@ def launchsvn(s, show=False, pretend=Fal
     cmd = ' '.join(filter(None, [opts["svn"], "--non-interactive",
                                  username, password, configdir, s]))
     if show or opts["verbose"] >= 2:
-        print cmd
+        print(cmd)
     if pretend:
         return None
     return launch(cmd, **kwargs)
@@ -330,7 +330,7 @@ def svn_command(s):
                     pretend=opts["dry-run"],
                     split_lines=False)
     if not opts["dry-run"]:
-        print out
+        print(out)
 
 def check_dir_clean(dir):
     """Check the current status of dir for local mods."""
@@ -1298,7 +1298,7 @@ def display_revisions(revs, display_styl
     if display_style == "revisions":
         if revs:
             report(revisions_msg)
-            print revs
+            print(revs)
     elif display_style == "logs":
         for start,end in revs.normalized():
             svn_command('log --incremental -v -r %d:%d %s' % \
@@ -1876,7 +1876,7 @@ class CommandOpts:
 
     def _print_wrapped(self, text, indent=0):
         text = self._paragraphs(text, self.cwidth - indent)
-        print text.pop(0)
+        print(text.pop(0))
         for t in text:
             print(" " * indent + t)
 
@@ -2018,7 +2018,7 @@ class CommandOpts:
         print_opts(self.gopts)
 
     def print_version(self):
-        print self.version
+        print(self.version)
 
 ###############################################################################
 # Options and Commands description

Modified: subversion/trunk/contrib/hook-scripts/hook_toolbox.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/hook-scripts/hook_toolbox.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/contrib/hook-scripts/hook_toolbox.py (original)
+++ subversion/trunk/contrib/hook-scripts/hook_toolbox.py Sun May  8 17:34:40 2016
@@ -133,6 +133,6 @@ def run(*cmd):
      e.g. result = run('/usr/bin/svn', 'info', wc_dir_path) '''
   print('-->', ' '.join(cmd))
   stdout = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0]
-  print stdout.strip()
+  print(stdout.strip())
   return stdout
 

Modified: subversion/trunk/contrib/hook-scripts/remove-zombie-locks.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/hook-scripts/remove-zombie-locks.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/contrib/hook-scripts/remove-zombie-locks.py (original)
+++ subversion/trunk/contrib/hook-scripts/remove-zombie-locks.py Sun May  8 17:34:40 2016
@@ -84,7 +84,7 @@ assert (svn.core.SVN_VER_MAJOR, svn.core
        + str(svn.core.SVN_VER_MAJOR) + "." + str(svn.core.SVN_VER_MINOR)
 
 def usage_and_exit():
-  print >> sys.stderr, __doc__
+  sys.stderr.write(__doc__ + "\n")
   sys.exit(1)
 
 class RepositoryZombieLockRemover:
@@ -112,7 +112,7 @@ class RepositoryZombieLockRemover:
     """check if the file still exists in HEAD, removing the lock if not"""
     if svn.fs.svn_fs_check_path(self.rev_root, lock.path, callback_pool) \
            == svn.core.svn_node_none:
-      print lock.path
+      print(lock.path)
       svn.repos.svn_repos_fs_unlock(self.repos_ptr, lock.path, lock.token,
                                     True, callback_pool)
 

Modified: subversion/trunk/contrib/server-side/fsfsfixer/fixer/find_good_id.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/fsfsfixer/fixer/find_good_id.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/fsfsfixer/fixer/find_good_id.py (original)
+++ subversion/trunk/contrib/server-side/fsfsfixer/fixer/find_good_id.py Sun May  8 17:34:40
2016
@@ -105,7 +105,7 @@ if __name__ == '__main__':
     sys.exit(0)
 
   if len(sys.argv) != 3:
-    print >>sys.stderr, usage
+    sys.stderr.write(usage + "\n")
     sys.exit(1)
 
   repo_dir = sys.argv[1]
@@ -120,4 +120,4 @@ if __name__ == '__main__':
     sys.stderr.write("warning: the good ID has a different length: " + \
                      "bad id '" + bad_id + "', good id '" + good_id + "'\n")
 
-  print good_id
+  print(good_id)

Modified: subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py (original)
+++ subversion/trunk/contrib/server-side/fsfsfixer/fixer/fix-rev.py Sun May  8 17:34:40 2016
@@ -38,7 +38,7 @@ MAX_FSFS_FORMAT = 5
 # Print a message, only if 'verbose' mode is enabled.
 def verbose_print(str):
   if VERBOSE:
-    print str
+    print(str)
 
 # Echo the arguments to a log file, and also (if verbose) to standard output.
 def log(str):
@@ -287,7 +287,7 @@ def fix_rev(repo_dir, rev):
 if __name__ == '__main__':
 
   if len(sys.argv) != 3:
-    print >>sys.stderr, usage
+    sys.stderr.write(usage + "\n")
     sys.exit(1)
 
   repo_dir = sys.argv[1]

Modified: subversion/trunk/contrib/server-side/fsfsverify.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/fsfsverify.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/fsfsverify.py (original)
+++ subversion/trunk/contrib/server-side/fsfsverify.py Sun May  8 17:34:40 2016
@@ -93,7 +93,7 @@ def log(type, indent, format, *args):
     indentStr = ' ' * indent
     str = format % args
     str = '\n'.join([indentStr + x for x in str.split('\n')])
-    print str
+    print(str)
 
 
 class ByteStream(object):
@@ -926,7 +926,7 @@ class RegexpStrategy(WalkStrategy):
 
 
 def verify(noderev, revFile, dumpInstructions, dumpWindows):
-  print noderev
+  print(noderev)
 
   if noderev.text:
     noderev.text.verify(revFile,
@@ -1192,7 +1192,7 @@ if __name__ == '__main__':
             truncate(noderev, revFile)
 
         else:
-          print noderev
+          print(noderev)
 
           if not options.noVerify:
             if noderev.text:

Modified: subversion/trunk/notes/directory-index/dirindex.py
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/directory-index/dirindex.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/notes/directory-index/dirindex.py (original)
+++ subversion/trunk/notes/directory-index/dirindex.py Sun May  8 17:34:40 2016
@@ -790,7 +790,7 @@ def simpletest(database):
 
         def listdir(noderev, prefix):
             for n in ix.listdir(tx, noderev):
-                print prefix, str(n)
+                print(prefix, str(n))
                 if n._isdir:
                     listdir(n, prefix + "  ")
 
@@ -798,7 +798,7 @@ def simpletest(database):
         tx = ix.get_txn()
         print("transaction:", tx)
         root = ix.lookup(tx)
-        print str(root.noderev)
+        print(str(root.noderev))
         listdir(root.noderev, " ")
 
         print("Lookup iota")

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Sun May  8 17:34:40 2016
@@ -2383,7 +2383,7 @@ def execute_tests(test_list, serial_only
          or options.mode_filter.upper() == test_mode \
          or (options.mode_filter.upper() == 'PASS' and test_mode == ''):
         if not printed_header:
-          print header
+          print(header)
           printed_header = True
         TestRunner(test_list[testnum], testnum).list(milestones_dict)
     # We are simply listing the tests so always exit with success.

Modified: subversion/trunk/subversion/tests/manual/tree-conflicts-add-vs-add.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/manual/tree-conflicts-add-vs-add.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/manual/tree-conflicts-add-vs-add.py (original)
+++ subversion/trunk/subversion/tests/manual/tree-conflicts-add-vs-add.py Sun May  8 17:34:40
2016
@@ -254,7 +254,7 @@ def co(name, local_action, local_kind, i
   svn('up', ctx.WC)
 
   head = ctx.head()
-  print head
+  print(head)
 
   ctx.create_wc2()
   target = ctx.wc2(name)
@@ -289,7 +289,7 @@ def up(name, local_action, local_kind, i
   svn('up', ctx.WC)
 
   head = ctx.head()
-  print head
+  print(head)
 
   target = ctx.wc(name)
   incoming_action(ctx, target, incoming_kind, 'incoming')
@@ -401,7 +401,7 @@ try:
     if skip(row):
       continue
     name = nameof(row)
-    print name
+    print(name)
     test_func = row[0]
     results.append( (name, analyze( name, test_func( name, *row[1:] ) )) )
 except:
@@ -419,5 +419,5 @@ finally:
     else:
       lines.append('----- ' + name + ': nothing.')
   dump = '\n'.join(lines)
-  print dump
+  print(dump)
   rewrite_file('tree-conflicts-add-vs-add.py.results', dump)

Modified: subversion/trunk/tools/dev/benchmarks/RepoPerf/win_repo_bench.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/benchmarks/RepoPerf/win_repo_bench.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/tools/dev/benchmarks/RepoPerf/win_repo_bench.py (original)
+++ subversion/trunk/tools/dev/benchmarks/RepoPerf/win_repo_bench.py Sun May  8 17:34:40 2016
@@ -189,8 +189,8 @@ def run_test_cs_configurations(command,
       repeatedly with all servers on all repositories. """
 
   print
-  print command
-  print
+  print(command)
+  print()
 
   for config in configurations:
     set_config(config)
@@ -241,9 +241,9 @@ def run_test_admin_configurations(comman
   """ Run svnadmin COMMAND with basic arguments ARGS in all configurations
       repeatedly on all repositories. """
 
-  print
-  print command
-  print
+  print()
+  print(command)
+  print()
 
   for config in configurations:
     # These two must be the innermost loops and must be in that order.

Modified: subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py (original)
+++ subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py Sun May  8 17:34:40 2016
@@ -164,7 +164,7 @@ j = os.path.join
 
 def bail(msg=None):
   if msg:
-    print msg
+    print(msg)
   exit(1)
 
 def time_str():
@@ -1270,8 +1270,8 @@ if __name__ == '__main__':
   def usage(msg=None):
     parser.print_help()
     if msg:
-      print
-      print msg
+      print()
+      print(msg)
     bail()
 
   # there should be at least one arg left: the sub-command

Modified: subversion/trunk/tools/dev/gen-py-errors.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/gen-py-errors.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/tools/dev/gen-py-errors.py (original)
+++ subversion/trunk/tools/dev/gen-py-errors.py Sun May  8 17:34:40 2016
@@ -52,7 +52,7 @@ RE_DEF_VALUE = re.compile(r'SVN_ERR_([A-
 
 
 def write_output(codes):
-  print HEADER
+  print(HEADER)
 
   for name, value in codes:
     # skip SVN_ERR_ on the name

Modified: subversion/trunk/tools/dev/merge-graph.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/merge-graph.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/tools/dev/merge-graph.py (original)
+++ subversion/trunk/tools/dev/merge-graph.py Sun May  8 17:34:40 2016
@@ -35,8 +35,8 @@ if __name__ == '__main__':
 
   prog_name = sys.argv[0]
   if not args:
-    usage = '%s: usage: "%s %s"' % (prog_name, prog_name, args_message)
-    print >> sys.stderr, usage
+    usage = '%s: usage: "%s %s"\n' % (prog_name, prog_name, args_message)
+    sys.stderr.write(usage)
     sys.exit(1)
 
   formats = []

Modified: subversion/trunk/tools/dev/wc-ng/bump-to-19.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/wc-ng/bump-to-19.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/tools/dev/wc-ng/bump-to-19.py (original)
+++ subversion/trunk/tools/dev/wc-ng/bump-to-19.py Sun May  8 17:34:40 2016
@@ -293,7 +293,7 @@ def migrate_wc_subdirs(wc_root_path):
       shutil.rmtree(tmp_path(wc_subdir_path))
       os.rmdir(dotsvn_path(wc_subdir_path))
     except Exception as e:
-      print e
+      print(e)
       failed_delete_subdirs += [wc_subdir_path]
 
   # Notify any problems in deleting
@@ -339,7 +339,7 @@ def bump_wc_format_number(wc_path):
 if __name__ == '__main__':
 
   if len(sys.argv) != 2:
-    print __doc__
+    print(__doc__)
     sys.exit(1)
 
   wc_root_path = sys.argv[1]

Modified: subversion/trunk/tools/dist/collect_sigs.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/collect_sigs.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/tools/dist/collect_sigs.py (original)
+++ subversion/trunk/tools/dist/collect_sigs.py Sun May  8 17:34:40 2016
@@ -332,7 +332,7 @@ def main():
     elif basename[:-4] in files():
       # early exit; bypass 'content' entirely
       print_content_type('text/plain')
-      print cat_signatures(basename)
+      print(cat_signatures(basename))
       return
 
   # These are "global" values, not specific to our action.
@@ -344,7 +344,7 @@ def main():
   print_content_type('text/html')
 
   template = string.Template(shell_content)
-  print template.safe_substitute(mapping)
+  print(template.safe_substitute(mapping))
 
 
 if __name__ == '__main__':

Modified: subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py?rev=1742840&r1=1742839&r2=1742840&view=diff
==============================================================================
--- subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py (original)
+++ subversion/trunk/tools/server-side/svnpubsub/irkerbridge.py Sun May  8 17:34:40 2016
@@ -220,7 +220,7 @@ class BigDoEverythingClass(object):
   def commit(self, url, commit):
     if self.options.verbose:
       print("RECV: from %s" % url)
-      print json.dumps(vars(commit), indent=2)
+      print(json.dumps(vars(commit), indent=2))
 
     try:
       config_sections = self.locate_matching_configs(commit)



Mime
View raw message