[lldb] Remove basestring references in examples (NFC)

`basestring` is Python 2 only.
llvm · Dec 13, 2022 · f54497f · f54497f
1 parent fa45b2f
commit f54497f
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 51 deletions.
diff --git a/lldb/examples/summaries/cocoa/CFArray.py b/lldb/examples/summaries/cocoa/CFArray.py
@@ -13,11 +13,6 @@
 import lldb.formatters.metrics
 import lldb.formatters.Logger
 
-try:
-    basestring
-except NameError:
-    basestring = str
-
 statistics = lldb.formatters.metrics.Metrics()
 statistics.add_metric('invalid_isa')
 statistics.add_metric('invalid_pointer')
@@ -222,7 +217,7 @@ def CFArray_SummaryProvider(valobj, dict):
         logger >> "provider gave me " + str(summary)
         if summary is None:
             summary = '<variable is not NSArray>'
-        elif isinstance(summary, basestring):
+        elif isinstance(summary, str):
             pass
         else:
             # we format it like it were a CFString to make it look the same as

diff --git a/lldb/examples/summaries/cocoa/CFBag.py b/lldb/examples/summaries/cocoa/CFBag.py
@@ -13,11 +13,6 @@
 import lldb.formatters.metrics
 import lldb.formatters.Logger
 
-try:
-    basestring
-except NameError:
-    basestring = str
-
 statistics = lldb.formatters.metrics.Metrics()
 statistics.add_metric('invalid_isa')
 statistics.add_metric('invalid_pointer')
@@ -150,7 +145,7 @@ def CFBag_SummaryProvider(valobj, dict):
         #  the mask needs to be changed)
         if summary is None:
             summary = '<variable is not CFBag>'
-        elif isinstance(summary, basestring):
+        elif isinstance(summary, str):
             pass
         else:
             if provider.sys_params.is_64_bit:

diff --git a/lldb/examples/summaries/cocoa/CFBinaryHeap.py b/lldb/examples/summaries/cocoa/CFBinaryHeap.py
@@ -13,11 +13,6 @@
 import lldb.formatters.metrics
 import lldb.formatters.Logger
 
-try:
-    basestring
-except NameError:
-    basestring = str
-
 statistics = lldb.formatters.metrics.Metrics()
 statistics.add_metric('invalid_isa')
 statistics.add_metric('invalid_pointer')
@@ -148,7 +143,7 @@ def CFBinaryHeap_SummaryProvider(valobj, dict):
         #  the mask needs to be changed)
         if summary is None:
             summary = '<variable is not CFBinaryHeap>'
-        elif isinstance(summary, basestring):
+        elif isinstance(summary, str):
             pass
         else:
             if provider.sys_params.is_64_bit:

diff --git a/lldb/examples/summaries/cocoa/CFDictionary.py b/lldb/examples/summaries/cocoa/CFDictionary.py
@@ -13,11 +13,6 @@
 import lldb.formatters.metrics
 import lldb.formatters.Logger
 
-try:
-    basestring
-except NameError
-    basestring = str
-
 statistics = lldb.formatters.metrics.Metrics()
 statistics.add_metric('invalid_isa')
 statistics.add_metric('invalid_pointer')
@@ -227,7 +222,7 @@ def CFDictionary_SummaryProvider(valobj, dict):
         logger >> "got summary " + str(summary)
         if summary is None:
             return '<variable is not NSDictionary>'
-        if isinstance(summary, basestring):
+        if isinstance(summary, str):
             return summary
         return str(summary) + (" key/value pairs" if summary !=
                                1 else " key/value pair")
@@ -249,7 +244,7 @@ def CFDictionary_SummaryProvider2(valobj, dict):
         logger >> "got summary " + str(summary)
         if summary is None:
             summary = '<variable is not CFDictionary>'
-        if isinstance(summary, basestring):
+        if isinstance(summary, str):
             return summary
         else:
             # needed on OSX Mountain Lion

