aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-17 23:17:30 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-17 23:17:30 +0000
commitb0d24f3025e239b8f9826c9fda0e4d0f7163387d (patch)
treec44023c21f4500b61f89404dc9eb923cdddc3457 /pym/portage/locks.py
parentEnable error='strict' when encoding arguments inside _unicode_func_wrapper(), (diff)
downloadportage-b0d24f3025e239b8f9826c9fda0e4d0f7163387d.tar.gz
portage-b0d24f3025e239b8f9826c9fda0e4d0f7163387d.tar.bz2
portage-b0d24f3025e239b8f9826c9fda0e4d0f7163387d.zip
Use portage.os, _content_encoding, and _fs_encoding where appropriate.
svn path=/main/trunk/; revision=14080
Diffstat (limited to 'pym/portage/locks.py')
-rw-r--r--pym/portage/locks.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/locks.py b/pym/portage/locks.py
index c41b4aae7..adf82af81 100644
--- a/pym/portage/locks.py
+++ b/pym/portage/locks.py
@@ -7,7 +7,10 @@ __all__ = ["lockdir", "unlockdir", "lockfile", "unlockfile", \
"hardlock_name", "hardlink_is_mine", "hardlink_lockfile", \
"unhardlink_lockfile", "hardlock_cleanup"]
-import errno, os, stat, time
+import errno
+import stat
+import time
+from portage import os
from portage.exception import DirectoryNotFound, FileNotFound, \
InvalidData, TryAgain, OperationNotPermitted, PermissionDenied
from portage.data import portage_gid