aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/ReadMetadataTestCase.py4
-rw-r--r--test/iptc.py6
-rw-r--r--test/metadata.py12
3 files changed, 11 insertions, 11 deletions
diff --git a/test/ReadMetadataTestCase.py b/test/ReadMetadataTestCase.py
index 5840c35..1ca9e5d 100644
--- a/test/ReadMetadataTestCase.py
+++ b/test/ReadMetadataTestCase.py
@@ -42,9 +42,9 @@ class ReadMetadataTestCase(unittest.TestCase):
self.assertEqual(tag.value, evalue)
def check_type_and_values(self, tag, etype, evalues):
- for value in tag.values:
+ for value in tag.value:
self.assertEqual(type(value), etype)
- self.assertEqual(tag.values, evalues)
+ self.assertEqual(tag.value, evalues)
def assertCorrectFile(self, filename, md5sum):
"""
diff --git a/test/iptc.py b/test/iptc.py
index 6da1580..79bc609 100644
--- a/test/iptc.py
+++ b/test/iptc.py
@@ -186,9 +186,9 @@ class TestIptcTag(unittest.TestCase):
def test_set_values(self):
tag = IptcTag('Iptc.Application2.City', ['Seattle'])
- old_values = tag.values
- tag.values = ['Barcelona']
- self.failIfEqual(tag.values, old_values)
+ old_values = tag.value
+ tag.value = ['Barcelona']
+ self.failIfEqual(tag.value, old_values)
def test_set_raw_values_invalid(self):
tag = IptcTag('Iptc.Envelope.DateSent')
diff --git a/test/metadata.py b/test/metadata.py
index 98ce689..9ee7b32 100644
--- a/test/metadata.py
+++ b/test/metadata.py
@@ -280,7 +280,7 @@ class TestImageMetadata(unittest.TestCase):
self.assertEqual(self.metadata._tags['iptc'], {tag.key: tag})
self.assert_(tag.key in self.metadata._image._iptcKeys())
self.assertEqual(self.metadata._image._getIptcTag(tag.key)._getRawValues(),
- tag.raw_values)
+ tag.raw_value)
def test_set_iptc_tag_overwrite(self):
self.metadata.read()
@@ -291,7 +291,7 @@ class TestImageMetadata(unittest.TestCase):
self.assertEqual(self.metadata._tags['iptc'], {tag.key: tag})
self.assert_(tag.key in self.metadata._image._iptcKeys())
self.assertEqual(self.metadata._image._getIptcTag(tag.key)._getRawValues(),
- tag.raw_values)
+ tag.raw_value)
def test_set_iptc_tag_overwrite_already_cached(self):
self.metadata.read()
@@ -305,7 +305,7 @@ class TestImageMetadata(unittest.TestCase):
self.assertEqual(self.metadata._tags['iptc'], {key: new_tag})
self.assert_(key in self.metadata._image._iptcKeys())
self.assertEqual(self.metadata._image._getIptcTag(key)._getRawValues(),
- new_tag.raw_values)
+ new_tag.raw_value)
def test_set_iptc_tag_direct_value_assignment(self):
self.metadata.read()
@@ -317,10 +317,10 @@ class TestImageMetadata(unittest.TestCase):
self.assert_(key in self.metadata.iptc_keys)
self.assert_(key in self.metadata._image._iptcKeys())
tag = self.metadata._get_iptc_tag(key)
- self.assertEqual(tag.values, values)
+ self.assertEqual(tag.value, values)
self.assertEqual(self.metadata._tags['iptc'], {key: tag})
self.assertEqual(self.metadata._image._getIptcTag(key)._getRawValues(),
- tag.raw_values)
+ tag.raw_value)
def test_delete_iptc_tag_inexistent(self):
self.metadata.read()
@@ -594,7 +594,7 @@ class TestImageMetadata(unittest.TestCase):
self.failUnlessEqual(self.metadata[key].value, self.other[key].value)
for key in self.metadata.iptc_keys:
- self.failUnlessEqual(self.metadata[key].values, self.other[key].values)
+ self.failUnlessEqual(self.metadata[key].value, self.other[key].value)
for key in self.metadata.xmp_keys:
self.failUnlessEqual(self.metadata[key].value, self.other[key].value)