Merged the latest changes from the trunk.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/pyexiv2/iptc.py b/src/pyexiv2/iptc.py
index 1e5429e..128f77e 100644
--- a/src/pyexiv2/iptc.py
+++ b/src/pyexiv2/iptc.py
@@ -346,11 +346,16 @@ class IptcTag(ListenerInterface):
 
         elif self.type == 'Time':
             if isinstance(value, (datetime.time, datetime.datetime)):
-                r = value.strftime('%H%M%S')
-                if value.tzinfo is not None:
-                    r += value.strftime('%z')
+                # According to the IPTC specification, the format for a string
+                # field representing a time is '%H%M%S±%H%M'. However, the
+                # string expected by exiv2's TimeValue::read(string) should be
+                # formatted using pattern '%H:%M:%S±%H:%M'.
+                r = value.strftime('%H:%M:%S')
+                if value.tzinfo is not None and \
+                    not (value.tzinfo.hours == 0 and value.tzinfo.minutes == 0):
+                    r += value.strftime('%Z')
                 else:
-                    r += '+0000'
+                    r += '+00:00'
                 return r
             else:
                 raise IptcValueError(value, self.type)