Browse Source

print(): Switch from statement to funtion.

Michael K 10 years ago
parent
commit
81b11cd0b1
3 changed files with 22 additions and 22 deletions
  1. 1 1
      bin/dul-receive-pack
  2. 1 1
      bin/dul-upload-pack
  3. 20 20
      bin/dulwich

+ 1 - 1
bin/dul-receive-pack

@@ -22,7 +22,7 @@ import os
 import sys
 
 if len(sys.argv) < 2:
-    print >>sys.stderr, "usage: %s <git-dir>" % os.path.basename(sys.argv[0])
+    sys.stderr.write("usage: %s <git-dir>\n" % os.path.basename(sys.argv[0]))
     sys.exit(1)
 
 sys.exit(serve_command(ReceivePackHandler))

+ 1 - 1
bin/dul-upload-pack

@@ -22,7 +22,7 @@ import os
 import sys
 
 if len(sys.argv) < 2:
-    print >>sys.stderr, "usage: %s <git-dir>" % os.path.basename(sys.argv[0])
+    sys.stderr.write("usage: %s <git-dir>\n" % os.path.basename(sys.argv[0]))
     sys.exit(1)
 
 sys.exit(serve_command(UploadPackHandler))

+ 20 - 20
bin/dulwich

@@ -80,9 +80,9 @@ def cmd_fetch(args):
     if "--all" in opts:
         determine_wants = r.object_store.determine_wants_all
     refs = client.fetch(path, r, progress=sys.stdout.write)
-    print "Remote refs:"
+    print("Remote refs:")
     for item in refs.iteritems():
-        print "%s -> %s" % item
+        print("%s -> %s" % item)
 
 
 def cmd_log(args):
@@ -98,7 +98,7 @@ def cmd_diff(args):
     opts, args = getopt(args, "", [])
 
     if args == []:
-        print "Usage: dulwich diff COMMITID"
+        print("Usage: dulwich diff COMMITID")
         sys.exit(1)
 
     r = Repo(".")
@@ -112,37 +112,37 @@ def cmd_dump_pack(args):
     opts, args = getopt(args, "", [])
 
     if args == []:
-        print "Usage: dulwich dump-pack FILENAME"
+        print("Usage: dulwich dump-pack FILENAME")
         sys.exit(1)
 
     basename, _ = os.path.splitext(args[0])
     x = Pack(basename)
-    print "Object names checksum: %s" % x.name()
-    print "Checksum: %s" % sha_to_hex(x.get_stored_checksum())
+    print("Object names checksum: %s" % x.name())
+    print("Checksum: %s" % sha_to_hex(x.get_stored_checksum()))
     if not x.check():
-        print "CHECKSUM DOES NOT MATCH"
-    print "Length: %d" % len(x)
+        print("CHECKSUM DOES NOT MATCH")
+    print("Length: %d" % len(x))
     for name in x:
         try:
-            print "\t%s" % x[name]
+            print("\t%s" % x[name])
         except KeyError, k:
-            print "\t%s: Unable to resolve base %s" % (name, k)
+            print("\t%s: Unable to resolve base %s" % (name, k))
         except ApplyDeltaError, e:
-            print "\t%s: Unable to apply delta: %r" % (name, e)
+            print("\t%s: Unable to apply delta: %r" % (name, e))
 
 
 def cmd_dump_index(args):
     opts, args = getopt(args, "", [])
 
     if args == []:
-        print "Usage: dulwich dump-index FILENAME"
+        print("Usage: dulwich dump-index FILENAME")
         sys.exit(1)
 
     filename = args[0]
     idx = Index(filename)
 
     for o in idx:
-        print o, idx[o]
+        print(o, idx[o])
 
 
 def cmd_init(args):
@@ -162,7 +162,7 @@ def cmd_clone(args):
     opts = dict(opts)
 
     if args == []:
-        print "usage: dulwich clone host:path [PATH]"
+        print("usage: dulwich clone host:path [PATH]")
         sys.exit(1)
 
     source = args.pop(0)
@@ -183,7 +183,7 @@ def cmd_commit(args):
 def cmd_commit_tree(args):
     opts, args = getopt(args, "", ["message"])
     if args == []:
-        print "usage: dulwich commit-tree tree"
+        print("usage: dulwich commit-tree tree")
         sys.exit(1)
     opts = dict(opts)
     porcelain.commit_tree(".", tree=args[0], message=opts["--message"])
@@ -196,7 +196,7 @@ def cmd_update_server_info(args):
 def cmd_symbolic_ref(args):
     opts, args = getopt(args, "", ["ref-name", "force"])
     if not args:
-        print "Usage: dulwich symbolic-ref REF_NAME [--force]"
+        print("Usage: dulwich symbolic-ref REF_NAME [--force]")
         sys.exit(1)
 
     ref_name = args.pop(0)
@@ -211,7 +211,7 @@ def cmd_show(args):
 def cmd_diff_tree(args):
     opts, args = getopt(args, "", [])
     if len(args) < 2:
-        print "Usage: dulwich diff-tree OLD-TREE NEW-TREE"
+        print("Usage: dulwich diff-tree OLD-TREE NEW-TREE")
         sys.exit(1)
     porcelain.diff_tree(".", args[0], args[1])
 
@@ -219,7 +219,7 @@ def cmd_diff_tree(args):
 def cmd_rev_list(args):
     opts, args = getopt(args, "", [])
     if len(args) < 1:
-        print 'Usage: dulwich rev-list COMMITID...'
+        print('Usage: dulwich rev-list COMMITID...')
         sys.exit(1)
     porcelain.rev_list('.', args)
 
@@ -269,11 +269,11 @@ commands = {
     }
 
 if len(sys.argv) < 2:
-    print "Usage: %s <%s> [OPTIONS...]" % (sys.argv[0], "|".join(commands.keys()))
+    print("Usage: %s <%s> [OPTIONS...]" % (sys.argv[0], "|".join(commands.keys())))
     sys.exit(1)
 
 cmd = sys.argv[1]
 if not cmd in commands:
-    print "No such subcommand: %s" % cmd
+    print("No such subcommand: %s" % cmd)
     sys.exit(1)
 commands[cmd](sys.argv[2:])