p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use "catch" instead of "trap" for exceptions. 

This is the idiomatic word in the Python world.
This commit is contained in:
Aymeric Augustin 2014-09-08 21:06:13 +02:00
parent d4467ede77
commit aa399f6b8b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/auth/management/commands/createsuperuser.py
View File

@ -76,8 +76,8 @@ class Command(BaseCommand):
else: else:
# Prompt for username/password, and any other required fields. # Prompt for username/password, and any other required fields.
# Enclose this whole thing in a try/except to trap for a # Enclose this whole thing in a try/except to catch
# keyboard interrupt and exit gracefully. # KeyboardInterrupt and exit gracefully.
default_username = get_default_username() default_username = get_default_username()
try: try:

4
docs/topics/pagination.txt
View File

@ -204,8 +204,8 @@ Attributes
The :meth:`Paginator.page` method raises an exception if the requested page is The :meth:`Paginator.page` method raises an exception if the requested page is
invalid (i.e., not an integer) or contains no objects. Generally, it's enough invalid (i.e., not an integer) or contains no objects. Generally, it's enough
to trap the ``InvalidPage`` exception, but if you'd like more granularity, you to catch the ``InvalidPage`` exception, but if you'd like more granularity,
can trap either of the following exceptions: you can catch either of the following exceptions:
.. exception:: PageNotAnInteger .. exception:: PageNotAnInteger