CLN: Clean up the IO directory yet even more

Author: gfyoung

pandas/core/arrays/categorical.py

@@ -1,5 +1,6 @@
 # pylint: disable=E1101,W0232
 
+from shutil import get_terminal_size
 import textwrap
 from warnings import warn
 
@@ -38,7 +39,6 @@
 from pandas.core.sorting import nargsort
 
 from pandas.io.formats import console
-from pandas.io.formats.terminal import get_terminal_size
 
 from .base import ExtensionArray, _extension_array_shared_docs
 

pandas/core/series.py

@@ -4,6 +4,7 @@
 from __future__ import division
 
 from collections import OrderedDict
+from shutil import get_terminal_size
 from textwrap import dedent
 import warnings
 
@@ -49,7 +50,6 @@
 from pandas.core.tools.datetimes import to_datetime
 
 import pandas.io.formats.format as fmt
-from pandas.io.formats.terminal import get_terminal_size
 import pandas.plotting._core as gfx
 
 # pylint: disable=E1101,E1103

pandas/io/formats/console.py

@@ -2,7 +2,7 @@
 Internal module for console introspection
 """
 
-from pandas.io.formats.terminal import get_terminal_size
+from shutil import get_terminal_size
 
 
 def get_console_size():

pandas/io/formats/format.py

@@ -7,6 +7,7 @@
 from __future__ import print_function
 
 from functools import partial
+from shutil import get_terminal_size
 
 import numpy as np
 
@@ -34,7 +35,6 @@
 
 from pandas.io.common import _expand_user, _stringify_path
 from pandas.io.formats.printing import adjoin, justify, pprint_thing
-from pandas.io.formats.terminal import get_terminal_size
 
 # pylint: disable=W0141
 

pandas/io/formats/terminal.py

@@ -1,34 +1,13 @@
 """
