Skip to content

Commit

Permalink
iteritems missing in py3
Browse files Browse the repository at this point in the history
  • Loading branch information
esc committed May 10, 2014
1 parent 16c2d56 commit 34211bf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions bloscpack/abstract_objects.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def __str__(self):
return pprint.pformat(dict(self))

def __repr__(self):
args = (("%s=%s" % (arg, repr(value))) for arg, value in self.iteritems())
args = (("%s=%s" % (arg, repr(value))) for arg, value in self.items())
return "%s(%s)" % (self._class_name, ", ".join(args))

def pformat(self, indent=4):
Expand All @@ -63,7 +63,7 @@ def pformat(self, indent=4):
return "%s:\n%s%s" % (self._class_name, indent, ("\n%s" % indent).join((("%s: %s" %
(key, (repr(value) if (key not in self.bytes_attributes or value == -1)
else double_pretty_size(value)))
for key, value in self.iteritems()))))
for key, value in self.items()))))

def copy(self):
return copy.copy(self)
2 changes: 1 addition & 1 deletion bloscpack/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ def main():
log.LEVEL = log.DEBUG
log.debug('command line argument parsing complete')
log.debug('command line arguments are: ')
for arg, val in vars(args).iteritems():
for arg, val in vars(args).items():
log.debug(' %s: %s' % (arg, str(val)))
process_nthread_arg(args)

Expand Down
4 changes: 2 additions & 2 deletions bloscpack/file_io.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def _write_metadata(output_fp, metadata, metadata_args):
_check_metadata_arguments(metadata_args)
metadata_total = 0
log.debug('metadata args are:')
for arg, value in metadata_args.iteritems():
for arg, value in metadata_args.items():
log.debug('\t%s: %s' % (arg, value))
metadata_total += METADATA_HEADER_LENGTH
serializer_impl = SERIALIZERS_LOOKUP[metadata_args['magic_format']]
Expand Down Expand Up @@ -210,7 +210,7 @@ def _read_metadata(input_fp):
log.debug("raw metadata header: '%s'" % repr(raw_metadata_header))
metadata_header = decode_metadata_header(raw_metadata_header)
log.debug("metadata header: ")
for arg, value in metadata_header.iteritems():
for arg, value in metadata_header.items():
log.debug('\t%s: %s' % (arg, value))
metadata = input_fp.read(metadata_header['meta_comp_size'])
prealloc = metadata_header['max_meta_size'] - metadata_header['meta_comp_size']
Expand Down

0 comments on commit 34211bf

Please sign in to comment.