Accomodate for urlopen() moving from urllib to urllib.request in python3

diff --git a/modules/ftptree.py b/modules/ftptree.py
index 3b1af3ce69d38b5ff2c066d505c656c2787df2b1..0200a10528a98da4c6adf3eefd77fa24a0922af5 100644 (file)
--- 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] = ""