aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-11 07:47:27 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-11 07:47:27 +0000
commit05e04a148b0f3dac7fc484334a2d89b6f9624827 (patch)
tree07d35efdec1605fac8836b31a4cbc82cb04713b1 /bin/clean_locks
parentAvoid using the wrapped os.read(), in order to avoid differing behavior (diff)
downloadportage-05e04a148b0f3dac7fc484334a2d89b6f9624827.tar.gz
portage-05e04a148b0f3dac7fc484334a2d89b6f9624827.tar.bz2
portage-05e04a148b0f3dac7fc484334a2d89b6f9624827.zip
Update imports to import portage.os (with unicode wrappers), and use
_unicode_encode() and _unicode_decode() where appropriate. svn path=/main/trunk/; revision=13993
Diffstat (limited to 'bin/clean_locks')
-rwxr-xr-xbin/clean_locks8
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/clean_locks b/bin/clean_locks
index 89473bd81..9799ad999 100755
--- a/bin/clean_locks
+++ b/bin/clean_locks
@@ -3,13 +3,15 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-import os,sys,errno
+import sys, errno
try:
- import portage.locks
+ 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.locks
+ import portage
+
+from portage import os
if not sys.argv[1:] or "--help" in sys.argv or "-h" in sys.argv:
import portage