Fix python 3 incompatible code

diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py
index f0ef3234e070b3c8afe5495081bba628da3afe41..700c966e44f5d5163de78908d589e66134119993 100644 (file)
--- a/pym/gentoolkit/revdep_rebuild/analyse.py
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py
@@ -9,10 +9,10 @@ import glob
 
 from portage.output import bold, red, blue, yellow, green, nocolor
 
-from stuff import scan
-from collect import prepare_search_dirs, parse_revdep_config, collect_libraries_from_dir, collect_binaries_from_dir
-from assign import assign_packages
-from cache import save_cache
+from .stuff import scan
+from .collect import prepare_search_dirs, parse_revdep_config, collect_libraries_from_dir, collect_binaries_from_dir
+from .assign import assign_packages
+from .cache import save_cache
 
 
 def prepare_checks(files_to_check, libraries, bits, cmd_max_args):

diff --git a/pym/gentoolkit/revdep_rebuild/cache.py b/pym/gentoolkit/revdep_rebuild/cache.py
index a1cb1ecc2b93becea698912879bf7cfbc59ee60a..ca2ab1bff4b3429787e150d7214612abe225bf16 100644 (file)
--- a/pym/gentoolkit/revdep_rebuild/cache.py
+++ b/pym/gentoolkit/revdep_rebuild/cache.py
@@ -5,7 +5,7 @@ import os
 import time
 
 from portage.output import red
-from settings import DEFAULTS
+from .settings import DEFAULTS
 
 
 def read_cache(temp_path=DEFAULTS['DEFAULT_TMP_DIR']):
@@ -18,7 +18,7 @@ def read_cache(temp_path=DEFAULTS['DEFAULT_TMP_DIR']):
 
        ret = {'libraries':[], 'la_libraries':[], 'libraries_links':[], 'binaries':[]}
        try:
-               for key,val in ret.iteritems():
+               for key,val in list(ret.items()):
                        f = open(os.path.join(temp_path, key))
                        for line in f.readlines():
                                val.append(line.strip())
@@ -44,7 +44,7 @@ def save_cache(logger, to_save={}, temp_path=DEFAULTS['DEFAULT_TMP_DIR']):
                f.write(str(int(time.time())))
                f.close()
 
-               for key,val in to_save.iteritems():
+               for key,val in list(to_save.items()):
                        f = open(os.path.join(temp_path, key), 'w')
                        for line in val:
                                f.write(line + '\n')
@@ -87,7 +87,7 @@ def check_temp_files(temp_path=DEFAULTS['DEFAULT_TMP_DIR'], max_delay=3600):
 if __name__ == '__main__':
        print('Preparing cache ... ')
 
-       from collect import *
+       from .collect import *
        import logging
 
        bin_dirs, lib_dirs = prepare_search_dirs()

diff --git a/pym/gentoolkit/revdep_rebuild/collect.py b/pym/gentoolkit/revdep_rebuild/collect.py
index b9e9c0de4ed212515095e0fe258b7256ab4f8695..3f051617771ef17a6cce692f0723c805e691565f 100644 (file)
--- a/pym/gentoolkit/revdep_rebuild/collect.py
+++ b/pym/gentoolkit/revdep_rebuild/collect.py
@@ -18,7 +18,7 @@ def parse_conf(conf_file, visited=None, logger=None):
        lib_dirs = set()
        to_parse = set()
 
-       if isinstance(conf_file, basestring):
+       if isinstance(conf_file, str):
                conf_file = [conf_file]
 
        for conf in conf_file:

diff --git a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/revdep_rebuild/rebuild.py
index d26e186835bf64827592f19acbc9ec5de5081543..aa802bb5c453a6401008e517afc4c97f15f0aee6 100644 (file)
--- a/pym/gentoolkit/revdep_rebuild/rebuild.py
+++ b/pym/gentoolkit/revdep_rebuild/rebuild.py
@@ -25,12 +25,12 @@ import logging
 from portage import portdb
 from portage.output import bold, red, blue, yellow, green, nocolor
 
-from analyse import analyse
-from stuff import exithandler, get_masking_status
-from cache import check_temp_files, read_cache
-from assign import get_slotted_cps
-from settings import DEFAULTS
-from gentoolkit.revdep_rebuild import __version__
+from .analyse import analyse
+from .stuff import exithandler, get_masking_status
+from .cache import check_temp_files, read_cache
+from .assign import get_slotted_cps
+from .settings import DEFAULTS
+from . import __version__
 
 
 APP_NAME = sys.argv[0]

diff --git a/pym/gentoolkit/revdep_rebuild/stuff.py b/pym/gentoolkit/revdep_rebuild/stuff.py
index 66f5769c1d6ce6335ff4d3512b4a08e63c8c2adc..64b96015bbad218ee18529acf01792d47448a1f3 100644 (file)
--- a/pym/gentoolkit/revdep_rebuild/stuff.py
+++ b/pym/gentoolkit/revdep_rebuild/stuff.py
@@ -8,11 +8,11 @@ import portage
 
 # util. functions
 def call_program(args):
-       ''' Calls program with specified parameters and returns stdout '''
+       ''' Calls program with specified parameters and returns stdout as a str object '''
        subp = subprocess.Popen(args, stdout=subprocess.PIPE, \
                                                                stderr=subprocess.PIPE)
        stdout, stderr = subp.communicate()
-       return stdout
+       return str(stdout)
 
 
 def scan(params, files, max_args):