diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-08-17 22:18:02 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-17 22:18:02 +0000 |
| commit | 3b1dae05fdee007798bbeea5169b4feb6e69d4ef (patch) | |
| tree | f697c55951dd4414a592b53e950093276108b5e8 /pym/portage/tests/env | |
| parent | Test the edge case. (diff) | |
| download | portage-3b1dae05fdee007798bbeea5169b4feb6e69d4ef.tar.gz portage-3b1dae05fdee007798bbeea5169b4feb6e69d4ef.tar.bz2 portage-3b1dae05fdee007798bbeea5169b4feb6e69d4ef.zip | |
Use portage.os, _content_encoding, and _fs_encoding where appropriate.
svn path=/main/trunk/; revision=14078
Diffstat (limited to 'pym/portage/tests/env')
4 files changed, 7 insertions, 6 deletions
diff --git a/pym/portage/tests/env/config/test_PackageKeywordsFile.py b/pym/portage/tests/env/config/test_PackageKeywordsFile.py index 228ce4a82..228cf2ecb 100644 --- a/pym/portage/tests/env/config/test_PackageKeywordsFile.py +++ b/pym/portage/tests/env/config/test_PackageKeywordsFile.py @@ -3,10 +3,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +from portage import os from portage.tests import TestCase from portage.env.config import PackageKeywordsFile from tempfile import mkstemp -import os class PackageKeywordsFileTestCase(TestCase): @@ -38,5 +38,4 @@ class PackageKeywordsFileTestCase(TestCase): f.close() def NukeFile(self): - import os os.unlink(self.fname) diff --git a/pym/portage/tests/env/config/test_PackageMaskFile.py b/pym/portage/tests/env/config/test_PackageMaskFile.py index dca8002bc..90cdf5387 100644 --- a/pym/portage/tests/env/config/test_PackageMaskFile.py +++ b/pym/portage/tests/env/config/test_PackageMaskFile.py @@ -3,8 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -import os - +from portage import os from portage.env.config import PackageMaskFile from portage.tests import TestCase, test_cps from tempfile import mkstemp diff --git a/pym/portage/tests/env/config/test_PackageUseFile.py b/pym/portage/tests/env/config/test_PackageUseFile.py index aa18364a0..575ede505 100644 --- a/pym/portage/tests/env/config/test_PackageUseFile.py +++ b/pym/portage/tests/env/config/test_PackageUseFile.py @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -import os +from portage import os from portage.tests import TestCase from portage.env.config import PackageUseFile from tempfile import mkstemp diff --git a/pym/portage/tests/env/config/test_PortageModulesFile.py b/pym/portage/tests/env/config/test_PortageModulesFile.py index fb164b4a7..40472104b 100644 --- a/pym/portage/tests/env/config/test_PortageModulesFile.py +++ b/pym/portage/tests/env/config/test_PortageModulesFile.py @@ -1,9 +1,12 @@ +# Copyright 2006-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ +from portage import os from portage.tests import TestCase from portage.env.config import PortageModulesFile from tempfile import mkstemp from itertools import izip -import os class PortageModulesFileTestCase(TestCase): |