From e681f8c8d0987c27e89f988ef575a59b2b53dc92 Mon Sep 17 00:00:00 2001 From: Mika Fischer Date: Fri, 30 Sep 2011 13:42:53 +0200 Subject: [PATCH] Fixes for Python 3 --- sloth/annotations/container.py | 4 ++-- sloth/items/inserters.py | 2 +- sloth/plugins/__init__.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sloth/annotations/container.py b/sloth/annotations/container.py index 32e4129..c92fa1c 100644 --- a/sloth/annotations/container.py +++ b/sloth/annotations/container.py @@ -200,7 +200,7 @@ class OkapiAnnotationContainer(AnnotationContainer): """ def convertAnnotationPropertiesMapToDict(self, properties): propdict = {} - for k, v in properties.iteritems(): + for k, v in properties.items(): propdict[k] = v return propdict @@ -241,7 +241,7 @@ class OkapiAnnotationContainer(AnnotationContainer): Converts a dict to a AnnotationPropertiesMap """ def convertDictToAnnotationPropertiesMap(self, annotation, propdict): - for k, v in propdict.iteritems(): + for k, v in propdict.items(): if k != 'annotations' or k != 'frames': annotation.set_str(k, str(v)) return annotation diff --git a/sloth/items/inserters.py b/sloth/items/inserters.py index a0c666a..5c75468 100644 --- a/sloth/items/inserters.py +++ b/sloth/items/inserters.py @@ -18,7 +18,7 @@ class ItemInserter(QObject): self._prefix = prefix self._ann = {} if default_properties is not None: - self._ann = dict(self._default_properties.iteritems()) + self._ann = dict(self._default_properties.items()) self._commit = commit self._item = None diff --git a/sloth/plugins/__init__.py b/sloth/plugins/__init__.py index aef6e13..b460723 100644 --- a/sloth/plugins/__init__.py +++ b/sloth/plugins/__init__.py @@ -15,7 +15,7 @@ class CopyAnnotationsPlugin(QObject): prev = current.getPreviousSibling() if prev is not None: for annotation in prev.children(): - copied = dict(annotation.iteritems()) + copied = dict(annotation.items()) current.addAnnotation(copied) def action(self):