diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2010-03-02 21:14:34 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-02 21:14:34 +0000 |
| commit | 77d03a071049935123b0988b2087800562f35246 (patch) | |
| tree | f132725f6aeafc4946ca0b59d20a57306c8475b9 | |
| parent | Bug #306659 - For --rebuilt-binaries, only reinstall if binary package (diff) | |
| download | portage-multirepo-77d03a071049935123b0988b2087800562f35246.tar.gz portage-multirepo-77d03a071049935123b0988b2087800562f35246.tar.bz2 portage-multirepo-77d03a071049935123b0988b2087800562f35246.zip | |
Move imports to top. (trunk r15514)
svn path=/main/branches/2.1.7/; revision=15712
| -rw-r--r-- | pym/portage/package/ebuild/_pty.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pym/portage/package/ebuild/_pty.py b/pym/portage/package/ebuild/_pty.py index f67ca09c..c48584f5 100644 --- a/pym/portage/package/ebuild/_pty.py +++ b/pym/portage/package/ebuild/_pty.py @@ -11,6 +11,7 @@ import sys import termios from portage import os, _unicode_decode, _unicode_encode +from portage.output import get_term_size, set_term_size from portage.process import spawn_bash from portage.util import writemsg @@ -178,9 +179,8 @@ def _create_pty_or_pipe(copy_term_size=None): if _disable_openpty: master_fd, slave_fd = os.pipe() else: - from pty import openpty try: - master_fd, slave_fd = openpty() + master_fd, slave_fd = pty.openpty() got_pty = True except EnvironmentError as e: _disable_openpty = True @@ -192,7 +192,6 @@ def _create_pty_or_pipe(copy_term_size=None): if got_pty: # Disable post-processing of output since otherwise weird # things like \n -> \r\n transformations may occur. - import termios mode = termios.tcgetattr(slave_fd) mode[1] &= ~termios.OPOST termios.tcsetattr(slave_fd, termios.TCSANOW, mode) @@ -200,7 +199,6 @@ def _create_pty_or_pipe(copy_term_size=None): if got_pty and \ copy_term_size is not None and \ os.isatty(copy_term_size): - from portage.output import get_term_size, set_term_size rows, columns = get_term_size() set_term_size(rows, columns, slave_fd) |