# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: andreambu@gmail.com-20100215183250-g9pxr3jwarukjxdo # target_branch: bzr+ssh://bazaar.launchpad.net/~osomon/pyexiv2\ # /pyexiv2-0.1.3/ # testament_sha1: 6cd6505788957debc15d106e8e6b7a5cf9be54cc # timestamp: 2010-02-15 19:33:26 +0100 # base_revision_id: olivier@tilloy.net-20090314215044-jb7yk3lzbgij09d8 # # Begin patch === modified file 'src/pyexiv2.py' --- src/pyexiv2.py 2009-03-14 21:43:49 +0000 +++ src/pyexiv2.py 2010-02-15 18:32:50 +0000 @@ -654,8 +654,6 @@ except KeyError: pass if len(newValues) > 0: - if len(newValues) == 1: - newValues = newValues[0] self.__iptcTagsDict[key] = tuple([ConvertToPythonType(tagFamily, typeName, str(v)) for v in newValues]) else: if self.__iptcTagsDict.has_key(key): # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQdmr8oAAWvfgAAQUWP//3IA AAC////wUAM5vIwzqimCSknqeoGnpAxqZAADRoACSobSmaap+o08qfqnqPUHqAAAAJQRNTTFPyUe U9RptQBobUaBoGA0BoAANNBoBoA0CSSnkDRTZTwJqm1PGlPTaU2p6j1BpQyNOZTDjBKCpJea694J ioa4Ni+r7WZ3yUVfnhvPuMhdhe1i8nlX6Z+8/3ezLRQ0UOm7w52lr0htzXPcI2FHEfGpHPlkaA8X 8oCity95uDm+UoBFXSNHaeQUslllFPgLDq84SClQq0TCwKw1inrEYPKvHqiw58VtIsojUC5OJytc XW8KWHTLwcy4LxDFU4toxAvPtVJn6GWaFUNgmRQkKjFHj9+wxLgeWG8s1VIzTKJiDGArb1g0ZVGH S4X+1RdivnioCgTLeBMmUbam0yMjAIbRwsVqnG64UVcszAlbaYDTSUUe4m5giulbMy9l+w3FZOFC SRKEk6NRSp5WFpEcRSpVrJQiMULJWuE4E+Qgmf4I1i1cqMk0XWXBHyN6XqJopxyLajPdiRizKbfk 6v14sSVn4IlYdDwuVFOK6ke5QavSFixcLzYYmJ7YMS0FYe6XZ6XoVQ8Xlqb0pF8iiuO4sNDku5cq ZgMg2zmp7W32N90t+NGh6nI6kDmRUSZVbGKUPyP0LAnAd6h4+yXYpCa3KcjDQaY2hDaxKmmqFasl aYjtXTmHTMHHqrQmA1CVXKDYF5uO441In546d9pEE9Ytoty+Je9BALWVU5nkKCT8hwNM5rWBKdNF b+wj/sXPsAiB9ewdAjB30UM15FULI0VwdxdVOlFMvgL3BCoN7UqRKpYpZr5oQecqS26iTgc5Hgbi GwKHJP8BhDbqDmQyjwFXV8MZgSAc4ItawYukSfAMmMmmvpo4LdDnDOwpVyxNZIsalyqPL3WRoJkP DXjOBpMKzpjWy2USULc7AO6gQYoE5OkGak3KY3gM9XyKCJnBy9thrcRaeskqyOwPJBqEgqTbcuQG TCdsqgkkmCgHwJ1uwjhkIqV0dJg7iuHBO/1THBLDWH+LuSKcKEgDs1flAA==