subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1743550 - in /subversion/trunk: build/ contrib/server-side/ tools/client-side/ tools/dev/benchmarks/RepoPerf/ tools/dev/benchmarks/suite1/ tools/dist/
Date Thu, 12 May 2016 19:42:36 GMT
Author: stefan2
Date: Thu May 12 19:42:36 2016
New Revision: 1743550

URL: http://svn.apache.org/viewvc?rev=1743550&view=rev
Log:
Fix the usage of empty line print() under Python 2.

* build/run_tests.py
* contrib/server-side/svn-tweak-author.py
* tools/client-side/mergeinfo-sanitizer.py
* tools/client-side/svn-vendor.py
* tools/dev/benchmarks/RepoPerf/copy_repo.py
* tools/dev/benchmarks/RepoPerf/win_repo_bench.py
* tools/dev/benchmarks/suite1/benchmark.py
* tools/dist/collect_sigs.py
  (): Actually print an empty string line instead of an empty tuple.

Modified:
    subversion/trunk/build/run_tests.py
    subversion/trunk/contrib/server-side/svn-tweak-author.py
    subversion/trunk/tools/client-side/mergeinfo-sanitizer.py
    subversion/trunk/tools/client-side/svn-vendor.py
    subversion/trunk/tools/dev/benchmarks/RepoPerf/copy_repo.py
    subversion/trunk/tools/dev/benchmarks/RepoPerf/win_repo_bench.py
    subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py
    subversion/trunk/tools/dist/collect_sigs.py

Modified: subversion/trunk/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1743550&r1=1743549&r2=1743550&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Thu May 12 19:42:36 2016
@@ -482,7 +482,7 @@ class TestHarness:
     for t in threads:
       t.join()
 
-    print()
+    print("")
 
     # Aggregate and log the results
     failed = 0

Modified: subversion/trunk/contrib/server-side/svn-tweak-author.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/svn-tweak-author.py?rev=1743550&r1=1743549&r2=1743550&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/svn-tweak-author.py (original)
+++ subversion/trunk/contrib/server-side/svn-tweak-author.py Thu May 12 19:42:36 2016
@@ -74,7 +74,7 @@ def tweak_rev_author(fs_obj, revision, a
         fs.svn_fs_change_rev_prop(fs_obj, revision,
                                   core.SVN_PROP_REVISION_AUTHOR, author)
     except:
-        print()
+        print("")
         raise
     print("done.")
 

Modified: subversion/trunk/tools/client-side/mergeinfo-sanitizer.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/mergeinfo-sanitizer.py?rev=1743550&r1=1743549&r2=1743550&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/mergeinfo-sanitizer.py (original)
+++ subversion/trunk/tools/client-side/mergeinfo-sanitizer.py Thu May 12 19:42:36 2016
@@ -188,7 +188,7 @@ def sanitize_mergeinfo(parsed_original_m
     sys.stdout.write(bogus_mergeinfo_path + ": ")
     for revision_range in bogus_mergeinfo_deleted[bogus_mergeinfo_path]:
       sys.stdout.write(str(revision_range.start + 1) + "-" + str(revision_range.end) + ",")
-    print()
+    print("")
 
 ##
 # This function tries to 'propset the new mergeinfo into the working copy.
@@ -313,7 +313,7 @@ if __name__ == "__main__":
   try:
     main()
   except KeyboardInterrupt:
-    print()
+    print("")
     sys.stderr.write("The script is interrupted and stopped manually.")
-    print()
+    print("")
 

Modified: subversion/trunk/tools/client-side/svn-vendor.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-vendor.py?rev=1743550&r1=1743549&r2=1743550&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svn-vendor.py (original)
+++ subversion/trunk/tools/client-side/svn-vendor.py Thu May 12 19:42:36 2016
@@ -313,7 +313,7 @@ class Config(dict):
             for s in o.helpmsg.split('\n'):
                 print("# %s" % s)
             print("%-20s: %s" % (k, str(o)))
-            print()
+            print("")
 
 
 class SvnVndImport(cmd.Cmd):
@@ -426,7 +426,7 @@ class SvnVndImport(cmd.Cmd):
         except InvalidUsageException as e:
             if e.cmd is not None:
                 print("!!! Invalid usage of `%s' command: %s" % (e.cmd, e))
-                print()
+                print("")
                 self.onecmd("help " + e.cmd)
             else:
                 print("!!! %s" % e)
@@ -1041,7 +1041,7 @@ class SvnVndImport(cmd.Cmd):
         colsz = int((self.termwidth - 14) / 2)
         if len(self.prepare_ops):
             print("Currently recorded preparatory operations:")
-            print()
+            print("")
             print("%5s  %s  %-*s  %-*s" %
                     ("#", "Op", colsz, "Source", colsz, "Destination"))
             for id, o in enumerate(self.prepare_ops):
@@ -1053,10 +1053,10 @@ class SvnVndImport(cmd.Cmd):
                             (id, o[0], colsz, o[1], colsz, o[2]))
                 else:
                     print("%5d  %s  %-*s" % (id, o[0], colsz, o[1]))
-            print()
+            print("")
         else:
             print("No copies/moves/removals recorded")
-            print()
+            print("")
 
     def do_save(self, arg):
         '''
@@ -1162,7 +1162,7 @@ if __name__ == '__main__':
     if p.returncode != 0:
         print("%s: does not appear to be SVN working copy." % args.wcdir)
         print("`svn info' exited with status %d and returned:" % p.returncode)
-        print()
+        print("")
         print(se.decode())
         sys.exit(1)
     imp = SvnVndImport(args.wcdir, args.importdir, so.decode())

Modified: subversion/trunk/tools/dev/benchmarks/RepoPerf/copy_repo.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/benchmarks/RepoPerf/copy_repo.py?rev=1743550&r1=1743549&r2=1743550&view=diff
==============================================================================
--- subversion/trunk/tools/dev/benchmarks/RepoPerf/copy_repo.py (original)
+++ subversion/trunk/tools/dev/benchmarks/RepoPerf/copy_repo.py Thu May 12 19:42:36 2016
@@ -297,10 +297,10 @@ def show_usage():
   """ Write a simple CL docstring """
 
   print("Copies and duplicates repositories in a way that mimics larger deployments.")
-  print()
+  print("")
   print("Usage:")
   print("copy_repo.py SRC DST COUNT SEPARATOR_SIZE")
-  print()
+  print("")
   print("SRC            Immediate parent folder of all the repositories to copy.")
   print("DST            Folder to copy into; current contents will be lost.")
   print("COUNT          Number of copies to create of each source repository.")

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=1743550&r1=1743549&r2=1743550&view=diff
==============================================================================
--- subversion/trunk/tools/dev/benchmarks/RepoPerf/win_repo_bench.py (original)
+++ subversion/trunk/tools/dev/benchmarks/RepoPerf/win_repo_bench.py Thu May 12 19:42:36 2016
@@ -190,7 +190,7 @@ def run_test_cs_configurations(command,
 
   print
   print(command)
-  print()
+  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("")
   print(command)
-  print()
+  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=1743550&r1=1743549&r2=1743550&view=diff
==============================================================================
--- subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py (original)
+++ subversion/trunk/tools/dev/benchmarks/suite1/benchmark.py Thu May 12 19:42:36 2016
@@ -1270,7 +1270,7 @@ if __name__ == '__main__':
   def usage(msg=None):
     parser.print_help()
     if msg:
-      print()
+      print("")
       print(msg)
     bail()
 

Modified: subversion/trunk/tools/dist/collect_sigs.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/collect_sigs.py?rev=1743550&r1=1743549&r2=1743550&view=diff
==============================================================================
--- subversion/trunk/tools/dist/collect_sigs.py (original)
+++ subversion/trunk/tools/dist/collect_sigs.py Thu May 12 19:42:36 2016
@@ -311,7 +311,7 @@ def cat_signatures(basename):
 
 def print_content_type(mimetype):
   print("Content-Type: " + mimetype)
-  print()
+  print("")
 
 def main():
   form = cgi.FieldStorage()



Mime
View raw message