Skip to content

Commit 3057732

Browse files
committed
Use implementation agnostic names
1 parent f758705 commit 3057732

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

bpython/curtsies.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import curtsies.events
1313

1414
from bpython.curtsiesfrontend.repl import BaseRepl
15-
from bpython.curtsiesfrontend.coderunner import SystemExitFromCodeGreenlet
15+
from bpython.curtsiesfrontend.coderunner import SystemExitFromCodeRunner
1616
from bpython.curtsiesfrontend.interpreter import Interp
1717
from bpython import args as bpargs
1818
from bpython import translations
@@ -87,11 +87,11 @@ def process_event_and_paint(self, e):
8787
try:
8888
if e is not None:
8989
self.process_event(e)
90-
except (SystemExitFromCodeGreenlet, SystemExit) as err:
90+
except (SystemExitFromCodeRunner, SystemExit) as err:
9191
array, cursor_pos = self.paint(
9292
about_to_exit=True,
9393
user_quit=isinstance(err,
94-
SystemExitFromCodeGreenlet))
94+
SystemExitFromCodeRunner))
9595
scrolled = self.window.render_to_terminal(array, cursor_pos)
9696
self.scroll_offset += scrolled
9797
raise
@@ -188,7 +188,7 @@ def main(args=None, locals_=None, banner=None, welcome_message=None):
188188
with repl:
189189
repl.height, repl.width = win.t.height, win.t.width
190190
exit_value = repl.mainloop()
191-
except (SystemExitFromCodeGreenlet, SystemExit) as e:
191+
except (SystemExitFromCodeRunner, SystemExit) as e:
192192
exit_value = e.args
193193
return extract_exit_value(exit_value)
194194

bpython/curtsiesfrontend/coderunner.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,32 @@ class SigintHappened(object):
2525
"""If this class is returned, a SIGINT happened while the main greenlet"""
2626

2727

28-
class SystemExitFromCodeGreenlet(SystemExit):
28+
class SystemExitFromCodeRunner(SystemExit):
2929
"""If this class is returned, a SystemExit happened while in the code
3030
greenlet"""
3131

3232

33-
class RequestFromCodeGreenlet(object):
34-
"""Message from the code greenlet"""
33+
class RequestFromCodeRunner(object):
34+
"""Message from the code runner"""
3535

3636

37-
class Wait(RequestFromCodeGreenlet):
37+
class Wait(RequestFromCodeRunner):
3838
"""Running code would like the main loop to run for a bit"""
3939

4040

41-
class Refresh(RequestFromCodeGreenlet):
41+
class Refresh(RequestFromCodeRunner):
4242
"""Running code would like the main loop to refresh the display"""
4343

4444

45-
class Done(RequestFromCodeGreenlet):
45+
class Done(RequestFromCodeRunner):
4646
"""Running code is done running"""
4747

4848

49-
class Unfinished(RequestFromCodeGreenlet):
49+
class Unfinished(RequestFromCodeRunner):
5050
"""Source code wasn't executed because it wasn't fully formed"""
5151

5252

53-
class SystemExitRequest(RequestFromCodeGreenlet):
53+
class SystemExitRequest(RequestFromCodeRunner):
5454
"""Running code raised a SystemExit"""
5555

5656
def __init__(self, args):
@@ -145,7 +145,7 @@ def run_code(self, for_code=None):
145145
request = self.code_greenlet.switch(for_code)
146146

147147
logger.debug('request received from code was %r', request)
148-
if not isinstance(request, RequestFromCodeGreenlet):
148+
if not isinstance(request, RequestFromCodeRunner):
149149
raise ValueError("Not a valid value from code greenlet: %r" %
150150
request)
151151
if isinstance(request, (Wait, Refresh)):
@@ -160,7 +160,7 @@ def run_code(self, for_code=None):
160160
return request
161161
elif isinstance(request, SystemExitRequest):
162162
self._unload_code()
163-
raise SystemExitFromCodeGreenlet(request.args)
163+
raise SystemExitFromCodeRunner(request.args)
164164

165165
def sigint_handler(self, *args):
166166
"""SIGINT handler to use while code is running or request being

0 commit comments

Comments
 (0)