pythoner
diff --git a/‎v3/GChartWrapper/README‎
Lines changed: 6 additions & 1 deletion b/‎v3/GChartWrapper/README‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎v3/pg_logger.py‎
Lines changed: 24 additions & 0 deletions b/‎v3/pg_logger.py‎
Lines changed: 24 additions & 0 deletions
@@ -1,6 +1,11 @@
 Downloaded from https://code.google.com/p/google-chartwrapper/
 
 and tweaked to remove dependency on utf-8 encoding, which seems to trip
-up parts of OPT
+up parts of OPT, and to remove unnecessary imports (for security and
+efficiency reasons)
 
 See here for demos: http://justquick.github.io/google-chartwrapper-demos/
+
+See here for the official API, which is now deprecated:
+  https://developers.google.com/chart/image/
+
@@ -54,6 +54,8 @@
 #DEBUG = False
 DEBUG = True
 
+BREAKPOINT_STR = '#break'
+
 
 # simple sandboxing scheme:
 #
@@ -329,6 +331,13 @@ def __init__(self, cumulative_mode, heap_primitives, finalizer_func, disable_sec
 
         self.executed_script = None # Python script to be executed!
 
+        # if there is at least one line that ends with BREAKPOINT_STR,
+        # then activate "breakpoint mode", where execution should stop
+        # ONLY at breakpoint lines.
+        self.breakpoints = []
+
+        self.prev_lineno = -1 # keep track of previous line just executed
+
 
     def get_frame_id(self, cur_frame):
       return self.frame_ordered_ids[cur_frame]
@@ -470,6 +479,15 @@ def interaction(self, frame, traceback, event_type):
         top_frame = tos[0]
         lineno = tos[1]
 
+        # stop at both the breakpoint line and the next executed line,
+        # so that if you set only ONE breakpoint, OPT shows the state
+        # before and after that line gets executed.
+        if self.breakpoints:
+          if not ((lineno in self.breakpoints) or (self.prev_lineno in self.breakpoints)):
+            return
+
+        self.prev_lineno = lineno
+
 
         # debug ...
         '''
@@ -854,6 +872,12 @@ def create_encoded_stack_entry(cur_frame):
     def _runscript(self, script_str):
         self.executed_script = script_str
 
+        for (i, line) in enumerate(self.executed_script.splitlines()):
+          line_no = i + 1
+          if line.endswith(BREAKPOINT_STR):
+            self.breakpoints.append(line_no)
+
+
         # When bdb sets tracing, a number of call and line events happens
         # BEFORE debugger even reaches user's code (and the exact sequence of
         # events depends on python version). So we take special measures to