public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] gdb: make some random Python files Python 3-compatible
@ 2022-04-26 15:52 Simon Marchi
  0 siblings, 0 replies; only message in thread
From: Simon Marchi @ 2022-04-26 15:52 UTC (permalink / raw)
  To: gdb-cvs

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6bdd7cf11d503be3b85320668b223fcd5cc9f2f4

commit 6bdd7cf11d503be3b85320668b223fcd5cc9f2f4
Author: Simon Marchi <simon.marchi@polymtl.ca>
Date:   Tue Apr 26 11:37:46 2022 -0400

    gdb: make some random Python files Python 3-compatible
    
    I noticed that these files failed to format with Black, because they use
    print without parenthesis (which isn't Python 3 compatible).
    
    I don't know if these files are still relevant, but the change is
    trivial, so here it is.
    
    Change-Id: I116445c2b463486016f824d32effffc915b60766

Diff:
---
 gdb/contrib/test_pubnames_and_indexes.py | 30 +++++++++++++++---------------
 gdb/system-gdbinit/elinos.py             |  2 +-
 gdb/system-gdbinit/wrs-linux.py          |  4 ++--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/gdb/contrib/test_pubnames_and_indexes.py b/gdb/contrib/test_pubnames_and_indexes.py
index b87d2e16806..8e89a59263c 100644
--- a/gdb/contrib/test_pubnames_and_indexes.py
+++ b/gdb/contrib/test_pubnames_and_indexes.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Copyright (C) 2011-2022 Free Software Foundation, Inc.
 #
@@ -102,24 +102,24 @@ def CheckSets(list0, list1, name0, name1):
 
     difference0 = set(list0) - set(list1)
     if len(difference0) != 0:
-        print "Elements in " + name0 + " but not " + name1 + ": (",
-        print len(difference0),
-        print ")"
+        print("Elements in " + name0 + " but not " + name1 + ": (", end=" ")
+        print(len(difference0), end=" ")
+        print(")")
         for element in difference0:
-            print "  " + element
+            print("  " + element)
 
     difference1 = set(list1) - set(list0)
     if len(difference1) != 0:
-        print "Elements in " + name1 + " but not " + name0 + ": (",
-        print len(difference1),
-        print ")"
+        print("Elements in " + name1 + " but not " + name0 + ": (", end=" ")
+        print(len(difference1), end=" ")
+        print(")")
         for element in difference1:
-            print "  " + element
+            print("  " + element)
 
     if len(difference0) != 0 or len(difference1) != 0:
         return True
 
-    print name0 + " and " + name1 + " are identical."
+    print(name0 + " and " + name1 + " are identical.")
     return False
 
 
@@ -152,7 +152,7 @@ def find_executables():
 def main(argv):
     """The main subprogram."""
     if len(argv) != 2:
-        print "Usage: test_pubnames_and_indexes.py <filename>"
+        print("Usage: test_pubnames_and_indexes.py <filename>")
         sys.exit(2)
 
     find_executables()
@@ -200,15 +200,15 @@ def main(argv):
 
     # Find the differences between the various indices.
     if len(gold_index) == 0:
-        print "Gold index is empty"
+        print("Gold index is empty")
         failed |= True
 
     if len(gdb_index) == 0:
-        print "Gdb index is empty"
+        print("Gdb index is empty")
         failed |= True
 
     if len(pubs_list) == 0:
-        print "Pubs list is empty"
+        print("Pubs list is empty")
         failed |= True
 
     failed |= CheckSets(gdb_index, gold_index, "gdb index", "gold index")
@@ -216,7 +216,7 @@ def main(argv):
     failed |= CheckSets(pubs_list, gdb_index, "pubs list", "gdb index")
 
     if failed:
-        print "Test failed"
+        print("Test failed")
         sys.exit(1)
 
 
diff --git a/gdb/system-gdbinit/elinos.py b/gdb/system-gdbinit/elinos.py
index 06724740e73..95a9529bc12 100644
--- a/gdb/system-gdbinit/elinos.py
+++ b/gdb/system-gdbinit/elinos.py
@@ -21,7 +21,7 @@ import gdb
 
 
 def warn(msg):
-    print "warning: %s" % msg
+    print("warning: %s" % msg)
 
 
 def get_elinos_environment():
diff --git a/gdb/system-gdbinit/wrs-linux.py b/gdb/system-gdbinit/wrs-linux.py
index 88e1109a839..e4b225a32de 100644
--- a/gdb/system-gdbinit/wrs-linux.py
+++ b/gdb/system-gdbinit/wrs-linux.py
@@ -21,5 +21,5 @@ if "ENV_PREFIX" in os.environ:
     gdb.execute("set sysroot %s" % os.environ["ENV_PREFIX"])
 
 else:
-    print "warning: ENV_PREFIX environment variable missing."
-    print "The debugger will probably be unable to find the correct system libraries"
+    print("warning: ENV_PREFIX environment variable missing.")
+    print("The debugger will probably be unable to find the correct system libraries")


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-04-26 15:52 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-26 15:52 [binutils-gdb] gdb: make some random Python files Python 3-compatible Simon Marchi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).