| 1 |
Author: zmedico |
| 2 |
Date: 2010-03-02 09:42:20 +0000 (Tue, 02 Mar 2010) |
| 3 |
New Revision: 15514 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/package/ebuild/_pty.py |
| 7 |
Log: |
| 8 |
Move imports to top. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/package/ebuild/_pty.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/package/ebuild/_pty.py 2010-03-02 05:45:48 UTC (rev 15513) |
| 14 |
+++ main/trunk/pym/portage/package/ebuild/_pty.py 2010-03-02 09:42:20 UTC (rev 15514) |
| 15 |
@@ -11,6 +11,7 @@ |
| 16 |
import termios |
| 17 |
|
| 18 |
from portage import os, _unicode_decode, _unicode_encode |
| 19 |
+from portage.output import get_term_size, set_term_size |
| 20 |
from portage.process import spawn_bash |
| 21 |
from portage.util import writemsg |
| 22 |
|
| 23 |
@@ -178,9 +179,8 @@ |
| 24 |
if _disable_openpty: |
| 25 |
master_fd, slave_fd = os.pipe() |
| 26 |
else: |
| 27 |
- from pty import openpty |
| 28 |
try: |
| 29 |
- master_fd, slave_fd = openpty() |
| 30 |
+ master_fd, slave_fd = pty.openpty() |
| 31 |
got_pty = True |
| 32 |
except EnvironmentError as e: |
| 33 |
_disable_openpty = True |
| 34 |
@@ -192,7 +192,6 @@ |
| 35 |
if got_pty: |
| 36 |
# Disable post-processing of output since otherwise weird |
| 37 |
# things like \n -> \r\n transformations may occur. |
| 38 |
- import termios |
| 39 |
mode = termios.tcgetattr(slave_fd) |
| 40 |
mode[1] &= ~termios.OPOST |
| 41 |
termios.tcsetattr(slave_fd, termios.TCSANOW, mode) |
| 42 |
@@ -200,7 +199,6 @@ |
| 43 |
if got_pty and \ |
| 44 |
copy_term_size is not None and \ |
| 45 |
os.isatty(copy_term_size): |
| 46 |
- from portage.output import get_term_size, set_term_size |
| 47 |
rows, columns = get_term_size() |
| 48 |
set_term_size(rows, columns, slave_fd) |
Archives