From aa399f6b8bf55cd02f99ef3c55b61482e2f74014 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Mon, 8 Sep 2014 21:06:13 +0200 Subject: [PATCH] Use "catch" instead of "trap" for exceptions. This is the idiomatic word in the Python world. --- django/contrib/auth/management/commands/createsuperuser.py | 4 ++-- docs/topics/pagination.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/django/contrib/auth/management/commands/createsuperuser.py b/django/contrib/auth/management/commands/createsuperuser.py index 93ac89b9fb3..65ad94b6949 100644 --- a/django/contrib/auth/management/commands/createsuperuser.py +++ b/django/contrib/auth/management/commands/createsuperuser.py @@ -76,8 +76,8 @@ class Command(BaseCommand): else: # Prompt for username/password, and any other required fields. - # Enclose this whole thing in a try/except to trap for a - # keyboard interrupt and exit gracefully. + # Enclose this whole thing in a try/except to catch + # KeyboardInterrupt and exit gracefully. default_username = get_default_username() try: diff --git a/docs/topics/pagination.txt b/docs/topics/pagination.txt index f3c8e35c252..6ab12b2d1be 100644 --- a/docs/topics/pagination.txt +++ b/docs/topics/pagination.txt @@ -204,8 +204,8 @@ Attributes 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 -to trap the ``InvalidPage`` exception, but if you'd like more granularity, you -can trap either of the following exceptions: +to catch the ``InvalidPage`` exception, but if you'd like more granularity, +you can catch either of the following exceptions: .. exception:: PageNotAnInteger