summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-03-02 21:14:43 +0000
committerZac Medico <zmedico@gentoo.org>2010-03-02 21:14:43 +0000
commit8942dfe9cbc7d713645ef876376bcecfadbce7fa (patch)
tree2f869191d4e0b613f0ef2396224845fb9a97295c
parentMove imports to top. (trunk r15514) (diff)
downloadportage-multirepo-8942dfe9cbc7d713645ef876376bcecfadbce7fa.tar.gz
portage-multirepo-8942dfe9cbc7d713645ef876376bcecfadbce7fa.tar.bz2
portage-multirepo-8942dfe9cbc7d713645ef876376bcecfadbce7fa.zip
Move _pty module to portage.util._pty. (trunk r15515)
svn path=/main/branches/2.1.7/; revision=15713
-rw-r--r--pym/_emerge/AbstractEbuildProcess.py2
-rw-r--r--pym/_emerge/EbuildFetcher.py2
-rw-r--r--pym/portage/package/ebuild/doebuild.py2
-rw-r--r--pym/portage/tests/ebuild/test_pty_eof.py2
-rw-r--r--pym/portage/util/_pty.py (renamed from pym/portage/package/ebuild/_pty.py)0
5 files changed, 4 insertions, 4 deletions
diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py
index 0d8be6fb..64846ff8 100644
--- a/pym/_emerge/AbstractEbuildProcess.py
+++ b/pym/_emerge/AbstractEbuildProcess.py
@@ -5,7 +5,7 @@
from _emerge.SpawnProcess import SpawnProcess
import portage
from portage import os
-from portage.package.ebuild._pty import _create_pty_or_pipe
+from portage.util._pty import _create_pty_or_pipe
class AbstractEbuildProcess(SpawnProcess):
diff --git a/pym/_emerge/EbuildFetcher.py b/pym/_emerge/EbuildFetcher.py
index eb423ff0..062ef472 100644
--- a/pym/_emerge/EbuildFetcher.py
+++ b/pym/_emerge/EbuildFetcher.py
@@ -11,7 +11,7 @@ from portage import _encodings
from portage import _unicode_encode
import codecs
from portage.elog.messages import eerror
-from portage.package.ebuild._pty import _create_pty_or_pipe
+from portage.util._pty import _create_pty_or_pipe
class EbuildFetcher(SpawnProcess):
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index e316c808..d25ebb69 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -49,10 +49,10 @@ from portage.manifest import Manifest
from portage.output import style_to_ansi_code
from portage.package.ebuild.fetch import fetch
from portage.package.ebuild.prepare_build_dirs import prepare_build_dirs
-from portage.package.ebuild._pty import _create_pty_or_pipe
from portage.util import apply_recursive_permissions, \
apply_secpass_permissions, noiselimit, normalize_path, \
writemsg, writemsg_stdout, write_atomic
+from portage.util._pty import _create_pty_or_pipe
from portage.versions import _pkgsplit
def doebuild_environment(myebuild, mydo, myroot, mysettings,
diff --git a/pym/portage/tests/ebuild/test_pty_eof.py b/pym/portage/tests/ebuild/test_pty_eof.py
index b29c8f95..6280eb26 100644
--- a/pym/portage/tests/ebuild/test_pty_eof.py
+++ b/pym/portage/tests/ebuild/test_pty_eof.py
@@ -4,7 +4,7 @@
import portage
from portage.tests import TestCase
-from portage.package.ebuild._pty import _can_test_pty_eof, _test_pty_eof
+from portage.util._pty import _can_test_pty_eof, _test_pty_eof
class PtyEofTestCase(TestCase):
diff --git a/pym/portage/package/ebuild/_pty.py b/pym/portage/util/_pty.py
index c48584f5..c48584f5 100644
--- a/pym/portage/package/ebuild/_pty.py
+++ b/pym/portage/util/_pty.py