diff options
author | Jan Rękorajski | 2021-01-17 10:37:35 (GMT) |
---|---|---|
committer | Jan Rękorajski | 2021-01-17 10:37:35 (GMT) |
commit | 3943100fefdf8d649e1b2707830b7ad19ea5721e (patch) | |
tree | 9fa3fb30272eb14d26a28e3cc761e72655411ad6 | |
parent | 27e913d55ae4e82ac1edb599099a4fa68d9593dd (diff) | |
download | pld-ftp-admin-3943100fefdf8d649e1b2707830b7ad19ea5721e.zip pld-ftp-admin-3943100fefdf8d649e1b2707830b7ad19ea5721e.tar.gz |
Accomodate for urlopen() moving from urllib to urllib.request in python3
-rw-r--r-- | modules/ftptree.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/modules/ftptree.py b/modules/ftptree.py index 3b1af3c..0200a10 100644 --- a/modules/ftptree.py +++ b/modules/ftptree.py @@ -2,7 +2,16 @@ from __future__ import print_function -import os, config, string, urllib, re, rpm +import os +import config +import string +try: + import urllib.request as urlmess +except ImportError: + import urllib as urlmess + pass +import re +import rpm from common import fileexists, noarchcachedir from baseftptree import BasePkg, BaseFtpTree from sign import is_signed @@ -400,11 +409,11 @@ class FtpTree(BaseFtpTree): Reads config.builderqueue to grab the info """ - f = urllib.urlopen(config.builderqueue) + f = urlmess.urlopen(config.builderqueue) requests = {} reid = re.compile(r'^.*id=(.*) pri.*$') regb = re.compile(r'^group:.*$|builders:.*$', re.M) - for i in re.findall(regb, f.read()): + for i in re.findall(regb, f.read().decode('utf-8')): if i[0] == 'g': id = reid.sub(r'\1', i) requests[id] = "" |