-get_terminal_size() -- return width and height of terminal as a tuple
-
-code from:
-http://stackoverflow.com/questions/566746/how-to-get-console- window-width-in-
-python
-
-written by
-Harco Kuppens (http://stackoverflow.com/users/825214/harco-kuppens)
-
-It is mentioned in the stackoverflow response that this code works
-on linux, os x, windows and cygwin (windows).
+Terminal utilities.
 """
 from __future__ import print_function
 
 import os
 import shutil
 import subprocess
 
-__all__ = ['get_terminal_size', 'is_terminal']
-
-
-def get_terminal_size():
-    """
-    Detect terminal size and return tuple = (width, height).
-
-    Only to be used when running in a terminal. Note that the IPython notebook,
-    IPython zmq frontends, or IDLE do not run in a terminal,
-    """
-
-    return shutil.get_terminal_size()
+__all__ = ['is_terminal']
 
 
 def is_terminal():
@@ -46,89 +25,3 @@ def is_terminal():
             return False
         else:  # IPython in a terminal
             return True
-
-
-def _get_terminal_size_windows():
-
-    try:
-        from ctypes import windll, create_string_buffer
-
-        # stdin handle is -10
-        # stdout handle is -11
-        # stderr handle is -12
-
-        h = windll.kernel32.GetStdHandle(-12)
-        csbi = create_string_buffer(22)
-        res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi)
-    except (AttributeError, ValueError):
-        return None
-    if res:
-        import struct
-        (bufx, bufy, curx, cury, wattr, left, top, right, bottom, maxx,
-         maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw)
-        sizex = right - left + 1
-        sizey = bottom - top + 1
-        return sizex, sizey
-    else:
-        return None
-
-
-def _get_terminal_size_tput():
-    # get terminal width
-    # src: http://stackoverflow.com/questions/263890/how-do-i-find-the-width
-    # -height-of-a-terminal-window
-
-    try:
-        proc = subprocess.Popen(["tput", "cols"],
-                                stdin=subprocess.PIPE,
-                                stdout=subprocess.PIPE)
-        output_cols = proc.communicate(input=None)
-        proc = subprocess.Popen(["tput", "lines"],
-                                stdin=subprocess.PIPE,
-                                stdout=subprocess.PIPE)
-        output_rows = proc.communicate(input=None)
-    except OSError:
-        return None
-
-    try:
-        # Some terminals (e.g. spyder) may report a terminal size of '',
-        # making the `int` fail.
-
-        cols = int(output_cols[0])
-        rows = int(output_rows[0])
-        return cols, rows
-    except (ValueError, IndexError):
-        return None
-
-
-def _get_terminal_size_linux():
-    def ioctl_GWINSZ(fd):
-        try:
-            import fcntl
-            import termios
-            import struct
-            cr = struct.unpack(
-                'hh', fcntl.ioctl(fd, termios.TIOCGWINSZ, '1234'))
-        except (struct.error, IOError):
-            return None
-        return cr
-    cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
-    if not cr:
-        try:
-            fd = os.open(os.ctermid(), os.O_RDONLY)
-            cr = ioctl_GWINSZ(fd)
-            os.close(fd)
-        except OSError:
-            pass
-    if not cr or cr == (0, 0):
-        try:
-            from os import environ as env
-            cr = (env['LINES'], env['COLUMNS'])
-        except (ValueError, KeyError):
-            return None
-    return int(cr[1]), int(cr[0])
-
-
-if __name__ == "__main__":
-    sizex, sizey = get_terminal_size()
-    print('width = {w} height = {h}'.format(w=sizex, h=sizey))

pandas/tests/io/formats/test_console.py

@@ -1,11 +1,7 @@
-import subprocess  # noqa: F401
-
 import pytest
 
 from pandas._config import detect_console_encoding
 
-from pandas.io.formats.terminal import _get_terminal_size_tput
-
 
 class MockEncoding(object):  # TODO(py27): replace with mock
     """
@@ -76,18 +72,3 @@ def test_detect_console_encoding_fallback_to_default(monkeypatch, std, locale):
         context.setattr('sys.stdout', MockEncoding(std))
         context.setattr('sys.getdefaultencoding', lambda: 'sysDefaultEncoding')
         assert detect_console_encoding() == 'sysDefaultEncoding'
-
-
-@pytest.mark.parametrize("size", ['', ['']])
-def test_terminal_unknown_dimensions(monkeypatch, size, mocker):
-
-    def communicate(*args, **kwargs):
-        return size
-
-    monkeypatch.setattr('subprocess.Popen', mocker.Mock())
-    monkeypatch.setattr('subprocess.Popen.return_value.returncode', None)
-    monkeypatch.setattr(
-        'subprocess.Popen.return_value.communicate', communicate)
-    result = _get_terminal_size_tput()
-
-    assert result is None

pandas/tests/io/formats/test_format.py

@@ -32,7 +32,6 @@
 
 import pandas.io.formats.format as fmt
 import pandas.io.formats.printing as printing
-from pandas.io.formats.terminal import get_terminal_size
 
 use_32bit_repr = is_platform_windows() or is_platform_32bit()
 
@@ -308,8 +307,6 @@ def test_repr_truncates_terminal_size(self, monkeypatch):
         # see gh-21180
 
         terminal_size = (118, 96)
-        monkeypatch.setattr('pandas.io.formats.console.get_terminal_size',
-                            lambda: terminal_size)
         monkeypatch.setattr('pandas.io.formats.format.get_terminal_size',
                             lambda: terminal_size)
 
@@ -338,8 +335,7 @@ def test_repr_truncates_terminal_size_full(self, monkeypatch):
         # GH 22984 ensure entire window is filled
         terminal_size = (80, 24)
         df = pd.DataFrame(np.random.rand(1, 7))
-        monkeypatch.setattr('pandas.io.formats.console.get_terminal_size',
-                            lambda: terminal_size)
+
         monkeypatch.setattr('pandas.io.formats.format.get_terminal_size',
                             lambda: terminal_size)
         assert "..." not in str(df)