Skip to content

Check for Jupyter Notebook before allocating other terminal sizes. #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wolph merged 2 commits into from
Mar 27, 2017
+10 −9
Merged

Check for Jupyter Notebook before allocating other terminal sizes. #103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fb804b
Check for Jupyter Notebook before allocating other terminal sizes.
matthewwardrop Mar 24, 2017
fc7ab7b
Fix PEP8 issues.
matthewwardrop Mar 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions progressbar/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,16 @@ def get_terminal_size(): # pragma: no cover
Returns:
width, height: Two integers containing width and height
'''

try:
# Default to 79 characters for IPython notebooks
ipython = globals().get('get_ipython')()
from ipykernel import zmqshell
if isinstance(ipython, zmqshell.ZMQInteractiveShell):
return 79, 24
except Exception: # pragma: no cover
pass

try:
# This works for Python 3, but not Pypy3. Probably the best method if
# it's supported so let's always try
Expand Down Expand Up @@ -136,15 +146,6 @@ def get_terminal_size(): # pragma: no cover
except Exception: # pragma: no cover
pass

try:
# Default to 79 characters for IPython notebooks
ipython = globals().get('get_ipython')()
from ipykernel import zmqshell
if isinstance(ipython, zmqshell.ZMQInteractiveShell):
return 79, 24
except Exception: # pragma: no cover
pass

try:
w, h = _get_terminal_size_linux()
if w and h:
Expand Down