summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-14 22:27:01 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-14 22:27:01 +0000
commitfbac2506e4b508ee510c4a15835dcd99a5e5877e (patch)
tree4749e1f162d5e6d7ff955dc513cc6c74fb0c1e5e
parent226a52844f6967720a1e4509aceaeb76557593ad (diff)
downloadportage-fbac2506e4b508ee510c4a15835dcd99a5e5877e.tar.gz
portage-fbac2506e4b508ee510c4a15835dcd99a5e5877e.tar.bz2
portage-fbac2506e4b508ee510c4a15835dcd99a5e5877e.zip
Update imports to import portage.os (with unicode wrappers).
svn path=/main/trunk/; revision=14051
-rw-r--r--pym/portage/__init__.py1
-rw-r--r--pym/portage/elog/__init__.py3
-rw-r--r--pym/portage/elog/messages.py2
-rw-r--r--pym/portage/elog/mod_mail_summary.py6
-rw-r--r--pym/portage/elog/mod_save.py3
-rw-r--r--pym/portage/elog/mod_save_summary.py3
6 files changed, 12 insertions, 6 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 35addedf6..87863abdb 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -73,6 +73,7 @@ try:
'portage.getbinpkg',
'portage.locks',
'portage.locks:lockdir,lockfile,unlockdir,unlockfile',
+ 'portage.mail',
'portage.output',
'portage.output:bold,colorize',
'portage.process',
diff --git a/pym/portage/elog/__init__.py b/pym/portage/elog/__init__.py
index ad1ee805f..1ebc027c5 100644
--- a/pym/portage/elog/__init__.py
+++ b/pym/portage/elog/__init__.py
@@ -14,8 +14,7 @@ from portage.process import atexit_register
from portage.elog.messages import collect_ebuild_messages, collect_messages
from portage.elog.filtering import filter_loglevels
from portage.localization import _
-
-import os
+from portage import os
def _merge_logentries(a, b):
rValue = {}
diff --git a/pym/portage/elog/messages.py b/pym/portage/elog/messages.py
index 341f74c0e..a51f0864e 100644
--- a/pym/portage/elog/messages.py
+++ b/pym/portage/elog/messages.py
@@ -11,9 +11,9 @@ portage.proxy.lazyimport.lazyimport(globals(),
from portage.const import EBUILD_PHASES
from portage.localization import _
+from portage import os
import codecs
-import os
import sys
def collect_ebuild_messages(path):
diff --git a/pym/portage/elog/mod_mail_summary.py b/pym/portage/elog/mod_mail_summary.py
index dc0143c82..adffd4640 100644
--- a/pym/portage/elog/mod_mail_summary.py
+++ b/pym/portage/elog/mod_mail_summary.py
@@ -3,10 +3,14 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-import portage.mail, socket, os, time
+import portage
from portage.exception import PortageException
from portage.localization import _
from portage.util import writemsg
+from portage import os
+
+import socket
+import time
_items = {}
def process(mysettings, key, logentries, fulltext):
diff --git a/pym/portage/elog/mod_save.py b/pym/portage/elog/mod_save.py
index 836aea24f..1a11fd927 100644
--- a/pym/portage/elog/mod_save.py
+++ b/pym/portage/elog/mod_save.py
@@ -4,7 +4,8 @@
# $Id$
import codecs
-import os, time
+import time
+from portage import os
from portage.data import portage_uid, portage_gid
from portage.util import ensure_dirs
diff --git a/pym/portage/elog/mod_save_summary.py b/pym/portage/elog/mod_save_summary.py
index 698eeae09..421fd29ed 100644
--- a/pym/portage/elog/mod_save_summary.py
+++ b/pym/portage/elog/mod_save_summary.py
@@ -4,7 +4,8 @@
# $Id$
import codecs
-import os, time
+import time
+from portage import os
from portage.data import portage_uid, portage_gid
from portage.localization import _
from portage.util import ensure_dirs, apply_permissions