You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/06/05 15:03:54 UTC

svn commit: r1746927 [8/8] - in /subversion/branches/authzperf: ./ build/ contrib/client-side/ contrib/client-side/svnmerge/ contrib/hook-scripts/ contrib/server-side/ contrib/server-side/fsfsfixer/fixer/ notes/directory-index/ notes/move-tracking/ sub...

Modified: subversion/branches/authzperf/tools/dev/benchmarks/suite1/benchmark.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/benchmarks/suite1/benchmark.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/benchmarks/suite1/benchmark.py (original)
+++ subversion/branches/authzperf/tools/dev/benchmarks/suite1/benchmark.py Sun Jun  5 15:03:52 2016
@@ -164,7 +164,7 @@ j = os.path.join
 
 def bail(msg=None):
   if msg:
-    print msg
+    print(msg)
   exit(1)
 
 def time_str():
@@ -181,7 +181,7 @@ def run_cmd(cmd, stdin=None, shell=False
       printable_cmd = cmd
     else:
       printable_cmd = ' '.join(cmd)
-    print 'CMD:', printable_cmd
+    print('CMD:', printable_cmd)
 
   if stdin:
     stdin_arg = subprocess.PIPE
@@ -197,9 +197,9 @@ def run_cmd(cmd, stdin=None, shell=False
 
   if verbose:
     if (stdout):
-      print "STDOUT: [[[\n%s]]]" % ''.join(stdout)
+      print("STDOUT: [[[\n%s]]]" % ''.join(stdout))
   if (stderr):
-    print "STDERR: [[[\n%s]]]" % ''.join(stderr)
+    print("STDERR: [[[\n%s]]]" % ''.join(stderr))
 
   return stdout, stderr
 
@@ -350,7 +350,7 @@ class TimingsDb:
       # exists
       return
 
-    print 'Creating database tables.'
+    print('Creating database tables.')
     c.executescript('''
         CREATE TABLE batch (
           batch_id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -468,7 +468,7 @@ class Run:
   def submit_timings(self):
     conn = self.batch.db.conn
     c = conn.cursor()
-    print 'submitting...'
+    print('submitting...')
 
     c.executemany("""
       INSERT INTO timings
@@ -629,7 +629,7 @@ def perform_run(batch, run_kind,
     cmd = [ svn_bin ]
     cmd.extend( list(args) )
     if verbose:
-      print 'svn cmd:', ' '.join(cmd)
+      print('svn cmd:', ' '.join(cmd))
 
     stdin = None
     if stdin:
@@ -652,9 +652,9 @@ def perform_run(batch, run_kind,
 
     if verbose:
       if (stdout):
-        print "STDOUT: [[[\n%s]]]" % ''.join(stdout)
+        print("STDOUT: [[[\n%s]]]" % ''.join(stdout))
       if (stderr):
-        print "STDERR: [[[\n%s]]]" % ''.join(stderr)
+        print("STDERR: [[[\n%s]]]" % ''.join(stderr))
 
     return stdout,stderr
 
@@ -792,9 +792,9 @@ def perform_run(batch, run_kind,
     else:
       file_url = 'file:///%s' % repos
 
-    print '\nRunning svn benchmark in', base
-    print 'dir levels: %s; new files and dirs per leaf: %s' %(
-          run_kind.levels, run_kind.spread)
+    print('\nRunning svn benchmark in', base)
+    print('dir levels: %s; new files and dirs per leaf: %s' %(
+          run_kind.levels, run_kind.spread))
 
     started = datetime.datetime.now()
 
@@ -876,7 +876,7 @@ def perform_run(batch, run_kind,
 
     finally:
       stopped = datetime.datetime.now()
-      print '\nDone with svn benchmark in', (stopped - started)
+      print('\nDone with svn benchmark in', (stopped - started))
 
       run.remember_timing(TOTAL_RUN,
                         timedelta_to_seconds(stopped - started))
@@ -896,8 +896,8 @@ def cmdline_run(db, options, run_kind_st
 
   N = int(N)
 
-  print 'Hi, going to run a Subversion benchmark series of %d runs...' % N
-  print 'Label is %s' % run_kind.label()
+  print('Hi, going to run a Subversion benchmark series of %d runs...' % N)
+  print('Label is %s' % run_kind.label())
 
   # can we run the svn binaries?
   svn_bin = j(options.svn_bin_dir, 'svn')
@@ -908,12 +908,12 @@ def cmdline_run(db, options, run_kind_st
     if not so:
       bail("Can't run %s" % b)
 
-    print ', '.join([s.strip() for s in so.split('\n')[:2]])
+    print(', '.join([s.strip() for s in so.split('\n')[:2]]))
 
   batch = Batch(db)
 
   for i in range(N):
-    print 'Run %d of %d' % (i + 1, N)
+    print('Run %d of %d' % (i + 1, N))
     perform_run(batch, run_kind,
                 svn_bin, svnadmin_bin, options.verbose)
 
@@ -934,31 +934,31 @@ def cmdline_list(db, options, *args):
     add_if_not_none('levels', run_kind.levels)
     add_if_not_none('spread', run_kind.spread)
     if constraints:
-      print 'For\n', '\n'.join(constraints)
-    print 'I found:'
+      print('For\n', '\n'.join(constraints))
+    print('I found:')
 
     d = TimingQuery(db, run_kind)
 
     cmd_names = d.get_sorted_command_names()
     if cmd_names:
-      print '\n%d command names:\n ' % len(cmd_names), '\n  '.join(cmd_names)
+      print('\n%d command names:\n ' % len(cmd_names), '\n  '.join(cmd_names))
 
     branches = d.get_sorted_branches()
     if branches and (len(branches) > 1 or branches[0] != run_kind.branch):
-      print '\n%d branches:\n ' % len(branches), '\n  '.join(branches)
+      print('\n%d branches:\n ' % len(branches), '\n  '.join(branches))
 
     revisions = d.get_sorted_revisions()
     if revisions and (len(revisions) > 1 or revisions[0] != run_kind.revision):
-      print '\n%d revisions:\n ' % len(revisions), '\n  '.join(revisions)
+      print('\n%d revisions:\n ' % len(revisions), '\n  '.join(revisions))
 
     levels_spread = d.get_sorted_levels_spread()
     if levels_spread and (
          len(levels_spread) > 1
          or levels_spread[0] != (run_kind.levels, run_kind.spread)):
-      print '\n%d kinds of levels x spread:\n ' % len(levels_spread), '\n  '.join(
-              [ ('%dx%d' % (l, s)) for l,s in levels_spread ])
+      print('\n%d kinds of levels x spread:\n ' % len(levels_spread), '\n  '.join(
+              [ ('%dx%d' % (l, s)) for l,s in levels_spread ]))
 
-    print "\n%d runs in %d batches.\n" % (d.count_runs_batches())
+    print("\n%d runs in %d batches.\n" % (d.count_runs_batches()))
 
 
 def cmdline_show(db, options, *run_kind_strings):
@@ -983,7 +983,7 @@ def cmdline_show(db, options, *run_kind_
                  tavg,
                  command_name))
 
-    print '\n'.join(s)
+    print('\n'.join(s))
 
 
 def cmdline_compare(db, options, *args):
@@ -1004,7 +1004,7 @@ def cmdline_compare(db, options, *args):
     rightq = TimingQuery(db, right_kind)
     right = rightq.get_timings()
     if not right:
-      print "No timings for %s" % right_kind.label()
+      print("No timings for %s" % right_kind.label())
       continue
 
     label = 'Compare %s to %s' % (right_kind.label(), left_kind.label())
@@ -1051,7 +1051,7 @@ def cmdline_compare(db, options, *args):
       ])
 
 
-    print '\n'.join(s)
+    print('\n'.join(s))
 
 
 # ------------------------------------------------------- charts
@@ -1073,7 +1073,7 @@ def cmdline_chart_compare(db, options, *
     query = TimingQuery(db, run_kind)
     timings = query.get_timings()
     if not timings:
-      print "No timings for %s" % run_kind.label()
+      print("No timings for %s" % run_kind.label())
       continue
     labels.append(run_kind.label())
     timing_sets.append(timings)
@@ -1215,7 +1215,7 @@ def cmdline_chart_compare(db, options, *
                 va='center', weight='bold')
 
   plt.savefig(chart_path)
-  print 'wrote chart file:', chart_path
+  print('wrote chart file:', chart_path)
 
 
 # ------------------------------------------------------------ main
@@ -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/branches/authzperf/tools/dev/build-svn-deps-win.pl
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/build-svn-deps-win.pl?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/build-svn-deps-win.pl (original)
+++ subversion/branches/authzperf/tools/dev/build-svn-deps-win.pl Sun Jun  5 15:03:52 2016
@@ -177,7 +177,7 @@ sub set_defaults {
   set_default(\$PCRE_URL, "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$PCRE_VER.zip");
   set_default(\$BDB_URL, "http://download.oracle.com/berkeley-db/db-5.3.21.zip");
   set_default(\$SQLITE_URL, "http://www.sqlite.org/2013/sqlite-amalgamation-$SQLITE_VER.zip");
-  set_default(\$SERF_URL, "http://serf.googlecode.com/svn/src_releases/serf-$SERF_VER.zip");
+  set_default(\$SERF_URL, "https://archive.apache.org/dist/serf/serf-$SERF_VER.zip");
   set_default(\$NEON_URL, "http://www.webdav.org/neon/neon-$NEON_VER.tar.gz");
   set_default(\$INSTDIR, $TOPDIR);
   set_default(\$BLDDIR, "$TOPDIR\\build");

Modified: subversion/branches/authzperf/tools/dev/contribulyze.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/contribulyze.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/contribulyze.py (original)
+++ subversion/branches/authzperf/tools/dev/contribulyze.py Sun Jun  5 15:03:52 2016
@@ -741,7 +741,7 @@ def usage():
 def main():
   try:
     opts, args = my_getopt(sys.argv[1:], 'C:U:hH?', [ 'help' ])
-  except getopt.GetoptError, e:
+  except getopt.GetoptError as e:
     complain(str(e) + '\n\n')
     usage()
     sys.exit(1)

Modified: subversion/branches/authzperf/tools/dev/gen-javahl-errors.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/gen-javahl-errors.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/gen-javahl-errors.py (original)
+++ subversion/branches/authzperf/tools/dev/gen-javahl-errors.py Sun Jun  5 15:03:52 2016
@@ -27,7 +27,7 @@ import sys, os
 
 try:
   from svn import core
-except ImportError, e:
+except ImportError as e:
   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 " \

Modified: subversion/branches/authzperf/tools/dev/gen-py-errors.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/gen-py-errors.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/gen-py-errors.py (original)
+++ subversion/branches/authzperf/tools/dev/gen-py-errors.py Sun Jun  5 15:03:52 2016
@@ -52,11 +52,11 @@ 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
-    print '%s = %d' % (name[8:], value)
+    print('%s = %d' % (name[8:], value))
 
 
 def main(codes_fname):

Modified: subversion/branches/authzperf/tools/dev/gen_junit_report.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/gen_junit_report.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/gen_junit_report.py (original)
+++ subversion/branches/authzperf/tools/dev/gen_junit_report.py Sun Jun  5 15:03:52 2016
@@ -178,7 +178,7 @@ def main():
     try:
         opts, args = getopt.getopt(sys.argv[1:], 'l:d:h',
                                   ['log-file=', 'output-dir=', 'help'])
-    except getopt.GetoptError, err:
+    except getopt.GetoptError as err:
         usage(err)
 
     log_file = None
@@ -201,7 +201,7 @@ def main():
         print("Directory '%s' not exists, creating ..." % output_dir)
         try:
             os.makedirs(output_dir)
-        except OSError, err:
+        except OSError as err:
             sys.stderr.write("ERROR: %s\n" % err)
             sys.exit(1)
     patterns = {
@@ -221,7 +221,7 @@ def main():
     fp = None
     try:
         fp = open(log_file, 'r')
-    except IOError, err:
+    except IOError as err:
         sys.stderr.write("ERROR: %s\n" % err)
         sys.exit(1)
 

Modified: subversion/branches/authzperf/tools/dev/graph-dav-servers.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/graph-dav-servers.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/graph-dav-servers.py (original)
+++ subversion/branches/authzperf/tools/dev/graph-dav-servers.py Sun Jun  5 15:03:52 2016
@@ -181,7 +181,7 @@ def draw_graph(dates, counts):
     im = im.resize((width, height), Image.ANTIALIAS)
     im.save(OUTPUT_FILE, im.format)
     os.unlink(OUTPUT_FILE + ".tmp.png")
-  except Exception, e:
+  except Exception as e:
     sys.stderr.write("Error attempting to resize the graphic: %s\n" % (str(e)))
     os.rename(OUTPUT_FILE + ".tmp.png", OUTPUT_FILE)
     raise

Modified: subversion/branches/authzperf/tools/dev/histogram.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/histogram.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/histogram.py (original)
+++ subversion/branches/authzperf/tools/dev/histogram.py Sun Jun  5 15:03:52 2016
@@ -42,7 +42,7 @@ def histogram(counts, width):
   for author, count in sorted(counts.items(),
                               key=operator.itemgetter(1),  # sort on count
                               reverse=True):
-    print "%-*s | %s" % (max_len, author, "X"*int(count/adjustor))
+    print("%-*s | %s" % (max_len, author, "X"*int(count/adjustor)))
 
 
 if __name__ == '__main__':

Modified: subversion/branches/authzperf/tools/dev/iz/ff2csv.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/iz/ff2csv.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/iz/ff2csv.py (original)
+++ subversion/branches/authzperf/tools/dev/iz/ff2csv.py Sun Jun  5 15:03:52 2016
@@ -66,7 +66,7 @@ manager-speak pictures."""
 
     try:
         opts, args = my_getopt(sys.argv[1:], "", [x[0] for x in long_opts])
-    except getopt.GetoptError, e:
+    except getopt.GetoptError as e:
         print("Error: %s" % e.msg)
         shortusage()
         print(me + " --help for options.")

Modified: subversion/branches/authzperf/tools/dev/iz/find-fix.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/iz/find-fix.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/iz/find-fix.py (original)
+++ subversion/branches/authzperf/tools/dev/iz/find-fix.py Sun Jun  5 15:03:52 2016
@@ -127,7 +127,7 @@ def main():
 
   try:
       opts, args = my_getopt(sys.argv[1:], "", [x[0] for x in long_opts])
-  except getopt.GetoptError, e:
+  except getopt.GetoptError as e:
       sys.stderr.write("Error: %s\n" % e.msg)
       shortusage()
       sys.stderr.write("%s --help for options.\n" % me)

Modified: subversion/branches/authzperf/tools/dev/merge-graph.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/merge-graph.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/merge-graph.py (original)
+++ subversion/branches/authzperf/tools/dev/merge-graph.py Sun Jun  5 15:03:52 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 = []
@@ -49,10 +49,10 @@ if __name__ == '__main__':
     formats.append('png')
 
   for config_filename in args:
-    print "%s: reading '%s'," % (prog_name, config_filename),
+    sys.stdout.write("%s: reading '%s', " % (prog_name, config_filename))
     graph = MergeDot(config_filename, rankdir='LR', dpi='72')
     for format in formats:
       filename = '%s.%s' % (graph.basename, format)
-      print "writing '%s'" % filename,
+      sys.stdout.write("writing '%s' " % filename)
       graph.save(format=format, filename=filename)
     print

Modified: subversion/branches/authzperf/tools/dev/mergegraph/mergegraph.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/mergegraph/mergegraph.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/mergegraph/mergegraph.py (original)
+++ subversion/branches/authzperf/tools/dev/mergegraph/mergegraph.py Sun Jun  5 15:03:52 2016
@@ -242,7 +242,7 @@ class MergeDot(MergeGraph, pydot.Dot):
                                              'annotations': '[]' })
     files_read = config.read(config_filename)
     if len(files_read) == 0:
-      print >> sys.stderr, 'graph: unable to read graph config from "' + config_filename + '"'
+      sys.stderr.write('graph: unable to read graph config from "' + config_filename + '"\n')
       sys.exit(1)
     graph.basename = config.get('graph', 'basename')
     graph.title = config.get('graph', 'title')

Modified: subversion/branches/authzperf/tools/dev/mergegraph/save_as_sh.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/mergegraph/save_as_sh.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/mergegraph/save_as_sh.py (original)
+++ subversion/branches/authzperf/tools/dev/mergegraph/save_as_sh.py Sun Jun  5 15:03:52 2016
@@ -26,13 +26,13 @@
 
 
 def shebang_line(out):
-  print >> out, '#!/bin/sh'
+  out.write('#!/bin/sh\n')
 
 def command(out, cmd, *args):
   """Write the shell command CMD with the arguments ARGS to the file-like
      object OUT.
   """
-  print >> out, ' '.join((cmd,) + args)
+  out.write(' '.join((cmd,) + args) + "\n")
 
 def svn(out, subcmd, *args):
   """Write an svn command with the given subcommand and arguments.  Write
@@ -43,7 +43,7 @@ def svn(out, subcmd, *args):
 def comment(out, text):
   """Write the comment TEXT to the file-like object OUT.
   """
-  print >> out, '#', text
+  out.write('# %s\n' % text)
 
 def node_branch(node_name):
   """Extract branch name from a node name.

Modified: subversion/branches/authzperf/tools/dev/sbox-ospath.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/sbox-ospath.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/sbox-ospath.py (original)
+++ subversion/branches/authzperf/tools/dev/sbox-ospath.py Sun Jun  5 15:03:52 2016
@@ -54,10 +54,10 @@ def rewrite_file(fname):
       lines[i] = line[:start] + 'sbox.ospath(' + parts + ')' + line[end:]
       count += 1
   if count == 0:
-    print 'No changes.'
+    print('No changes.')
   else:
     open(fname, 'w').writelines(lines)
-    print '%s rewrites performed.' % (count,)
+    print('%s rewrites performed.' % (count,))
 
 
 if __name__ == '__main__':

Modified: subversion/branches/authzperf/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/unix-build/Makefile.svn?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/branches/authzperf/tools/dev/unix-build/Makefile.svn Sun Jun  5 15:03:52 2016
@@ -150,7 +150,6 @@ GNU_ICONV_URL	= https://ftp.gnu.org/pub/
 APR_UTIL_URL	= https://svn.apache.org/repos/asf/apr/apr-util
 HTTPD_URL	= https://archive.apache.org/dist/httpd/$(HTTPD_DIST)
 NEON_URL	= http://webdav.org/neon/$(NEON_DIST)
-#SERF_URL	= http://serf.googlecode.com/files/$(SERF_DIST)
 SERF_URL	= https://svn.apache.org/repos/asf/serf/tags/$(SERF_VER)
 SERF_OLD_URL	= https://svn.apache.org/repos/asf/serf/tags/$(SERF_OLD_VER)
 SQLITE_URL	= https://www.sqlite.org/2014/$(SQLITE_DIST)
@@ -799,8 +798,6 @@ serf-clean:
 #$(SERF_OBJDIR)/.retrieved: $(DISTDIR)/$(SERF_DIST)
 #	[ -d $(SERF_OBJDIR) ] || mkdir -p $(SERF_OBJDIR)
 #	tar -C $(SRCDIR) -zxf $(DISTDIR)/$(SERF_DIST)
-#	cd $(SRCDIR)/serf-$(SERF_VER) && \
-#		svn diff -c1394 http://serf.googlecode.com/svn | patch -p2
 #	touch $@
 
 # retrieve serf if not present yet
@@ -1293,6 +1290,7 @@ $(GETTEXT_OBJDIR)/.installed: $(GETTEXT_
 
 svn-install-all: svn-install svn-bindings-install
 
+svn-retrieve:	$(SVN_OBJDIR)/.retrieved
 svn-configure:	$(SVN_OBJDIR)/.configured
 svn-compile:	$(SVN_OBJDIR)/.compiled
 svn-bindings-compile:	$(SVN_OBJDIR)/.bindings-compiled

Modified: subversion/branches/authzperf/tools/dev/wc-format.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/wc-format.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/wc-format.py (original)
+++ subversion/branches/authzperf/tools/dev/wc-format.py Sun Jun  5 15:03:52 2016
@@ -53,7 +53,7 @@ def print_format(wc_path):
   #   1.6.x: format 10
   #   1.7.x: format 29
   formatno = get_format(wc_path)
-  print '%s: %s' % (wc_path, formatno)
+  print('%s: %s' % (wc_path, formatno))
 
 
 if __name__ == '__main__':

Modified: subversion/branches/authzperf/tools/dev/wc-ng/bump-to-19.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/wc-ng/bump-to-19.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/wc-ng/bump-to-19.py (original)
+++ subversion/branches/authzperf/tools/dev/wc-ng/bump-to-19.py Sun Jun  5 15:03:52 2016
@@ -254,7 +254,7 @@ def migrate_wc_subdirs(wc_root_path):
       dirs.remove(dot_svn)
     except ValueError:
       # a non-WC dir: don't walk into any subdirectories
-      print "skipped: ", NotASubversionWC(dir_path)
+      print("skipped: ", NotASubversionWC(dir_path))
       del dirs[:]
       continue
 
@@ -265,18 +265,18 @@ def migrate_wc_subdirs(wc_root_path):
         wc_subdir_path = wc_subdir_path[2:]
 
       if not select_subdir(wc_subdir_path):
-        print "skipped:", wc_subdir_path
+        print("skipped:", wc_subdir_path)
         dirs.remove(dir)
         continue
 
       try:
         check_wc_format_number(wc_subdir_path)
-        print "migrating '" + wc_subdir_path + "'"
+        print("migrating '" + wc_subdir_path + "'")
         copy_db_rows_to_wcroot(wc_subdir_path)
         move_and_shard_pristine_files(wc_subdir_path, '.')
         migrated_subdirs += [wc_subdir_path]
-      except (WrongFormatException, NotASubversionWC), e:
-        print "skipped:", e
+      except (WrongFormatException, NotASubversionWC) as e:
+        print("skipped:", e)
         # don't walk into it
         dirs.remove(dir)
         continue
@@ -285,22 +285,22 @@ def migrate_wc_subdirs(wc_root_path):
   # Make a note of any problems in deleting.
   failed_delete_subdirs = []
   for wc_subdir_path in migrated_subdirs:
-    print "deleting " + dotsvn_path(wc_subdir_path)
+    print("deleting " + dotsvn_path(wc_subdir_path))
     try:
       os.remove(db_path(wc_subdir_path))
       if os.path.exists(pristine_path(wc_subdir_path)):
         os.rmdir(pristine_path(wc_subdir_path))
       shutil.rmtree(tmp_path(wc_subdir_path))
       os.rmdir(dotsvn_path(wc_subdir_path))
-    except Exception, e:
-      print e
+    except Exception as e:
+      print(e)
       failed_delete_subdirs += [wc_subdir_path]
 
   # Notify any problems in deleting
   if failed_delete_subdirs:
-    print "Failed to delete the following directories. Please delete them manually."
+    print("Failed to delete the following directories. Please delete them manually.")
     for wc_subdir_path in failed_delete_subdirs:
-      print "  " + dotsvn_path(wc_subdir_path)
+      print("  " + dotsvn_path(wc_subdir_path))
 
   os.chdir(old_cwd)
 
@@ -339,18 +339,18 @@ 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]
 
   try:
     check_wc_format_number(wc_root_path)
-  except (WrongFormatException, NotASubversionWC), e:
-    print "error:", e
+  except (WrongFormatException, NotASubversionWC) as e:
+    print("error:", e)
     sys.exit(1)
 
-  print "merging subdir DBs into single DB '" + wc_root_path + "'"
+  print("merging subdir DBs into single DB '" + wc_root_path + "'")
   move_and_shard_pristine_files(wc_root_path, wc_root_path)
   migrate_wc_subdirs(wc_root_path)
   bump_wc_format_number(wc_root_path)

Modified: subversion/branches/authzperf/tools/dev/wc-ng/populate-pristine.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/wc-ng/populate-pristine.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/wc-ng/populate-pristine.py (original)
+++ subversion/branches/authzperf/tools/dev/wc-ng/populate-pristine.py Sun Jun  5 15:03:52 2016
@@ -103,6 +103,6 @@ if __name__ == '__main__':
   for wc_path in paths:
     try:
       populate(wc_path)
-    except UnknownFormat, e:
+    except UnknownFormat as e:
       sys.stderr.write("Don't know how to handle '%s' (format %d)'\n"
                        % (wc_path, e.formatno))

Modified: subversion/branches/authzperf/tools/dev/which-error.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dev/which-error.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dev/which-error.py (original)
+++ subversion/branches/authzperf/tools/dev/which-error.py Sun Jun  5 15:03:52 2016
@@ -36,7 +36,7 @@ import re
 
 try:
   from svn import core
-except ImportError, e:
+except ImportError as e:
   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 " \

Modified: subversion/branches/authzperf/tools/dist/collect_sigs.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/dist/collect_sigs.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/dist/collect_sigs.py (original)
+++ subversion/branches/authzperf/tools/dist/collect_sigs.py Sun Jun  5 15:03:52 2016
@@ -42,7 +42,7 @@ def make_config():
   'Output a blank config file'
 
   if os.path.exists('config.py'):
-    print "'config.py' already exists!'"
+    print("'config.py' already exists!'")
     sys.exit(1)
 
   conf = open('config.py', 'w')
@@ -51,7 +51,7 @@ def make_config():
   conf.write("filesdir = ''\n")
   conf.close()
 
-  print "'config.py' generated"
+  print("'config.py' generated")
 
 def make_db():
   'Initialize a blank database'
@@ -114,9 +114,9 @@ try:
   sys.path.append(os.path.dirname(sys.argv[0]))
   import config
 except:
-  print 'Content-type: text/plain'
+  print('Content-type: text/plain')
   print
-  print 'Cannot find config file'
+  print('Cannot find config file')
   sys.exit(1)
 
 r = re.compile('^\[GNUPG\:\] GOODSIG (\w*) (.*)')
@@ -310,8 +310,8 @@ def cat_signatures(basename):
     return (open(ascfile, 'r').read())
 
 def print_content_type(mimetype):
-  print "Content-Type: " + mimetype
-  print
+  print("Content-Type: " + mimetype)
+  print("")
 
 def main():
   form = cgi.FieldStorage()
@@ -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/branches/authzperf/tools/examples/get-location-segments.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/examples/get-location-segments.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/examples/get-location-segments.py (original)
+++ subversion/branches/authzperf/tools/examples/get-location-segments.py Sun Jun  5 15:03:52 2016
@@ -73,14 +73,14 @@ def parse_args(args):
 
 
 def prompt_func_ssl_unknown_cert(realm, failures, cert_info, may_save, pool):
-  print "The certficate details are as follows:"
-  print "--------------------------------------"
-  print "Issuer     : " + str(cert_info.issuer_dname)
-  print "Hostname   : " + str(cert_info.hostname)
-  print "ValidFrom  : " + str(cert_info.valid_from)
-  print "ValidUpto  : " + str(cert_info.valid_until)
-  print "Fingerprint: " + str(cert_info.fingerprint)
-  print ""
+  print( "The certficate details are as follows:")
+  print("--------------------------------------")
+  print("Issuer     : " + str(cert_info.issuer_dname))
+  print("Hostname   : " + str(cert_info.hostname))
+  print("ValidFrom  : " + str(cert_info.valid_from))
+  print("ValidUpto  : " + str(cert_info.valid_until))
+  print("Fingerprint: " + str(cert_info.fingerprint))
+  print("")
   ssl_trust = core.svn_auth_cred_ssl_server_trust_t()
   if may_save:
     choice = raw_input( "accept (t)temporarily   (p)permanently: ")
@@ -111,7 +111,7 @@ def prompt_func_gnome_keyring_prompt(key
 def main():
   try:
     url, peg_revision, start_revision, end_revision = parse_args(sys.argv[1:])
-  except Exception, e:
+  except Exception as e:
     sys.stderr.write("""Usage: %s URL[@PEG-REV] [START-REV[:END-REV]]
 
 Trace the history of URL@PEG-REV, printing the location(s) of its

Modified: subversion/branches/authzperf/tools/hook-scripts/svn2feed.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/hook-scripts/svn2feed.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/hook-scripts/svn2feed.py (original)
+++ subversion/branches/authzperf/tools/hook-scripts/svn2feed.py Sun Jun  5 15:03:52 2016
@@ -363,7 +363,7 @@ def main():
                                         "feed-url=",
                                         "format=",
                                         ])
-    except getopt.GetoptError, msg:
+    except getopt.GetoptError as msg:
         usage_and_exit(msg)
 
     # Make sure required arguments are present.
@@ -394,7 +394,7 @@ def main():
         elif opt in ("-m", "--max-items"):
             try:
                max_items = int(arg)
-            except ValueError, msg:
+            except ValueError as msg:
                usage_and_exit("Invalid value '%s' for --max-items." % (arg))
             if max_items < 1:
                usage_and_exit("Value for --max-items must be a positive "
@@ -427,7 +427,7 @@ def main():
         cmd_out = proc.stdout.readlines()
         try:
             revisions = [int(cmd_out[0])]
-        except IndexError, msg:
+        except IndexError as msg:
             usage_and_exit("svn2feed.py: Invalid value '%s' for " \
                            "REPOS-PATH" % (repos_path))
     else:
@@ -447,7 +447,7 @@ def main():
                 revisions = list(range(start, end + 1)[-max_items:])
             else:
                 raise ValueError()
-        except ValueError, msg:
+        except ValueError as msg:
             usage_and_exit("svn2feed.py: Invalid value '%s' for --revision." \
                            % (commit_rev))
 

Modified: subversion/branches/authzperf/tools/hook-scripts/svnperms.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/hook-scripts/svnperms.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/hook-scripts/svnperms.py (original)
+++ subversion/branches/authzperf/tools/hook-scripts/svnperms.py Sun Jun  5 15:03:52 2016
@@ -296,7 +296,7 @@ class MissingArgumentsException(Exceptio
 def parse_options():
     try:
         opts, args = my_getopt(sys.argv[1:], "f:s:r:t:R:A:h", ["help"])
-    except getopt.GetoptError, e:
+    except getopt.GetoptError as e:
         raise Error(e.msg)
     class Options: pass
     obj = Options()
@@ -349,11 +349,11 @@ def main():
         check_perms(opts.filename, opts.section,
                     opts.repository, opts.transaction, opts.revision,
                     opts.author)
-    except MissingArgumentsException, e:
+    except MissingArgumentsException as e:
         sys.stderr.write("%s\n" % str(e))
         sys.stderr.write(USAGE)
         sys.exit(1)
-    except Error, e:
+    except Error as e:
         sys.stderr.write("error: %s\n" % str(e))
         sys.exit(1)
 

Modified: subversion/branches/authzperf/tools/po/l10n-report.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/po/l10n-report.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/po/l10n-report.py (original)
+++ subversion/branches/authzperf/tools/po/l10n-report.py Sun Jun  5 15:03:52 2016
@@ -159,7 +159,7 @@ def main():
                                        ["help",
                                         "to-email-id=",
                                         ])
-    except getopt.GetoptError, msg:
+    except getopt.GetoptError as msg:
         usage_and_exit(msg)
 
     to_email_id = None

Modified: subversion/branches/authzperf/tools/server-side/fsfs-reshard.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/server-side/fsfs-reshard.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/server-side/fsfs-reshard.py (original)
+++ subversion/branches/authzperf/tools/server-side/fsfs-reshard.py Sun Jun  5 15:03:52 2016
@@ -277,7 +277,7 @@ def shard(path, max_files_per_shard, sta
   tmp = path + '.reshard'
   try:
     os.mkdir(tmp)
-  except OSError, e:
+  except OSError as e:
     if e.errno != EEXIST:
       raise
 
@@ -335,7 +335,7 @@ def main():
 
   try:
     max_files_per_shard = int(max_files_per_shard)
-  except ValueError, OverflowError:
+  except ValueError as OverflowError:
     sys.stderr.write("error: maximum files per shard ('%s') is not a valid number.\n" \
       % max_files_per_shard)
     sys.stderr.flush()

Modified: subversion/branches/authzperf/tools/server-side/svn-backup-dumps.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/server-side/svn-backup-dumps.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/server-side/svn-backup-dumps.py (original)
+++ subversion/branches/authzperf/tools/server-side/svn-backup-dumps.py Sun Jun  5 15:03:52 2016
@@ -255,8 +255,8 @@ class SvnBackupOutputCommand(SvnBackupOu
         try:
             proc = Popen(cmd, stdin=PIPE, stdout=self.__ofd, shell=False)
         except:
-            print (256, "", "Popen failed (%s ...):\n  %s" % (cmd[0],
-                    str(sys.exc_info()[1])))
+            print((256, "", "Popen failed (%s ...):\n  %s" % (cmd[0],
+                  str(sys.exc_info()[1]))))
             sys.exit(256)
         self.__proc  = proc
         self.__stdin = proc.stdin
@@ -471,7 +471,7 @@ class SvnBackup:
             ftp.quit()
             rc = len(ifd.read(1)) == 0
             ifd.close()
-        except Exception, e:
+        except Exception as e:
             raise SvnBackupException("ftp transfer failed:\n  file:  '%s'\n  error: %s" % \
                     (absfilename, str(e)))
         return rc
@@ -680,7 +680,7 @@ if __name__ == "__main__":
     try:
         backup = SvnBackup(options, args)
         rc = backup.execute()
-    except SvnBackupException, e:
+    except SvnBackupException as e:
         print("svn-backup-dumps.py: %s" % e)
     if rc:
         print("Everything OK.")

Modified: subversion/branches/authzperf/tools/server-side/svn-populate-node-origins-index.c
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/server-side/svn-populate-node-origins-index.c?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/server-side/svn-populate-node-origins-index.c (original)
+++ subversion/branches/authzperf/tools/server-side/svn-populate-node-origins-index.c Sun Jun  5 15:03:52 2016
@@ -71,28 +71,19 @@ index_revision_adds(int *count, svn_fs_t
                     svn_revnum_t revision, apr_pool_t *pool)
 {
   svn_fs_root_t *root;
-  apr_hash_t *changes;
-  apr_hash_index_t *hi;
-  apr_pool_t *subpool;
+  apr_pool_t *subpool = svn_pool_create(pool);
+
+  svn_fs_path_change_iterator_t *iterator;
+  svn_fs_path_change3_t *change;
 
   *count = 0;
   SVN_ERR(svn_fs_revision_root(&root, fs, revision, pool));
-  SVN_ERR(svn_fs_paths_changed2(&changes, root, pool));
-
-  /* No paths changed in this revision?  Nothing to do.  */
-  if (apr_hash_count(changes) == 0)
-    return SVN_NO_ERROR;
+  SVN_ERR(svn_fs_paths_changed3(&iterator, root, pool, subpool));
+  SVN_ERR(svn_fs_path_change_get(&change, iterator));
 
-  subpool = svn_pool_create(pool);
-  for (hi = apr_hash_first(pool, changes); hi; hi = apr_hash_next(hi))
+  while (change)
     {
-      const void *path;
-      void *val;
-      svn_fs_path_change2_t *change;
-
       svn_pool_clear(subpool);
-      apr_hash_this(hi, &path, NULL, &val);
-      change = val;
       if ((change->change_kind == svn_fs_path_change_add)
           || (change->change_kind == svn_fs_path_change_replace))
         {
@@ -100,10 +91,13 @@ index_revision_adds(int *count, svn_fs_t
                             && SVN_IS_VALID_REVNUM(change->copyfrom_rev)))
             {
               svn_revnum_t origin;
-              SVN_ERR(svn_fs_node_origin_rev(&origin, root, path, subpool));
+              SVN_ERR(svn_fs_node_origin_rev(&origin, root,
+                                             change->path.data, subpool));
               (*count)++;
             }
         }
+
+      SVN_ERR(svn_fs_path_change_get(&change, iterator));
     }
   svn_pool_destroy(subpool);
 

Modified: subversion/branches/authzperf/tools/server-side/svnpredumpfilter.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/server-side/svnpredumpfilter.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/server-side/svnpredumpfilter.py (original)
+++ subversion/branches/authzperf/tools/server-side/svnpredumpfilter.py Sun Jun  5 15:03:52 2016
@@ -243,21 +243,21 @@ def svn_log_stream_get_dependencies(stre
   return dt
 
 def analyze_logs(included_paths):
-  print "Initial include paths:"
+  print("Initial include paths:")
   for path in included_paths:
-    print " + /%s" % (path)
+    print(" + /%s" % (path))
 
   dt = svn_log_stream_get_dependencies(sys.stdin, included_paths)
 
   if dt.dependent_paths:
     found_new_deps = True
-    print "Dependent include paths found:"
+    print("Dependent include paths found:")
     for path in dt.dependent_paths:
-      print " + /%s" % (path)
-    print "You need to also include them (or one of their parents)."
+      print(" + /%s" % (path))
+    print("You need to also include them (or one of their parents).")
   else:
     found_new_deps = False
-    print "No new dependencies found!"
+    print("No new dependencies found!")
     parents = {}
     for path in dt.include_paths:
       while 1:
@@ -268,11 +268,11 @@ def analyze_logs(included_paths):
         path = parent
     parents = parents.keys()
     if parents:
-      print "You might still need to manually create parent directories " \
-            "for the included paths before loading a filtered dump:"
+      print("You might still need to manually create parent directories " \
+            "for the included paths before loading a filtered dump:")
       parents.sort(compare_paths)
       for parent in parents:
-        print "   /%s" % (parent)
+        print("   /%s" % (parent))
 
   return found_new_deps and EXIT_MOREDEPS or EXIT_SUCCESS
 
@@ -291,7 +291,7 @@ def main():
   try:
     opts, args = getopt.getopt(sys.argv[1:], "hv",
                                ["help", "verbose", "targets="])
-  except getopt.GetoptError, e:
+  except getopt.GetoptError as e:
     usage_and_exit(str(e))
 
   for option, value in opts:
@@ -323,7 +323,7 @@ def main():
       usage_and_exit("Valid subcommands are 'include' and 'exclude'")
   except SystemExit:
     raise
-  except (LogStreamError, EOFError), e:
+  except (LogStreamError, EOFError) as e:
     log("ERROR: " + str(e), 0)
     sys.exit(EXIT_FAILURE)
   except:

Modified: subversion/branches/authzperf/tools/server-side/svnpubsub/daemonize.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/server-side/svnpubsub/daemonize.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/server-side/svnpubsub/daemonize.py (original)
+++ subversion/branches/authzperf/tools/server-side/svnpubsub/daemonize.py Sun Jun  5 15:03:52 2016
@@ -24,6 +24,7 @@ import os
 import signal
 import sys
 import time
+import stat
 import multiprocessing  # requires Python 2.6
 
 
@@ -51,7 +52,7 @@ class Daemon(object):
   def daemonize_exit(self):
     try:
       result = self.daemonize()
-    except (ChildFailed, DaemonFailed), e:
+    except (ChildFailed, DaemonFailed) as e:
       # duplicate the exit code
       sys.exit(e.code)
     except (ChildTerminatedAbnormally, ChildForkFailed,
@@ -122,7 +123,7 @@ class Daemon(object):
     # perform the second fork
     try:
       pid = os.fork()
-    except OSError, e:
+    except OSError as e:
       ### this won't make it to the parent process
       raise DaemonForkFailed(e.errno, e.strerror)
 
@@ -179,7 +180,8 @@ class Daemon(object):
           os.remove(self.pidfile)
         except OSError:
           pass
-        fd = os.open(self.pidfile, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0444)
+        fd = os.open(self.pidfile, os.O_WRONLY | os.O_CREAT | os.O_EXCL,
+                     stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH)
         os.write(fd, '%d\n' % pid)
         os.close(fd)
 

Modified: subversion/branches/authzperf/tools/server-side/svnpubsub/irkerbridge.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/server-side/svnpubsub/irkerbridge.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/server-side/svnpubsub/irkerbridge.py (original)
+++ subversion/branches/authzperf/tools/server-side/svnpubsub/irkerbridge.py Sun Jun  5 15:03:52 2016
@@ -86,7 +86,6 @@ import sys
 import posixpath
 import socket
 import json
-import urlparse
 import optparse
 import ConfigParser
 import traceback
@@ -95,6 +94,14 @@ import re
 import fnmatch
 from string import Template
 
+try:
+  # Python >=3.0
+  from urllib.parse import urlparse
+except ImportError:
+  # Python <3.0
+  from urlparse import urlparse
+
+
 # Packages that come with svnpubsub
 import svnpubsub.client
 import daemonize
@@ -110,7 +117,7 @@ class Daemon(daemonize.Daemon):
     pass
 
   def run(self):
-    print 'irkerbridge started, pid=%d' % (os.getpid())
+    print('irkerbridge started, pid=%d' % (os.getpid()))
 
     mc = svnpubsub.client.MultiClient(self.bdec.urls,
                                       self.bdec.commit,
@@ -197,7 +204,7 @@ class BigDoEverythingClass(object):
     json_msg = json.dumps(msg)
     sock.sendto(json_msg, (irker_list[0],int(irker_list[1])))
     if self.options.verbose:
-      print "SENT: %s to %s" % (json_msg, irker)
+      print("SENT: %s to %s" % (json_msg, irker))
 
   def join_all(self):
     # Like self.commit(), but ignores self.config.get(section, "template").
@@ -212,8 +219,8 @@ 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("RECV: from %s" % url)
+      print(json.dumps(vars(commit), indent=2))
 
     try:
       config_sections = self.locate_matching_configs(commit)
@@ -233,14 +240,14 @@ class BigDoEverythingClass(object):
             self._send(irker, msg)
 
     except:
-      print "Unexpected error:"
+      print("Unexpected error:")
       traceback.print_exc()
       sys.stdout.flush()
       raise
 
   def event(self, url, event_name, event_arg):
     if self.options.verbose or event_name != "ping":
-      print 'EVENT: %s from %s' % (event_name, url)
+      print('EVENT: %s from %s' % (event_name, url))
       sys.stdout.flush()
 
 
@@ -258,7 +265,7 @@ class ReloadableConfig(ConfigParser.Safe
     self.reload()
 
   def reload(self):
-    print "RELOAD: config file: %s" % self.fname
+    print("RELOAD: config file: %s" % self.fname)
     sys.stdout.flush()
 
     # Delete everything. Just re-reading would overlay, and would not

Modified: subversion/branches/authzperf/tools/server-side/svnpubsub/svntweet.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/server-side/svnpubsub/svntweet.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/server-side/svnpubsub/svntweet.py (original)
+++ subversion/branches/authzperf/tools/server-side/svnpubsub/svntweet.py Sun Jun  5 15:03:52 2016
@@ -42,7 +42,13 @@ from twisted.internet import defer, reac
 from twisted.python import failure, log
 from twisted.web.client import HTTPClientFactory, HTTPPageDownloader
 
-from urlparse import urlparse
+try:
+  # Python >=3.0
+  from urllib.parse import urlparse
+except ImportError:
+  # Python <3.0
+  from urlparse import urlparse
+
 import time
 import posixpath
 
@@ -50,7 +56,7 @@ sys.path.insert(0, os.path.join(os.path.
 try:
     import twitter
 except:
-    print "Get a copy of twitty-twister from <http://github.com/dustin/twitty-twister>"
+    print("Get a copy of twitty-twister from <http://github.com/dustin/twitty-twister>")
     sys.exit(-1)
 class Config(object):
     def __init__(self, path):
@@ -231,7 +237,7 @@ def main(config_file):
 
 if __name__ == "__main__":
     if len(sys.argv) != 2:
-        print "invalid args, read source code"
+        print("invalid args, read source code")
         sys.exit(0)
     log.startLogging(sys.stdout)
     main(sys.argv[1])

Modified: subversion/branches/authzperf/tools/server-side/svnpubsub/svnwcsub.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/server-side/svnpubsub/svnwcsub.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/server-side/svnpubsub/svnwcsub.py (original)
+++ subversion/branches/authzperf/tools/server-side/svnpubsub/svnwcsub.py Sun Jun  5 15:03:52 2016
@@ -47,6 +47,7 @@ import errno
 import subprocess
 import threading
 import sys
+import stat
 import os
 import re
 import posixpath
@@ -482,7 +483,7 @@ def handle_options(options):
         except OSError:
             pass
         fd = os.open(options.pidfile, os.O_WRONLY | os.O_CREAT | os.O_EXCL,
-                     0444)
+                     stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH)
         os.write(fd, '%d\n' % pid)
         os.close(fd)
         logging.info('pid %d written to %s', pid, options.pidfile)

Modified: subversion/branches/authzperf/tools/server-side/test_svn_server_log_parse.py
URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/tools/server-side/test_svn_server_log_parse.py?rev=1746927&r1=1746926&r2=1746927&view=diff
==============================================================================
--- subversion/branches/authzperf/tools/server-side/test_svn_server_log_parse.py (original)
+++ subversion/branches/authzperf/tools/server-side/test_svn_server_log_parse.py Sun Jun  5 15:03:52 2016
@@ -607,5 +607,5 @@ if __name__ == '__main__':
     finally:
         try:
             os.unlink(tmp)
-        except Exception, e:
+        except Exception as e:
             sys.stderr.write('os.unlink(tmp): %s\n' % (e,))