diff options
| author | Marius Mauch <genone@gentoo.org> | 2007-01-25 17:07:32 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2007-01-25 17:07:32 +0000 |
| commit | 064104225b74e6db799c65a30dba1bd4b6b68132 (patch) | |
| tree | b54c084734e73a55cd4f0a70d185c599101d434a /pym/portage/getbinpkg.py | |
| parent | 68af63d44dbfdbb4a81876c32eb25ddd0ca23b3f (diff) | |
| download | portage-064104225b74e6db799c65a30dba1bd4b6b68132.tar.gz portage-064104225b74e6db799c65a30dba1bd4b6b68132.tar.bz2 portage-064104225b74e6db799c65a30dba1bd4b6b68132.zip | |
Namespace sanitizing, step 3
svn path=/main/trunk/; revision=5782
Diffstat (limited to 'pym/portage/getbinpkg.py')
| -rw-r--r-- | pym/portage/getbinpkg.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py index 462da429d..b0d5ca9eb 100644 --- a/pym/portage/getbinpkg.py +++ b/pym/portage/getbinpkg.py @@ -6,8 +6,8 @@ if not hasattr(__builtins__, "set"): from sets import Set as set -from output import red, yellow, green -import htmllib,HTMLParser,formatter,sys,os,xpak,time,tempfile,base64,urllib2 +from portage.output import red, yellow, green +import htmllib,HTMLParser,formatter,sys,os,portage.xpak,time,tempfile,base64,urllib2 try: import cPickle @@ -32,8 +32,8 @@ def make_metadata_dict(data): myid,myglob = data mydict = {} - for x in xpak.getindex_mem(myid): - mydict[x] = xpak.getitem(data,x) + for x in portage.xpak.getindex_mem(myid): + mydict[x] = portage.xpak.getitem(data,x) return mydict @@ -330,7 +330,7 @@ def file_get_metadata(baseurl,conn=None, chunk_size=3000): raise TypeError, "Unknown protocol. '%s'" % protocol if data: - xpaksize = xpak.decodeint(data[-8:-4]) + xpaksize = portage.xpak.decodeint(data[-8:-4]) if (xpaksize+8) > chunk_size: myid = file_get_metadata(baseurl, conn, (xpaksize+8)) if not keepconnection: @@ -340,7 +340,7 @@ def file_get_metadata(baseurl,conn=None, chunk_size=3000): xpak_data = data[len(data)-(xpaksize+8):-8] del data - myid = xpak.xsplit_mem(xpak_data) + myid = portage.xpak.xsplit_mem(xpak_data) if not myid: myid = None,None del xpak_data |