From e6f78255265abcab510a8e02360e8cac9b905019 Mon Sep 17 00:00:00 2001 From: Sinan Midillili Date: Fri, 6 Jan 2017 18:35:12 -0500 Subject: [PATCH 1/3] Update PythonBreakpoints.py --- PythonBreakpoints.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/PythonBreakpoints.py b/PythonBreakpoints.py index 048fa73..5e578ce 100644 --- a/PythonBreakpoints.py +++ b/PythonBreakpoints.py @@ -87,6 +87,10 @@ def as_string(self, indent): format breakpoint string """ debugger = settings.get('debugger', 'pdb') + custom_string = settings.get('breakpoint_string', 'pdb') + if not debugger and breakpoint_string: + return "{breakpoint_string} # breakpoint {uid}{mark} noqa //\n".format( + breakpoint_string=custom_string, uid=self.uid, mark='x' if self.in_block else '') return "{indent}import {dbg}; {dbg}.set_trace() # breakpoint {uid}{mark} //\n".format( indent=' ' * indent, dbg=debugger, uid=self.uid, mark='x' if self.in_block else '') From 91fcb42838ed1750cb0356c53b59bd0681284f4e Mon Sep 17 00:00:00 2001 From: sinanm89 Date: Fri, 6 Jan 2017 19:19:26 -0500 Subject: [PATCH 2/3] fixed stringfying --- PythonBreakpoints.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PythonBreakpoints.py b/PythonBreakpoints.py index 5e578ce..79bbaed 100644 --- a/PythonBreakpoints.py +++ b/PythonBreakpoints.py @@ -87,10 +87,10 @@ def as_string(self, indent): format breakpoint string """ debugger = settings.get('debugger', 'pdb') - custom_string = settings.get('breakpoint_string', 'pdb') - if not debugger and breakpoint_string: + custom_string = settings.get('breakpoint_string', None) + if custom_string: return "{breakpoint_string} # breakpoint {uid}{mark} noqa //\n".format( - breakpoint_string=custom_string, uid=self.uid, mark='x' if self.in_block else '') + breakpoint_string=custom_string, uid=self.uid, mark='x' if self.in_block else '') return "{indent}import {dbg}; {dbg}.set_trace() # breakpoint {uid}{mark} //\n".format( indent=' ' * indent, dbg=debugger, uid=self.uid, mark='x' if self.in_block else '') From fb4982c7bfc68dd8857022e666ea5cdda33f33da Mon Sep 17 00:00:00 2001 From: sinanm89 Date: Fri, 6 Jan 2017 19:22:57 -0500 Subject: [PATCH 3/3] added breakpoint string indentation --- PythonBreakpoints.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PythonBreakpoints.py b/PythonBreakpoints.py index 79bbaed..0c0a68e 100644 --- a/PythonBreakpoints.py +++ b/PythonBreakpoints.py @@ -89,8 +89,9 @@ def as_string(self, indent): debugger = settings.get('debugger', 'pdb') custom_string = settings.get('breakpoint_string', None) if custom_string: - return "{breakpoint_string} # breakpoint {uid}{mark} noqa //\n".format( - breakpoint_string=custom_string, uid=self.uid, mark='x' if self.in_block else '') + return "{indent}{breakpoint_string} # breakpoint {uid}{mark} noqa //\n".format( + indent=' ' * indent, breakpoint_string=custom_string, + uid=self.uid, mark='x' if self.in_block else '') return "{indent}import {dbg}; {dbg}.set_trace() # breakpoint {uid}{mark} //\n".format( indent=' ' * indent, dbg=debugger, uid=self.uid, mark='x' if self.in_block else '')