From 8942dfe9cbc7d713645ef876376bcecfadbce7fa Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 2 Mar 2010 21:14:43 +0000 Subject: [PATCH] Move _pty module to portage.util._pty. (trunk r15515) svn path=/main/branches/2.1.7/; revision=15713 --- pym/_emerge/AbstractEbuildProcess.py | 2 +- pym/_emerge/EbuildFetcher.py | 2 +- pym/portage/package/ebuild/doebuild.py | 2 +- pym/portage/tests/ebuild/test_pty_eof.py | 2 +- pym/portage/{package/ebuild => util}/_pty.py | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename pym/portage/{package/ebuild => util}/_pty.py (100%) diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py index 0d8be6fbf..64846ff8c 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 eb423ff04..062ef4726 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 e316c808b..d25ebb693 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 b29c8f95f..6280eb263 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 similarity index 100% rename from pym/portage/package/ebuild/_pty.py rename to pym/portage/util/_pty.py -- 2.26.2