diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-05-01 21:51:16 +0200 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-05-01 21:51:16 +0200 |
| commit | 0a9cc38a66ded0cf0e5b534cb24b970fc9c21920 (patch) | |
| tree | 85ac09a67f008adf2ab8f85ab6f20e051c642ca1 /pym/portage/glsa.py | |
| parent | Quote atoms in die message for bug #414201. (diff) | |
| download | portage-0a9cc38a66ded0cf0e5b534cb24b970fc9c21920.tar.gz portage-0a9cc38a66ded0cf0e5b534cb24b970fc9c21920.tar.bz2 portage-0a9cc38a66ded0cf0e5b534cb24b970fc9c21920.zip | |
Bug #413983: Add portage.util.urlopen(), which transparently
handles authentication in the way compatible with Python 3.
Diffstat (limited to 'pym/portage/glsa.py')
| -rw-r--r-- | pym/portage/glsa.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py index 2df7ec3a7..16f662f0d 100644 --- a/pym/portage/glsa.py +++ b/pym/portage/glsa.py @@ -1,14 +1,10 @@ -# Copyright 2003-2011 Gentoo Foundation +# Copyright 2003-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import absolute_import import io import sys -try: - from urllib.request import urlopen as urllib_request_urlopen -except ImportError: - from urllib import urlopen as urllib_request_urlopen import re import xml.dom.minidom @@ -18,7 +14,7 @@ from portage import _encodings from portage import _unicode_decode from portage import _unicode_encode from portage.versions import pkgsplit, catpkgsplit, pkgcmp, best -from portage.util import grabfile +from portage.util import grabfile, urlopen from portage.const import CACHE_PATH from portage.localization import _ from portage.dep import _slot_separator @@ -476,7 +472,7 @@ class Glsa: myurl = "file://"+self.nr else: myurl = repository + "glsa-%s.xml" % str(self.nr) - self.parse(urllib_request_urlopen(myurl)) + self.parse(urlopen(myurl)) return None def parse(self, myfile): |