IPTC String conversion.

2 files changed, 15 insertions, 0 deletions

diff --git a/src/pyexiv2.py b/src/pyexiv2.py
index fa1b3a2..b4d783f 100644
--- a/src/pyexiv2.py
+++ b/src/pyexiv2.py
@@ -488,6 +488,12 @@ class IptcTag(MetadataTag):
             except ValueError:
                 raise IptcValueError(value, xtype)
 
+        elif xtype == 'String':
+            try:
+                return unicode(value, 'utf-8')
+            except TypeError:
+                raise IptcValueError(value, xtype)
+
         # TODO: other types
 
         raise NotImplementedError('IPTC conversion for type [%s]' % xtype)
diff --git a/unittest/iptc.py b/unittest/iptc.py
index 4ed0dc3..035b435 100644
--- a/unittest/iptc.py
+++ b/unittest/iptc.py
@@ -42,4 +42,13 @@ class TestIptcTag(unittest.TestCase):
         self.failUnlessRaises(IptcValueError, IptcTag._convert_to_python, '47.0001', xtype)
         self.failUnlessRaises(IptcValueError, IptcTag._convert_to_python, '1E3', xtype)
 
+    def test_convert_to_python_string(self):
+        xtype = 'String'
+        # Valid values
+        self.assertEqual(IptcTag._convert_to_python('Some text.', xtype), u'Some text.')
+        self.assertEqual(IptcTag._convert_to_python('Some text with exotic chàräctérʐ.', xtype),
+                         u'Some text with exotic chàräctérʐ.')
+        # Invalid values
+        self.failUnlessRaises(IptcValueError, IptcTag._convert_to_python, None, xtype)
+
     # TODO: other types