Add some Python 3 compatibility fixes

- print is a function
- Always use absolute imports
- Use six.next to iterate maps

Note some more fixes will still be needed for Python 3 support.

Change-Id: I2862b87efad19839adf2756b7f319502331ec465

Author: javierpena

rdopkg.spec

@@ -19,6 +19,7 @@ Requires:         python-paramiko
 Requires:         python-pymod2pkg >= 0.2.1
 Requires:         python-requests
 Requires:         python-setuptools
+Requires:         python-six
 Requires:         PyYAML
 Requires:         git-core
 Requires:         git-review

rdopkg/action.py

@@ -1,8 +1,9 @@
+from __future__ import print_function
 import inspect
 import pkgutil
 
-import exception
-from utils import log
+from rdopkg import exception
+from rdopkg.utils import log
 
 
 class Arg(object):
@@ -56,7 +57,7 @@ def actionsmod(self):
         if not self._actionsmod:
             astr = self.module.__name__ + '.actions'
             apath = astr.split('.')
-            topmod = __import__(astr, globals(), locals(), [], -1)
+            topmod = __import__(astr, globals(), locals(), [])
             mod = topmod
             for submod in apath[1:]:
                 mod = getattr(mod, submod)

rdopkg/actionmods/cbsbuild.py

@@ -2,6 +2,7 @@
 This module implement generic support of Koji through Koji ugly API.
 For now, it's only used for CBS.
 """
+from __future__ import print_function
 from distutils.spawn import find_executable
 import os
 import subprocess
@@ -67,9 +68,9 @@ def new_build(profile='cbs', scratch=True):
     kojiclient.uploadWrapper(srpm, serverdir, callback=_progress_callback)
     source = "%s/%s" % (serverdir, os.path.basename(srpm))
     task_id = kojiclient.build(source, build_target, {'scratch': scratch})
-    print "Created task:", task_id
+    print("Created task:", task_id)
 
-    print "Task info: {}/taskinfo?taskID={}".format(opts['weburl'], task_id)
+    print("Task info: {}/taskinfo?taskID={}".format(opts['weburl'], task_id))
     kojiclient.logout()
     watch_tasks(kojiclient, [task_id])
 

rdopkg/actionmods/copr.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-import ConfigParser
+from six.moves import configparser
 import datetime
 from functools import wraps
 import json
@@ -85,7 +85,7 @@ def get_copr_conf_fn():
 
 
 def get_copr_user():
-    config = ConfigParser.ConfigParser()
+    config = configparser.ConfigParser()
     config_fn = get_copr_conf_fn()
     if not config.read(config_fn):
         raise exception.CoprError(
@@ -95,14 +95,14 @@ def get_copr_user():
         username = config.get('copr-cli', 'username', None)
         login = config.get('copr-cli', 'login', None)
         token = config.get('copr-cli', 'token', None)
-    except ConfigParser.Error as err:
+    except configparser.Error as err:
         raise exception.CoprError(
             'Bad configuration file %s: %s' % (config_fn, err))
     return {'username': username, 'token': token, 'login': login}
 
 
 def get_copr_url():
-    config = ConfigParser.ConfigParser()
+    config = configparser.ConfigParser()
     config.read(get_copr_conf_fn())
     copr_url = COPR_URL
     if (config.has_section('copr-cli') and

rdopkg/actionmods/kojibuild.py

@@ -2,7 +2,8 @@
 Because fedpkg/pyrpkg sucks horribly, this entire file full of hacks is
 needed to interface with it. Disgusting.
 """
-import ConfigParser
+from __future__ import print_function
+from six.moves import configparser
 import logging
 import sys
 import os
@@ -51,7 +52,7 @@ def setup_fedpkg_logger():
 
 def get_fedpkg_config():
     fedpkg_conf = '/etc/rpkg/fedpkg.conf'
-    config = ConfigParser.SafeConfigParser()
+    config = configparser.SafeConfigParser()
     config.read(fedpkg_conf)
     return config
 
@@ -106,7 +107,7 @@ def new_build(watch=True):
             # TODO: might be good to push this return data back up
             #       or check the status of the return
             r = cli._watch_koji_tasks(fcmd.kojisession, [task_id])
-        except ConfigParser.NoSectionError:
+        except configparser.NoSectionError:
             # <C-C> causes this for some reason
             print('')
         except Exception as ex:

rdopkg/actionmods/query.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import re
 
 from rdopkg.actionmods import rdoinfo

rdopkg/actionmods/rdoinfo.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import collections
 import imp
 import re
