From 05e04a148b0f3dac7fc484334a2d89b6f9624827 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 11 Aug 2009 07:47:27 +0000 Subject: Update imports to import portage.os (with unicode wrappers), and use _unicode_encode() and _unicode_decode() where appropriate. svn path=/main/trunk/; revision=13993 --- pym/_emerge/Binpkg.py | 11 +++-------- pym/_emerge/BinpkgFetcher.py | 10 ++-------- pym/_emerge/BinpkgPrefetcher.py | 3 ++- pym/_emerge/BinpkgVerifier.py | 11 +++-------- pym/_emerge/BlockerCache.py | 12 ++++-------- pym/_emerge/BlockerDB.py | 12 ++---------- pym/_emerge/CompositeTask.py | 3 ++- pym/_emerge/EbuildBinpkg.py | 3 ++- pym/_emerge/EbuildBuild.py | 10 ++-------- pym/_emerge/EbuildBuildDir.py | 11 +++-------- pym/_emerge/EbuildExecuter.py | 11 +++-------- pym/_emerge/EbuildFetcher.py | 11 +++-------- pym/_emerge/EbuildFetchonly.py | 11 +++-------- pym/_emerge/EbuildMerge.py | 11 +++-------- pym/_emerge/EbuildMetadataPhase.py | 11 +++-------- pym/_emerge/EbuildPhase.py | 11 +++-------- pym/_emerge/EbuildProcess.py | 11 +++-------- pym/_emerge/FakeVartree.py | 12 ++---------- pym/_emerge/JobStatusDisplay.py | 12 +++--------- pym/_emerge/MergeListItem.py | 3 +-- pym/_emerge/MetadataRegen.py | 12 ++---------- pym/_emerge/MiscFunctionsProcess.py | 11 +++-------- 22 files changed, 57 insertions(+), 156 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index 89f9925cc..00c6620fd 100644 --- a/pym/_emerge/Binpkg.py +++ b/pym/_emerge/Binpkg.py @@ -10,16 +10,11 @@ from _emerge.BinpkgVerifier import BinpkgVerifier from _emerge.EbuildMerge import EbuildMerge from _emerge.EbuildBuildDir import EbuildBuildDir from portage.util import writemsg -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage +import portage +from portage import os import codecs -import os from portage.output import colorize + class Binpkg(CompositeTask): __slots__ = ("find_blockers", diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py index f3b11bb6c..e72799a1d 100644 --- a/pym/_emerge/BinpkgFetcher.py +++ b/pym/_emerge/BinpkgFetcher.py @@ -5,15 +5,9 @@ from _emerge.SpawnProcess import SpawnProcess import urlparse import sys +import portage +from portage import os -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage -import os class BinpkgFetcher(SpawnProcess): __slots__ = ("pkg", "pretend", diff --git a/pym/_emerge/BinpkgPrefetcher.py b/pym/_emerge/BinpkgPrefetcher.py index a1e63fd32..4e637db03 100644 --- a/pym/_emerge/BinpkgPrefetcher.py +++ b/pym/_emerge/BinpkgPrefetcher.py @@ -5,7 +5,8 @@ from _emerge.BinpkgFetcher import BinpkgFetcher from _emerge.CompositeTask import CompositeTask from _emerge.BinpkgVerifier import BinpkgVerifier -import os +from portage import os + class BinpkgPrefetcher(CompositeTask): __slots__ = ("pkg",) + \ diff --git a/pym/_emerge/BinpkgVerifier.py b/pym/_emerge/BinpkgVerifier.py index e0bd82203..31599e2e2 100644 --- a/pym/_emerge/BinpkgVerifier.py +++ b/pym/_emerge/BinpkgVerifier.py @@ -5,15 +5,10 @@ from _emerge.AsynchronousTask import AsynchronousTask from portage.util import writemsg import sys -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage +import portage +from portage import os import codecs -import os + class BinpkgVerifier(AsynchronousTask): __slots__ = ("logfile", "pkg",) diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py index cb8059eab..7b797ebbd 100644 --- a/pym/_emerge/BlockerCache.py +++ b/pym/_emerge/BlockerCache.py @@ -4,18 +4,14 @@ from portage.util import writemsg from portage.data import secpass -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage +import portage +from portage import os + try: import cPickle as pickle except ImportError: import pickle -import os + class BlockerCache(portage.cache.mappings.MutableMapping): """This caches blockers of installed packages so that dep_check does not have to be done for every single installed package on every invocation of diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py index 7d8c86cc9..436793c59 100644 --- a/pym/_emerge/BlockerDB.py +++ b/pym/_emerge/BlockerDB.py @@ -2,16 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -import os - -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage - +import portage +from portage import os from portage import digraph from portage.sets.base import InternalPackageSet diff --git a/pym/_emerge/CompositeTask.py b/pym/_emerge/CompositeTask.py index 25de4dcf3..a9de7a1ab 100644 --- a/pym/_emerge/CompositeTask.py +++ b/pym/_emerge/CompositeTask.py @@ -3,7 +3,8 @@ # $Id$ from _emerge.AsynchronousTask import AsynchronousTask -import os +from portage import os + class CompositeTask(AsynchronousTask): __slots__ = ("scheduler",) + ("_current_task",) diff --git a/pym/_emerge/EbuildBinpkg.py b/pym/_emerge/EbuildBinpkg.py index 4f5159d78..8d742d640 100644 --- a/pym/_emerge/EbuildBinpkg.py +++ b/pym/_emerge/EbuildBinpkg.py @@ -3,7 +3,8 @@ # $Id$ from _emerge.EbuildProcess import EbuildProcess -import os +from portage import os + class EbuildBinpkg(EbuildProcess): """ This assumes that src_install() has successfully completed. diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py index 4bfd817ad..f56adb660 100644 --- a/pym/_emerge/EbuildBuild.py +++ b/pym/_emerge/EbuildBuild.py @@ -11,15 +11,9 @@ from _emerge.EbuildMerge import EbuildMerge from _emerge.EbuildFetchonly import EbuildFetchonly from _emerge.EbuildBuildDir import EbuildBuildDir from portage.util import writemsg -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage +import portage +from portage import os import codecs -import os from portage.output import colorize class EbuildBuild(CompositeTask): diff --git a/pym/_emerge/EbuildBuildDir.py b/pym/_emerge/EbuildBuildDir.py index 1a940e020..d9f819966 100644 --- a/pym/_emerge/EbuildBuildDir.py +++ b/pym/_emerge/EbuildBuildDir.py @@ -3,15 +3,10 @@ # $Id$ from _emerge.SlotObject import SlotObject -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage -import os +import portage +from portage import os import errno + class EbuildBuildDir(SlotObject): __slots__ = ("dir_path", "pkg", "settings", diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py index c47374721..055a8fa47 100644 --- a/pym/_emerge/EbuildExecuter.py +++ b/pym/_emerge/EbuildExecuter.py @@ -5,14 +5,9 @@ from _emerge.EbuildPhase import EbuildPhase from _emerge.TaskSequence import TaskSequence from _emerge.CompositeTask import CompositeTask -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage -import os +import portage +from portage import os + class EbuildExecuter(CompositeTask): __slots__ = ("pkg", "scheduler", "settings") + ("_tree",) diff --git a/pym/_emerge/EbuildFetcher.py b/pym/_emerge/EbuildFetcher.py index e8f810243..6ce72b9e3 100644 --- a/pym/_emerge/EbuildFetcher.py +++ b/pym/_emerge/EbuildFetcher.py @@ -5,16 +5,11 @@ from _emerge.SpawnProcess import SpawnProcess from _emerge.EbuildBuildDir import EbuildBuildDir import sys -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage +import portage +from portage import os import codecs -import os from portage.elog.messages import eerror + class EbuildFetcher(SpawnProcess): __slots__ = ("config_pool", "fetchonly", "fetchall", "pkg", "prefetch") + \ diff --git a/pym/_emerge/EbuildFetchonly.py b/pym/_emerge/EbuildFetchonly.py index 82e11065a..d65e2b2b1 100644 --- a/pym/_emerge/EbuildFetchonly.py +++ b/pym/_emerge/EbuildFetchonly.py @@ -4,15 +4,10 @@ from _emerge.SlotObject import SlotObject import shutil -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage -import os +import portage +from portage import os from portage.elog.messages import eerror + class EbuildFetchonly(SlotObject): __slots__ = ("fetch_all", "pkg", "pretend", "settings") diff --git a/pym/_emerge/EbuildMerge.py b/pym/_emerge/EbuildMerge.py index 235f8b881..1ac03706e 100644 --- a/pym/_emerge/EbuildMerge.py +++ b/pym/_emerge/EbuildMerge.py @@ -3,14 +3,9 @@ # $Id$ from _emerge.SlotObject import SlotObject -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage -import os +import portage +from portage import os + class EbuildMerge(SlotObject): __slots__ = ("find_blockers", "logger", "ldpath_mtimes", diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py index 8e488d306..a84d722be 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -6,17 +6,12 @@ from _emerge.SubProcess import SubProcess from _emerge.PollConstants import PollConstants import sys from portage.cache.mappings import slot_dict_class -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage -import os +import portage +from portage import os from itertools import izip import fcntl import codecs + class EbuildMetadataPhase(SubProcess): """ diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py index 22b9f8bcb..598dcf7e3 100644 --- a/pym/_emerge/EbuildPhase.py +++ b/pym/_emerge/EbuildPhase.py @@ -6,15 +6,10 @@ from _emerge.MiscFunctionsProcess import MiscFunctionsProcess from _emerge.EbuildProcess import EbuildProcess from _emerge.CompositeTask import CompositeTask from portage.util import writemsg -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage +import portage +from portage import os import codecs -import os + class EbuildPhase(CompositeTask): __slots__ = ("background", "pkg", "phase", diff --git a/pym/_emerge/EbuildProcess.py b/pym/_emerge/EbuildProcess.py index 2b625ee32..86a63282f 100644 --- a/pym/_emerge/EbuildProcess.py +++ b/pym/_emerge/EbuildProcess.py @@ -3,14 +3,9 @@ # $Id$ from _emerge.SpawnProcess import SpawnProcess -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage -import os +import portage +from portage import os + class EbuildProcess(SpawnProcess): __slots__ = ("phase", "pkg", "settings", "tree") diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py index 5df52b3f7..c4eec6d68 100644 --- a/pym/_emerge/FakeVartree.py +++ b/pym/_emerge/FakeVartree.py @@ -2,17 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -import os from itertools import izip - -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage - +import portage +from portage import os from _emerge.Package import Package from _emerge.PackageVirtualDbapi import PackageVirtualDbapi diff --git a/pym/_emerge/JobStatusDisplay.py b/pym/_emerge/JobStatusDisplay.py index 97d2a33f2..6aa2d99b7 100644 --- a/pym/_emerge/JobStatusDisplay.py +++ b/pym/_emerge/JobStatusDisplay.py @@ -3,7 +3,6 @@ # $Id$ import formatter -import os import sys import time @@ -12,13 +11,8 @@ try: except ImportError: from StringIO import StringIO -try: - import portage -except ImportError: - from os import path as osp - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage - +import portage +from portage import os from portage.output import xtermTitle from _emerge.getloadavg import getloadavg @@ -76,7 +70,7 @@ class JobStatusDisplay(object): def _write(self, s): if sys.hexversion < 0x3000000 and isinstance(s, unicode): # avoid potential UnicodeEncodeError - s = s.encode('utf_8', 'replace') + s = portage._unicode_encode(s) self.out.write(s) self.out.flush() diff --git a/pym/_emerge/MergeListItem.py b/pym/_emerge/MergeListItem.py index aab79da08..7e4556ec2 100644 --- a/pym/_emerge/MergeListItem.py +++ b/pym/_emerge/MergeListItem.py @@ -2,8 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -import os - +from portage import os from portage.output import colorize from _emerge.Binpkg import Binpkg diff --git a/pym/_emerge/MetadataRegen.py b/pym/_emerge/MetadataRegen.py index a6a48deaa..ee6eb997a 100644 --- a/pym/_emerge/MetadataRegen.py +++ b/pym/_emerge/MetadataRegen.py @@ -2,16 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -import os - -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage - +import portage +from portage import os from _emerge.EbuildMetadataPhase import EbuildMetadataPhase from _emerge.PollScheduler import PollScheduler diff --git a/pym/_emerge/MiscFunctionsProcess.py b/pym/_emerge/MiscFunctionsProcess.py index df45c679b..3e2fff7cc 100644 --- a/pym/_emerge/MiscFunctionsProcess.py +++ b/pym/_emerge/MiscFunctionsProcess.py @@ -3,14 +3,9 @@ # $Id$ from _emerge.SpawnProcess import SpawnProcess -try: - import portage -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage -import os +import portage +from portage import os + class MiscFunctionsProcess(SpawnProcess): """ Spawns misc-functions.sh with an existing ebuild environment. -- cgit v1.2.3-1-g7c22