[2.1.x] Fixed #29774 -- Fixed django-admin shell hang on startup.
sys.stdin.read() blocks waiting for EOF in shell.py which will
likely never come if the user provides input on stdin via the
keyboard before the shell starts. Added check for a tty to
skip reading stdin if it's not present.
This still allows piping of code into the shell (which should
have no TTY and should have an EOF) but also doesn't cause it
to hang if multi-line input is provided.
Backport of 4e78e389b1
from master.
This commit is contained in:
parent
4acdba42a6
commit
0d5d8ed322
1
AUTHORS
1
AUTHORS
|
@ -10,6 +10,7 @@ answer newbie questions, and generally made Django that much better:
|
|||
Aaron T. Myers <atmyers@gmail.com>
|
||||
Abeer Upadhyay <ab.esquarer@gmail.com>
|
||||
Abhishek Gautam <abhishekg1128@yahoo.com>
|
||||
Adam Allred <adam.w.allred@gmail.com>
|
||||
Adam Bogdał <adam@bogdal.pl>
|
||||
Adam Donaghy
|
||||
Adam Johnson <https://github.com/adamchainz>
|
||||
|
|
|
@ -88,7 +88,7 @@ class Command(BaseCommand):
|
|||
|
||||
# Execute stdin if it has anything to read and exit.
|
||||
# Not supported on Windows due to select.select() limitations.
|
||||
if sys.platform != 'win32' and select.select([sys.stdin], [], [], 0)[0]:
|
||||
if sys.platform != 'win32' and not sys.stdin.isatty() and select.select([sys.stdin], [], [], 0)[0]:
|
||||
exec(sys.stdin.read())
|
||||
return
|
||||
|
||||
|
|
|
@ -11,3 +11,6 @@ Bugfixes
|
|||
|
||||
* Fixed a regression in Django 2.0 where combining ``Q`` objects with ``__in``
|
||||
lookups and lists crashed (:ticket:`29838`).
|
||||
|
||||
* Fixed a regression in Django 1.11 where ``django-admin shell`` may hang
|
||||
on startup (:ticket:`29774`).
|
||||
|
|
Loading…
Reference in New Issue