diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2011-04-26 10:14:43 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2011-04-26 10:19:52 -0500 |
commit | 7ed0493ee4af4ca14bb7642a29a66cd51f4d5836 (patch) | |
tree | d94042b8d8302da3d6989b720fe73cc9cd06e185 /tools/pkgmgr_gen.py | |
parent | e1c5dcea61d36c589b639e080a314c871b1b129f (diff) | |
download | bcfg2-7ed0493ee4af4ca14bb7642a29a66cd51f4d5836.tar.gz bcfg2-7ed0493ee4af4ca14bb7642a29a66cd51f4d5836.tar.bz2 bcfg2-7ed0493ee4af4ca14bb7642a29a66cd51f4d5836.zip |
tools: Add full PY3K compatibility
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'tools/pkgmgr_gen.py')
-rwxr-xr-x | tools/pkgmgr_gen.py | 9 |
1 files changed, 5 insertions, 4 deletions
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) |