diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2014-02-11 11:14:04 -0800 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2014-02-11 11:14:04 -0800 |
| commit | 392a3de48db2d7b56a0919603f5c6e7f80970551 (patch) | |
| tree | bcec16f4d3a807c24c6a08aec31163273f19f507 | |
| parent | revdep_rebuild/analyse.py: Cleanup some debug code, remove a blank line. (diff) | |
| download | gentoolkit-392a3de48db2d7b56a0919603f5c6e7f80970551.tar.gz gentoolkit-392a3de48db2d7b56a0919603f5c6e7f80970551.tar.bz2 gentoolkit-392a3de48db2d7b56a0919603f5c6e7f80970551.zip | |
recdep_rebuild: Python 3 fixes.
| -rw-r--r-- | pym/gentoolkit/revdep_rebuild/cache.py | 4 | ||||
| -rw-r--r-- | pym/gentoolkit/revdep_rebuild/collect.py | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/pym/gentoolkit/revdep_rebuild/cache.py b/pym/gentoolkit/revdep_rebuild/cache.py index 06f4c67..862638d 100644 --- a/pym/gentoolkit/revdep_rebuild/cache.py +++ b/pym/gentoolkit/revdep_rebuild/cache.py @@ -28,7 +28,7 @@ def read_cache(temp_path=DEFAULTS['DEFAULT_TMP_DIR']): 'binaries':[] } try: - for key,val in ret.iteritems(): + for key,val in ret.items(): _file = open(os.path.join(temp_path, key)) for line in _file.readlines(): val.append(line.strip()) @@ -56,7 +56,7 @@ def save_cache(logger, to_save={}, temp_path=DEFAULTS['DEFAULT_TMP_DIR']): _file.write(str(int(time.time()))) _file.close() - for key,val in to_save.iteritems(): + for key,val in to_save.items(): _file = open(os.path.join(temp_path, key), 'w') for line in val: _file.write(line + '\n') diff --git a/pym/gentoolkit/revdep_rebuild/collect.py b/pym/gentoolkit/revdep_rebuild/collect.py index 55a244c..a044398 100644 --- a/pym/gentoolkit/revdep_rebuild/collect.py +++ b/pym/gentoolkit/revdep_rebuild/collect.py @@ -8,11 +8,18 @@ import re import os import glob import stat +import sys import portage from portage.output import blue, yellow +if sys.hexversion < 0x3000000: + _basestring = basestring +else: + _basestring = str + + def parse_conf(conf_file, visited=None, logger=None): ''' Parses supplied conf_file for libraries pathes. conf_file is file or files to parse @@ -21,7 +28,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, _basestring): conf_file = [conf_file] for conf in conf_file: |