@@ -190,12 +191,12 @@ def get_distrepos(self, release, dist=None):
         return distrepos
 
     def print_releases(self):
-        print "{t.bold}RDO releases & repos:{t.normal}".format(t=log.term)
+        print("{t.bold}RDO releases & repos:{t.normal}".format(t=log.term))
         for rls in self.info['releases']:
             s = "  {t.bold}{rls}{t.normal}".format(t=log.term, rls=rls['name'])
             if 'fedora' in rls:
                 s += '   (Fedora %s)' % rls['fedora']
-            print s
+            print(s)
             for repo in rls['repos']:
                 if 'special' in repo:
                     print ("    {t.bold}{name}{t.normal}: "
@@ -215,8 +216,8 @@ def print_releases(self):
     def print_pkg_summary(self):
         pkgs = self.info['packages']
         n = len(pkgs)
-        print "{t.bold}{n} RDO packages defined:{t.normal}".format(
-            t=log.term, n=n)
+        print("{t.bold}{n} RDO packages defined:{t.normal}".format(
+            t=log.term, n=n))
         confs = {}
         for pkg in pkgs:
             conf = pkg.get('conf')
@@ -243,7 +244,7 @@ def print_pkgs(self, filters=None):
         if filters:
             pkgs = filter_pkgs(pkgs, rexen=filters)
         if not pkgs:
-            print "No packages match your filter."
+            print("No packages match your filter.")
             return
         print("{t.bold}{n} packages found:{t.normal}".format(t=log.term,
                                                              n=len(pkgs)))

rdopkg/actionmods/reqs.py

@@ -1,7 +1,7 @@
+from __future__ import print_function
 import re
 import pymod2pkg
 
-
 from rdopkg.actionmods import rdoinfo
 from rdopkg.actionmods import query
 from rdopkg import exception

rdopkg/actions/distgit/actions.py

@@ -1,10 +1,11 @@
 """
 This is the main rdopkg action module with actions for distgit management.
 """
-
+from __future__ import print_function
 import itertools
 import os
 import re
+import six
 import sys
 
 from rdopkg.conf import cfg, cfg_files
@@ -19,7 +20,6 @@
 from rdopkg.utils import tidy_ssh_user
 from rdopkg import helpers
 
-
 FEDPKG = ['fedpkg']
 
 
@@ -112,13 +112,13 @@ def _putv(title, val):
     spec = specfile.Spec()
     vr = spec.get_vr()
     patches_apply_method = spec.patches_apply_method()
-    print
+    print('')
     _putv('Package:  ', package)
     _putv('VR:       ', vr)
     _putv('Version:  ', version)
     _putv('Upstream: ', upstream_version)
     _putv('Tag style:', version_tag_style or 'X.Y.Z')
-    print
+    print('')
     _putv('Patches style:         ', patches_style)
     _putv('Dist-git branch:       ', branch)
     _putv('Local patches branch:  ',
@@ -129,7 +129,7 @@ def _putv(title, val):
           '%s : %s' % (upstream_branch, upstream_str))
     if patches_style == 'review':
         _putv('Patches chain:         ', gerrit_review_url)
-    print
+    print('')
     _putv('OS dist:               ', osdist)
     _putv('Patches apply method:  ', patches_apply_method)
 
@@ -759,9 +759,9 @@ def _filter(check, stacker):
 
     buckets = []
     stacker = _stacker(buckets)
-    stacker.next()
+    six.next(stacker)
     filter = _filter(take, stacker)
-    filter.next()
+    six.next(filter)
 
     for patch in patches:
         filter.send(patch)
@@ -783,8 +783,9 @@ def update_patches(branch, local_patches_branch,
             action='update_patches',
             arg='version or new_version')
     tag = guess.version2tag(target_version, version_tag_style)
+
     _ensure_branch(local_patches_branch)
-    patches = git.get_commits(tag, local_patches_branch)
+    patches = list(git.get_commits(tag, local_patches_branch))
     n_patches = len(patches)
     _ensure_branch(branch)
     spec = specfile.Spec()

rdopkg/actions/info/actions.py

@@ -1,3 +1,4 @@
+from __future__ import print_function
 import sys
 
 from rdopkg.actionmods import rdoinfo
@@ -25,7 +26,7 @@ def info(pkgs=None, local_info=None, apply_tag=None, force_fetch=False):
         inforepo.print_pkgs(filters)
     else:
         inforepo.print_summary()
-        print
+        print('')
         print("Supply regex filter(s) to list package details, e.g.:\n{t.cmd}"
               "    rdopkg info nova\n"
               "    rdopkg info conf:client maintainers:jruzicka\n"