mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-19 18:47:46 -08:00
dbb770ac32
Adds RDEPEND on dev-python/backports-shutil_get_terminal_size for python2, add patch from https://github.com/ipython/ipython/pull/9417 to not require on python3. Gentoo-Bug: 585038 Package-Manager: portage-2.3.0_rc1
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
diff --git a/IPython/utils/terminal.py b/IPython/utils/terminal.py
|
|
index 9e7be2a..a1f0f73 100644
|
|
--- a/IPython/utils/terminal.py
|
|
+++ b/IPython/utils/terminal.py
|
|
@@ -9,22 +9,18 @@
|
|
* Alexander Belchenko (e-mail: bialix AT ukr.net)
|
|
"""
|
|
|
|
-#-----------------------------------------------------------------------------
|
|
-# Copyright (C) 2008-2011 The IPython Development Team
|
|
-#
|
|
-# Distributed under the terms of the BSD License. The full license is in
|
|
-# the file COPYING, distributed as part of this software.
|
|
-#-----------------------------------------------------------------------------
|
|
-
|
|
-#-----------------------------------------------------------------------------
|
|
-# Imports
|
|
-#-----------------------------------------------------------------------------
|
|
+# Copyright (c) IPython Development Team.
|
|
+# Distributed under the terms of the Modified BSD License.
|
|
|
|
import os
|
|
import struct
|
|
import sys
|
|
import warnings
|
|
-import backports.shutil_get_terminal_size
|
|
+try:
|
|
+ from shutil import get_terminal_size as _get_terminal_size
|
|
+except ImportError:
|
|
+ # use backport on Python 2
|
|
+ from backports.shutil_get_terminal_size import get_terminal_size as _get_terminal_size
|
|
|
|
from . import py3compat
|
|
|
|
@@ -122,4 +118,4 @@ def freeze_term_title():
|
|
|
|
|
|
def get_terminal_size(defaultx=80, defaulty=25):
|
|
- return backports.shutil_get_terminal_size.get_terminal_size((defaultx, defaulty))
|
|
+ return _get_terminal_size((defaultx, defaulty))
|