diff -up pyexiv2-0.3.2/src/exiv2wrapper.cpp.exiv2-0182 pyexiv2-0.3.2/src/exiv2wrapper.cpp
--- pyexiv2-0.3.2/src/exiv2wrapper.cpp.exiv2-0182 2011-10-24 19:06:02.000000000 +0200
+++ pyexiv2-0.3.2/src/exiv2wrapper.cpp 2011-12-15 10:22:01.755433460 +0100
@@ -521,15 +521,7 @@ void Image::setExifThumbnailFromData(con
const std::string Image::getIptcCharset() const
{
CHECK_METADATA_READ
- const char* charset = _iptcData->detectCharset();
- if (charset != 0)
- {
- return std::string(charset);
- }
- else
- {
- return std::string();
- }
+ return std::string();
}
diff -up pyexiv2-0.3.2/test/exif.py.exiv2-0182 pyexiv2-0.3.2/test/exif.py
--- pyexiv2-0.3.2/test/exif.py.exiv2-0182 2011-10-24 19:06:02.000000000 +0200
+++ pyexiv2-0.3.2/test/exif.py 2011-12-15 10:22:01.756433320 +0100
@@ -190,30 +190,32 @@ class TestExifTag(unittest.TestCase):
self.failUnlessRaises(ExifValueError, tag._convert_to_string, 'invalid')
self.failUnlessRaises(ExifValueError, tag._convert_to_string, 3.14)
- def test_convert_to_python_sshort(self):
- # Valid values
- tag = ExifTag('Exif.Image.TimeZoneOffset')
- self.assertEqual(tag.type, 'SShort')
- self.assertEqual(tag._convert_to_python('8'), 8)
- self.assertEqual(tag._convert_to_python('+5'), 5)
- self.assertEqual(tag._convert_to_python('-6'), -6)
-
- # Invalid values
- self.failUnlessRaises(ExifValueError, tag._convert_to_python, 'abc')
- self.failUnlessRaises(ExifValueError, tag._convert_to_python, '5,64')
- self.failUnlessRaises(ExifValueError, tag._convert_to_python, '47.0001')
- self.failUnlessRaises(ExifValueError, tag._convert_to_python, '1E3')
-
- def test_convert_to_string_sshort(self):
- # Valid values
- tag = ExifTag('Exif.Image.TimeZoneOffset')
- self.assertEqual(tag.type, 'SShort')
- self.assertEqual(tag._convert_to_string(12), '12')
- self.assertEqual(tag._convert_to_string(-3), '-3')
-
- # Invalid values
- self.failUnlessRaises(ExifValueError, tag._convert_to_string, 'invalid')
- self.failUnlessRaises(ExifValueError, tag._convert_to_string, 3.14)
+# EPEL packaging: Exif.Image.TimeZoneOffset has not been supported by 0.18.2
+# http://dev.exiv2.org/issues/show/0000651
+# def test_convert_to_python_sshort(self):
+# # Valid values
+# tag = ExifTag('Exif.Image.TimeZoneOffset')
+# self.assertEqual(tag.type, 'SShort')
+# self.assertEqual(tag._convert_to_python('8'), 8)
+# self.assertEqual(tag._convert_to_python('+5'), 5)
+# self.assertEqual(tag._convert_to_python('-6'), -6)
+#
+# # Invalid values
+# self.failUnlessRaises(ExifValueError, tag._convert_to_python, 'abc')
+# self.failUnlessRaises(ExifValueError, tag._convert_to_python, '5,64')
+# self.failUnlessRaises(ExifValueError, tag._convert_to_python, '47.0001')
+# self.failUnlessRaises(ExifValueError, tag._convert_to_python, '1E3')
+#
+# def test_convert_to_string_sshort(self):
+# # Valid values
+# tag = ExifTag('Exif.Image.TimeZoneOffset')
+# self.assertEqual(tag.type, 'SShort')
+# self.assertEqual(tag._convert_to_string(12), '12')
+# self.assertEqual(tag._convert_to_string(-3), '-3')
+#
+# # Invalid values
+# self.failUnlessRaises(ExifValueError, tag._convert_to_string, 'invalid')
+# self.failUnlessRaises(ExifValueError, tag._convert_to_string, 3.14)
def test_convert_to_python_long(self):
# Valid values
diff -up pyexiv2-0.3.2/test/metadata.py.exiv2-0182 pyexiv2-0.3.2/test/metadata.py
--- pyexiv2-0.3.2/test/metadata.py.exiv2-0182 2011-10-24 19:06:02.000000000 +0200
+++ pyexiv2-0.3.2/test/metadata.py 2011-12-15 10:22:01.756433320 +0100
@@ -35,8 +35,11 @@ import os
import tempfile
import time
import unittest
+import logging
from testutils import EMPTY_JPG_DATA
+logging.basicConfig(format='%(levelname)s:%(funcName)s:%(message)s',
+ level=logging.DEBUG)
class TestImageMetadata(unittest.TestCase):
@@ -562,7 +565,7 @@ class TestImageMetadata(unittest.TestCas
self.metadata.iptc_keys + \
self.metadata.xmp_keys
for key in keys:
- self.metadata[key] = self.metadata[key]
+ self.metadata[key] = self.metadata[key]
def test_nonexistent_tag_family(self):
self.metadata.read()
@@ -574,7 +577,7 @@ class TestImageMetadata(unittest.TestCas
##########################
# Test the image comment #
##########################
-
+
def test_get_comment(self):
self.metadata.read()
self.failUnlessEqual(self.metadata.comment, 'Hello World!')
@@ -640,13 +643,17 @@ class TestImageMetadata(unittest.TestCas
self.clean.read()
self.assertEqual(len(self.clean), 0)
+ logging.debug("self.clean = %s", dir(self.clean))
+ logging.debug("self.clean = %s", self.clean.iptc_keys)
+ logging.debug("self.clean = %s", self.clean.exif_keys)
+ logging.debug("self.clean = %s", self.clean.xmp_keys)
self.assertTrue('Exif.Image.DateTimeOriginal' not in self.clean)
key = 'Exif.Image.DateTimeOriginal'
- correctDate = datetime.datetime(2007,03,11)
- incorrectDate = datetime.datetime(2009,03,25)
- tag_date = ExifTag(key,correctDate)
- false_tag_date = ExifTag(key,incorrectDate)
+ correctDate = datetime.datetime(2007, 03, 11)
+ incorrectDate = datetime.datetime(2009, 03, 25)
+ tag_date = ExifTag(key, correctDate)
+ false_tag_date = ExifTag(key, incorrectDate)
self.clean[key] = tag_date
self.assertEqual(len(self.clean), 1)
@@ -655,11 +662,11 @@ class TestImageMetadata(unittest.TestCas
self.assertEqual(self.clean.get('Exif.Image.DateTime', tag_date), tag_date)
key = 'Exif.Photo.UserComment'
- tag = ExifTag(key,'UserComment')
- self.clean[key] = tag
+ tag = ExifTag(key, 'UserComment')
+ self.clean[key] = tag
key = 'Iptc.Application2.Caption'
- tag = IptcTag(key,['Caption'])
- self.clean[key] = tag
+ tag = IptcTag(key, ['Caption'])
+ self.clean[key] = tag
key = 'Xmp.dc.subject'
tag = XmpTag(key, ['subject', 'values'])
self.clean[key] = tag
@@ -785,24 +792,24 @@ class TestImageMetadata(unittest.TestCas
# Test the IPTC charset #
#########################
- def test_guess_iptc_charset(self):
- # If no charset is defined, exiv2 guesses it from the encoding of the
- # metadata.
- self.metadata.read()
- self.assertEqual(self.metadata.iptc_charset, 'ascii')
- self.metadata['Iptc.Application2.City'] = [u'Córdoba']
- self.assertEqual(self.metadata.iptc_charset, 'utf-8')
-
- def test_set_iptc_charset_utf8(self):
- self.metadata.read()
- self.assert_('Iptc.Envelope.CharacterSet' not in self.metadata.iptc_keys)
- self.assertEqual(self.metadata.iptc_charset, 'ascii')
- values = ('utf-8', 'utf8', 'u8', 'utf', 'utf_8')
- for value in values:
- self.metadata.iptc_charset = value
- self.assertEqual(self.metadata.iptc_charset, 'utf-8')
- self.metadata.iptc_charset = value.upper()
- self.assertEqual(self.metadata.iptc_charset, 'utf-8')
+# def test_guess_iptc_charset(self):
+# # If no charset is defined, exiv2 guesses it from the encoding of the
+# # metadata.
+# self.metadata.read()
+# self.assertEqual(self.metadata.iptc_charset, 'ascii')
+# self.metadata['Iptc.Application2.City'] = [u'Córdoba']
+# self.assertEqual(self.metadata.iptc_charset, 'utf-8')
+
+# def test_set_iptc_charset_utf8(self):
+# self.metadata.read()
+# self.assert_('Iptc.Envelope.CharacterSet' not in self.metadata.iptc_keys)
+# self.assertEqual(self.metadata.iptc_charset, 'ascii')
+# values = ('utf-8', 'utf8', 'u8', 'utf', 'utf_8')
+# for value in values:
+# self.metadata.iptc_charset = value
+# self.assertEqual(self.metadata.iptc_charset, 'utf-8')
+# self.metadata.iptc_charset = value.upper()
+# self.assertEqual(self.metadata.iptc_charset, 'utf-8')
def test_set_invalid_iptc_charset(self):
self.metadata.read()
@@ -821,27 +828,27 @@ class TestImageMetadata(unittest.TestCas
self.assertRaises(ValueError, self.metadata.__setattr__,
'iptc_charset', value)
- def test_delete_iptc_charset(self):
- self.metadata.read()
- key = 'Iptc.Envelope.CharacterSet'
-
- self.assertEqual(self.metadata.iptc_charset, 'ascii')
- self.assert_(key not in self.metadata.iptc_keys)
- del self.metadata.iptc_charset
- self.assertEqual(self.metadata.iptc_charset, 'ascii')
- self.assert_(key not in self.metadata.iptc_keys)
-
- self.metadata.iptc_charset = 'utf-8'
- self.assertEqual(self.metadata.iptc_charset, 'utf-8')
- self.assert_(key in self.metadata.iptc_keys)
- del self.metadata.iptc_charset
- self.assertEqual(self.metadata.iptc_charset, 'ascii')
- self.assert_(key not in self.metadata.iptc_keys)
-
- self.metadata.iptc_charset = 'utf-8'
- self.assertEqual(self.metadata.iptc_charset, 'utf-8')
- self.assert_(key in self.metadata.iptc_keys)
- self.metadata.iptc_charset = None
- self.assertEqual(self.metadata.iptc_charset, 'ascii')
- self.assert_(key not in self.metadata.iptc_keys)
+# def test_delete_iptc_charset(self):
+# self.metadata.read()
+# key = 'Iptc.Envelope.CharacterSet'
+#
+# self.assertEqual(self.metadata.iptc_charset, 'ascii')
+# self.assert_(key not in self.metadata.iptc_keys)
+# del self.metadata.iptc_charset
+# self.assertEqual(self.metadata.iptc_charset, 'ascii')
+# self.assert_(key not in self.metadata.iptc_keys)
+#
+# self.metadata.iptc_charset = 'utf-8'
+# self.assertEqual(self.metadata.iptc_charset, 'utf-8')
+# self.assert_(key in self.metadata.iptc_keys)
+# del self.metadata.iptc_charset
+# self.assertEqual(self.metadata.iptc_charset, 'ascii')
+# self.assert_(key not in self.metadata.iptc_keys)
+#
+# self.metadata.iptc_charset = 'utf-8'
+# self.assertEqual(self.metadata.iptc_charset, 'utf-8')
+# self.assert_(key in self.metadata.iptc_keys)
+# self.metadata.iptc_charset = None
+# self.assertEqual(self.metadata.iptc_charset, 'ascii')
+# self.assert_(key not in self.metadata.iptc_keys)
diff -up pyexiv2-0.3.2/test/pickling.py.exiv2-0182 pyexiv2-0.3.2/test/pickling.py
--- pyexiv2-0.3.2/test/pickling.py.exiv2-0182 2011-10-24 19:06:02.000000000 +0200
+++ pyexiv2-0.3.2/test/pickling.py 2011-12-15 10:32:06.210311586 +0100
@@ -46,7 +46,9 @@ class TestPicklingTags(unittest.TestCase
tags.append(ExifTag('Exif.Pentax.Temperature', '14'))
tags.append(ExifTag('Exif.Photo.UserComment', 'foo bar baz'))
tags.append(ExifTag('Exif.Image.BitsPerSample', 8))
- tags.append(ExifTag('Exif.Image.TimeZoneOffset', 7))
+# EPEL packaging: Exif.Image.TimeZoneOffset has not been supported by 0.18.2
+# http://dev.exiv2.org/issues/show/0000651
+# tags.append(ExifTag('Exif.Image.TimeZoneOffset', 7))
tags.append(ExifTag('Exif.Image.ImageWidth', 7492))
tags.append(ExifTag('Exif.OlympusCs.ManometerReading', 29))
tags.append(ExifTag('Exif.Image.XResolution', make_fraction(7, 3)))