diff options
| author | Guido Günther <agx@sigxcpu.org> | 2015-10-24 13:56:11 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2015-10-24 17:59:05 +0200 |
| commit | ca209fb24a422336f356dbeafd143e8356a4003b (patch) | |
| tree | e2337defe1e50632611f610d060207971c2c52ec /gbp/rpm | |
| parent | e02db7953432c79f65d0828ccfc73570667c86d2 (diff) | |
Use six.iteritems()
to work towards Python3 support
Gbp-Dch: Ignore
Diffstat (limited to 'gbp/rpm')
| -rw-r--r-- | gbp/rpm/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gbp/rpm/__init__.py b/gbp/rpm/__init__.py index 94daf3b0..41ae05d1 100644 --- a/gbp/rpm/__init__.py +++ b/gbp/rpm/__init__.py @@ -23,6 +23,8 @@ import tempfile from optparse import OptionParser from collections import defaultdict +import six + import gbp.command_wrappers as gbpc from gbp.errors import GbpError from gbp.git import GitRepositoryError @@ -684,7 +686,7 @@ class SpecFile(object): macro_line = self._content.insert_after(macro_line, comment_text) macro_line = self._set_special_macro('patch', patchnum, '-p1', macro_line) - for cmd, args in cmds.iteritems(): + for cmd, args in six.iteritems(cmds): if cmd in ('if', 'ifarch'): self._content.insert_before(macro_line, '%%%s %s\n' % (cmd, args)) @@ -769,7 +771,7 @@ class SpecFile(object): """ orig = None sources = self.sources() - for num, filename in sorted(sources.iteritems()): + for num, filename in sorted(six.iteritems(sources)): src = {'num': num, 'filename': os.path.basename(filename), 'uri': filename} src['filename_base'], src['archive_fmt'], src['compression'] = \ |