Skip to content

Commit

Permalink
exiting programs now on SIGINT a la C programs
Browse files Browse the repository at this point in the history
  • Loading branch information
dmalan committed Jul 9, 2017
1 parent 7e774d6 commit 13ddec0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
package_dir={"": "src"},
packages=["cs50"],
url="https://github.com/cs50/python-cs50",
version="2.1.1"
version="2.2.0"
)
5 changes: 4 additions & 1 deletion src/cs50/cs50.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ def get_string(prompt=None):
Read a line of text from standard input and return it as a string,
sans trailing line ending. Supports CR (\r), LF (\n), and CRLF (\r\n)
as line endings. If user inputs only a line ending, returns "", not None.
Returns None upon error or no input whatsoever (i.e., just EOF).
Returns None upon error or no input whatsoever (i.e., just EOF). Exits
from Python altogether on SIGINT.
"""
try:
if prompt is not None:
Expand All @@ -126,5 +127,7 @@ def get_string(prompt=None):
if not s:
return None
return re.sub(r"(?:\r|\r\n|\n)$", "", s)
except KeyboardInterrupt:
sys.exit("")
except ValueError:
return None

0 comments on commit 13ddec0

Please sign in to comment.