Move _pty module to portage.util._pty. (trunk r15515)

svn path=/main/branches/2.1.7/; revision=15713

diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py
index 0d8be6fbfbc7b4c306d424f8ada6a45007548fd8..64846ff8c897aa8fe80f279c263dd0c7ae0e90db 100644 (file)
--- 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 eb423ff04a9829e939ee0a247f2a0f5f3a228fcc..062ef4726a222ee21565e118ffd174526fb15f50 100644 (file)
--- 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 e316c808bb0d013e4d310d3c049f48b97f91f291..d25ebb6936baf19cc8ac4a33cceb972c9a476581 100644 (file)
--- 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 b29c8f95f4c946c5af01d82e20b055a378d95a9a..6280eb263b905277cf3094ee7066936a6bba1f5f 100644 (file)
--- 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