diff --git a/lldb/examples/summaries/cocoa/NSData.py b/lldb/examples/summaries/cocoa/NSData.py
@@ -13,11 +13,6 @@
 import lldb.formatters.metrics
 import lldb.formatters.Logger
 
-try:
-    basestring
-except NameError:
-    basestring = str
-
 statistics = lldb.formatters.metrics.Metrics()
 statistics.add_metric('invalid_isa')
 statistics.add_metric('invalid_pointer')
@@ -141,7 +136,7 @@ def NSData_SummaryProvider(valobj, dict):
         logger >> "got a summary: it is " + str(summary)
         if summary is None:
             summary = '<variable is not NSData>'
-        elif isinstance(summary, basestring):
+        elif isinstance(summary, str):
             pass
         else:
             if summary == 1:
@@ -169,7 +164,7 @@ def NSData_SummaryProvider2(valobj, dict):
         logger >> "got a summary: it is " + str(summary)
         if summary is None:
             summary = '<variable is not CFData>'
-        elif isinstance(summary, basestring):
+        elif isinstance(summary, str):
             pass
         else:
             if summary == 1:

diff --git a/lldb/examples/summaries/cocoa/NSIndexSet.py b/lldb/examples/summaries/cocoa/NSIndexSet.py
@@ -13,11 +13,6 @@
 import lldb.formatters.metrics
 import lldb.formatters.Logger
 
-try:
-    basestring
-except NameError:
-    basestring = str
-
 statistics = lldb.formatters.metrics.Metrics()
 statistics.add_metric('invalid_isa')
 statistics.add_metric('invalid_pointer')
@@ -168,7 +163,7 @@ def NSIndexSet_SummaryProvider(valobj, dict):
         logger >> "got summary " + str(summary)
         if summary is None:
             summary = '<variable is not NSIndexSet>'
-        if isinstance(summary, basestring):
+        if isinstance(summary, str):
             return summary
         else:
             summary = str(summary) + (' indexes' if summary != 1 else ' index')

diff --git a/lldb/examples/summaries/cocoa/NSMachPort.py b/lldb/examples/summaries/cocoa/NSMachPort.py
@@ -13,11 +13,6 @@
 import lldb.formatters.metrics
 import lldb.formatters.Logger
 
-try:
-    basestring
-except NameError:
-    basestring =str
-
 statistics = lldb.formatters.metrics.Metrics()
 statistics.add_metric('invalid_isa')
 statistics.add_metric('invalid_pointer')
@@ -135,7 +130,7 @@ def NSMachPort_SummaryProvider(valobj, dict):
         logger >> "got summary " + str(summary)
         if summary is None:
             summary = '<variable is not NSMachPort>'
-        if isinstance(summary, basestring):
+        if isinstance(summary, str):
             return summay
         return 'mach port: ' + str(summary)
     return 'Summary Unavailable'

diff --git a/lldb/examples/summaries/cocoa/NSSet.py b/lldb/examples/summaries/cocoa/NSSet.py
@@ -13,11 +13,6 @@
 import CFBag
 import lldb.formatters.Logger
 
-try:
-    basestring
-except NameError:
-    basestring = str
-
 statistics = lldb.formatters.metrics.Metrics()
 statistics.add_metric('invalid_isa')
 statistics.add_metric('invalid_pointer')
@@ -247,7 +242,7 @@ def NSSet_SummaryProvider(valobj, dict):
             summary = None
         if summary is None:
             summary = '<variable is not NSSet>'
-        if isinstance(summary, basestring):
+        if isinstance(summary, str):
             return summary
         else:
             summary = str(summary) + \
@@ -276,7 +271,7 @@ def NSSet_SummaryProvider2(valobj, dict):
         #                  the mask needs to be changed)
         if summary is None:
             summary = '<variable is not CFSet>'
-        if isinstance(summary, basestring):
+        if isinstance(summary, str):
             return summary
         else:
             if provider.sys_params.is_64_bit: