diff options
Diffstat (limited to 'django/db/backends/postgresql/client.py')
| -rw-r--r-- | django/db/backends/postgresql/client.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/django/db/backends/postgresql/client.py b/django/db/backends/postgresql/client.py index 005f43ddb8..466c2986d2 100644 --- a/django/db/backends/postgresql/client.py +++ b/django/db/backends/postgresql/client.py @@ -1,4 +1,5 @@ import os +import signal import subprocess from django.core.files.temp import NamedTemporaryFile @@ -34,6 +35,7 @@ class DatabaseClient(BaseDatabaseClient): args += [dbname] temp_pgpass = None + sigint_handler = signal.getsignal(signal.SIGINT) try: if passwd: # Create temporary .pgpass file. @@ -54,8 +56,12 @@ class DatabaseClient(BaseDatabaseClient): # If the current locale can't encode the data, we let # the user input the password manually. pass + # Allow SIGINT to pass to psql to abort queries. + signal.signal(signal.SIGINT, signal.SIG_IGN) subprocess.check_call(args) finally: + # Restore the orignal SIGINT handler. + signal.signal(signal.SIGINT, sigint_handler) if temp_pgpass: temp_pgpass.close() if 'PGPASSFILE' in os.environ: # unit tests need cleanup |