From 7ed0493ee4af4ca14bb7642a29a66cd51f4d5836 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 26 Apr 2011 10:14:43 -0500 Subject: tools: Add full PY3K compatibility Signed-off-by: Sol Jerome --- tools/pkgmgr_gen.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tools/pkgmgr_gen.py') diff --git a/tools/pkgmgr_gen.py b/tools/pkgmgr_gen.py index 9ce15b8c3..3ae6ae948 100755 --- a/tools/pkgmgr_gen.py +++ b/tools/pkgmgr_gen.py @@ -19,12 +19,13 @@ import optparse import os import rpm import sys -import urllib -import urlparse from lxml.etree import parse import xml.sax from xml.sax.handler import ContentHandler +# Compatibility imports +from py3kcompat import urljoin + def info(object, spacing=10, collapse=1): """Print methods and doc strings. @@ -256,7 +257,7 @@ def loadRepos(repolist): ''' packages = {} for repo in repolist: - url = urlparse.urljoin(repo, './repodata/repomd.xml') + url = urljoin(repo, './repodata/repomd.xml') if options.verbose: print("Loading repo metadata : %s" % url) @@ -280,7 +281,7 @@ def loadRepos(repolist): if property.tag.endswith('location'): primaryhref = property.get('href') - url = urlparse.urljoin(repo, './' + primaryhref) + url = urljoin(repo, './' + primaryhref) if options.verbose: print("Loading : %s" % url) -- cgit v1.2.3-1-g7c22