1 files changed, 16 insertions, 1 deletions
diff --git a/lldb/scripts/Python/modify-python-lldb.py b/lldb/scripts/Python/modify-python-lldb.py
index 7b9c26c..9912cd7 100644
--- a/lldb/scripts/Python/modify-python-lldb.py
+++ b/lldb/scripts/Python/modify-python-lldb.py
@@ -21,12 +21,21 @@
 # subsystem.
 #
 
+# System modules
 import sys, re
 if sys.version_info.major >= 3:
     import io as StringIO
 else:
     import StringIO
 
+# import use_lldb_suite so we can find third-party and helper modules
+import use_lldb_suite
+
+# Third party modules
+import six
+
+# LLDB modules
+
 if len(sys.argv) != 2:
     output_name = "./lldb.py"
 else:
@@ -190,9 +199,15 @@ eq_def = "    def __eq__(self, other): return isinstance(other, %s) and %s"
 ne_def = "    def __ne__(self, other): return not self.__eq__(other)"
 
 # Called to implement truth value testing and the built-in operation bool();
+# Note that Python 2 uses __nonzero__(), whereas Python 3 uses __bool__()
 # should return False or True, or their integer equivalents 0 or 1.
 # Delegate to self.IsValid() if it is defined for the current lldb object.
-nonzero_def = "    def __nonzero__(self): return self.IsValid()"
+
+if six.PY2:
+    print("Test")
+    nonzero_def = "    def __nonzero__(self): return self.IsValid()"
+else:
+    nonzero_def = "    def __bool__(self): return self.IsValid()"
 
 # A convenience iterator for SBSymbol!
 symbol_in_section_iter_def = '''