diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-12-10 12:05:38 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-12-10 12:05:38 -0800 |
commit | cc567a89c6813341913055a8250c241fa737be84 (patch) | |
tree | e3eccb54f2831e16532adbf281e9216246913fbb /pym/portage/tests | |
parent | 4735e8a0ef6e3182b05c9e9d0e27202d19db619a (diff) | |
download | portage-cc567a89c6813341913055a8250c241fa737be84.tar.gz portage-cc567a89c6813341913055a8250c241fa737be84.tar.bz2 portage-cc567a89c6813341913055a8250c241fa737be84.zip |
Use portage.shutil for safer unicode handling.
Diffstat (limited to 'pym/portage/tests')
-rw-r--r-- | pym/portage/tests/dbapi/test_fakedbapi.py | 2 | ||||
-rw-r--r-- | pym/portage/tests/ebuild/test_ipc_daemon.py | 4 | ||||
-rw-r--r-- | pym/portage/tests/locks/test_asynchronous_lock.py | 2 | ||||
-rw-r--r-- | pym/portage/tests/locks/test_lock_nonblock.py | 2 | ||||
-rw-r--r-- | pym/portage/tests/repoman/test_simple.py | 2 | ||||
-rw-r--r-- | pym/portage/tests/resolver/ResolverPlayground.py | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/pym/portage/tests/dbapi/test_fakedbapi.py b/pym/portage/tests/dbapi/test_fakedbapi.py index cfef94e26..bce824530 100644 --- a/pym/portage/tests/dbapi/test_fakedbapi.py +++ b/pym/portage/tests/dbapi/test_fakedbapi.py @@ -1,10 +1,10 @@ # Copyright 2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -import shutil import tempfile from portage import os +from portage import shutil from portage.dbapi.virtual import fakedbapi from portage.package.ebuild.config import config from portage.tests import TestCase diff --git a/pym/portage/tests/ebuild/test_ipc_daemon.py b/pym/portage/tests/ebuild/test_ipc_daemon.py index b5b4796e1..379953d4b 100644 --- a/pym/portage/tests/ebuild/test_ipc_daemon.py +++ b/pym/portage/tests/ebuild/test_ipc_daemon.py @@ -1,10 +1,10 @@ -# Copyright 2010 Gentoo Foundation +# Copyright 2010-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -import shutil import tempfile import time from portage import os +from portage import shutil from portage import _python_interpreter from portage.tests import TestCase from portage.const import PORTAGE_BIN_PATH diff --git a/pym/portage/tests/locks/test_asynchronous_lock.py b/pym/portage/tests/locks/test_asynchronous_lock.py index 8946caf89..0d6f11656 100644 --- a/pym/portage/tests/locks/test_asynchronous_lock.py +++ b/pym/portage/tests/locks/test_asynchronous_lock.py @@ -1,11 +1,11 @@ # Copyright 2010-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -import shutil import signal import tempfile from portage import os +from portage import shutil from portage.tests import TestCase from _emerge.AsynchronousLock import AsynchronousLock from _emerge.PollScheduler import PollScheduler diff --git a/pym/portage/tests/locks/test_lock_nonblock.py b/pym/portage/tests/locks/test_lock_nonblock.py index d5748ad62..cc1b28e82 100644 --- a/pym/portage/tests/locks/test_lock_nonblock.py +++ b/pym/portage/tests/locks/test_lock_nonblock.py @@ -1,12 +1,12 @@ # Copyright 2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -import shutil import tempfile import traceback import portage from portage import os +from portage import shutil from portage.tests import TestCase class LockNonblockTestCase(TestCase): diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py index 5f6d7fc74..3643ff2d7 100644 --- a/pym/portage/tests/repoman/test_simple.py +++ b/pym/portage/tests/repoman/test_simple.py @@ -1,13 +1,13 @@ # Copyright 2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -import shutil import subprocess import sys import time import portage from portage import os +from portage import shutil from portage import _unicode_decode from portage.const import PORTAGE_BASE_PATH, PORTAGE_BIN_PATH, PORTAGE_PYM_PATH from portage.process import find_binary diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py index cbf42efc3..a18585508 100644 --- a/pym/portage/tests/resolver/ResolverPlayground.py +++ b/pym/portage/tests/resolver/ResolverPlayground.py @@ -2,11 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 from itertools import permutations -import shutil import sys import tempfile import portage from portage import os +from portage import shutil from portage.const import (GLOBAL_CONFIG_PATH, PORTAGE_BASE_PATH, USER_CONFIG_PATH) from portage.dbapi.vartree import vartree |