Commit 3057732
committed
Use implementation agnostic names
1 parent f758705 commit 3057732
2 files changed
Lines changed: 14 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,7 +12,7 @@ | |||
| 12 | 12 | import curtsies.events | |
| 13 | 13 | ||
| 14 | 14 | from bpython.curtsiesfrontend.repl import BaseRepl | |
| 15 | - from bpython.curtsiesfrontend.coderunner import SystemExitFromCodeGreenlet | ||
| 15 | + from bpython.curtsiesfrontend.coderunner import SystemExitFromCodeRunner | ||
| 16 | 16 | from bpython.curtsiesfrontend.interpreter import Interp | |
| 17 | 17 | from bpython import args as bpargs | |
| 18 | 18 | from bpython import translations | |
@@ -87,11 +87,11 @@ def process_event_and_paint(self, e): | |||
| 87 | 87 | try: | |
| 88 | 88 | if e is not None: | |
| 89 | 89 | self.process_event(e) | |
| 90 | - except (SystemExitFromCodeGreenlet, SystemExit) as err: | ||
| 90 | + except (SystemExitFromCodeRunner, SystemExit) as err: | ||
| 91 | 91 | array, cursor_pos = self.paint( | |
| 92 | 92 | about_to_exit=True, | |
| 93 | 93 | user_quit=isinstance(err, | |
| 94 | - SystemExitFromCodeGreenlet)) | ||
| 94 | + SystemExitFromCodeRunner)) | ||
| 95 | 95 | scrolled = self.window.render_to_terminal(array, cursor_pos) | |
| 96 | 96 | self.scroll_offset += scrolled | |
| 97 | 97 | raise | |
@@ -188,7 +188,7 @@ def main(args=None, locals_=None, banner=None, welcome_message=None): | |||
| 188 | 188 | with repl: | |
| 189 | 189 | repl.height, repl.width = win.t.height, win.t.width | |
| 190 | 190 | exit_value = repl.mainloop() | |
| 191 | - except (SystemExitFromCodeGreenlet, SystemExit) as e: | ||
| 191 | + except (SystemExitFromCodeRunner, SystemExit) as e: | ||
| 192 | 192 | exit_value = e.args | |
| 193 | 193 | return extract_exit_value(exit_value) | |
| 194 | 194 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -25,32 +25,32 @@ class SigintHappened(object): | |||
| 25 | 25 | """If this class is returned, a SIGINT happened while the main greenlet""" | |
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | - class SystemExitFromCodeGreenlet(SystemExit): | ||
| 28 | + class SystemExitFromCodeRunner(SystemExit): | ||
| 29 | 29 | """If this class is returned, a SystemExit happened while in the code | |
| 30 | 30 | greenlet""" | |
| 31 | 31 | ||
| 32 | 32 | ||
| 33 | - class RequestFromCodeGreenlet(object): | ||
| 34 | - """Message from the code greenlet""" | ||
| 33 | + class RequestFromCodeRunner(object): | ||
| 34 | + """Message from the code runner""" | ||
| 35 | 35 | ||
| 36 | 36 | ||
| 37 | - class Wait(RequestFromCodeGreenlet): | ||
| 37 | + class Wait(RequestFromCodeRunner): | ||
| 38 | 38 | """Running code would like the main loop to run for a bit""" | |
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | - class Refresh(RequestFromCodeGreenlet): | ||
| 41 | + class Refresh(RequestFromCodeRunner): | ||
| 42 | 42 | """Running code would like the main loop to refresh the display""" | |
| 43 | 43 | ||
| 44 | 44 | ||
| 45 | - class Done(RequestFromCodeGreenlet): | ||
| 45 | + class Done(RequestFromCodeRunner): | ||
| 46 | 46 | """Running code is done running""" | |
| 47 | 47 | ||
| 48 | 48 | ||
| 49 | - class Unfinished(RequestFromCodeGreenlet): | ||
| 49 | + class Unfinished(RequestFromCodeRunner): | ||
| 50 | 50 | """Source code wasn't executed because it wasn't fully formed""" | |
| 51 | 51 | ||
| 52 | 52 | ||
| 53 | - class SystemExitRequest(RequestFromCodeGreenlet): | ||
| 53 | + class SystemExitRequest(RequestFromCodeRunner): | ||
| 54 | 54 | """Running code raised a SystemExit""" | |
| 55 | 55 | ||
| 56 | 56 | def __init__(self, args): | |
@@ -145,7 +145,7 @@ def run_code(self, for_code=None): | |||
| 145 | 145 | request = self.code_greenlet.switch(for_code) | |
| 146 | 146 | ||
| 147 | 147 | logger.debug('request received from code was %r', request) | |
| 148 | - if not isinstance(request, RequestFromCodeGreenlet): | ||
| 148 | + if not isinstance(request, RequestFromCodeRunner): | ||
| 149 | 149 | raise ValueError("Not a valid value from code greenlet: %r" % | |
| 150 | 150 | request) | |
| 151 | 151 | if isinstance(request, (Wait, Refresh)): | |
@@ -160,7 +160,7 @@ def run_code(self, for_code=None): | |||
| 160 | 160 | return request | |
| 161 | 161 | elif isinstance(request, SystemExitRequest): | |
| 162 | 162 | self._unload_code() | |
| 163 | - raise SystemExitFromCodeGreenlet(request.args) | ||
| 163 | + raise SystemExitFromCodeRunner(request.args) | ||
| 164 | 164 | ||
| 165 | 165 | def sigint_handler(self, *args): | |
| 166 | 166 | """SIGINT handler to use while code is running or request being | |
0 commit comments