* [gentoo-commits] portage r15712 - main/branches/2.1.7/pym/portage/package/ebuild
@ 2010-03-02 21:14 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2010-03-02 21:14 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2010-03-02 21:14:34 +0000 (Tue, 02 Mar 2010)
New Revision: 15712
Modified:
main/branches/2.1.7/pym/portage/package/ebuild/_pty.py
Log:
Move imports to top. (trunk r15514)
Modified: main/branches/2.1.7/pym/portage/package/ebuild/_pty.py
===================================================================
--- main/branches/2.1.7/pym/portage/package/ebuild/_pty.py 2010-03-02 21:14:20 UTC (rev 15711)
+++ main/branches/2.1.7/pym/portage/package/ebuild/_pty.py 2010-03-02 21:14:34 UTC (rev 15712)
@@ -11,6 +11,7 @@
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 @@
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 @@
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 @@
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)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-03-02 21:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-02 21:14 [gentoo-commits] portage r15712 - main/branches/2.1.7/pym/portage/package/ebuild Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox