From 72faa7331d97844cf4e971f27c904d0e4a568f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Thu, 17 May 2018 15:02:27 +0200 Subject: [PATCH] Fix issues with python strings & literals --- tests/bugfixes/redmine/test_easyaccess.py | 2 +- tests/bugfixes/redmine/test_issue_445.py | 4 ++-- tests/bugfixes/redmine/test_issue_452.py | 4 ++-- tests/bugfixes/redmine/test_issue_498.py | 4 ++-- tests/bugfixes/redmine/test_issue_528.py | 2 +- tests/bugfixes/redmine/test_issue_554.py | 2 +- tests/bugfixes/redmine/test_issue_662.py | 18 ++++++++++-------- tests/bugfixes/redmine/test_issue_666.py | 8 +------- tests/bugfixes/redmine/test_issue_711.py | 8 +++----- tests/bugfixes/redmine/test_issue_751.py | 4 ++-- tests/bugfixes/redmine/test_issue_769.py | 2 +- tests/bugfixes/redmine/test_issue_784.py | 2 +- tests/bugfixes/redmine/test_issue_800.py | 2 +- tests/bugfixes/redmine/test_issue_812.py | 4 ++-- 14 files changed, 30 insertions(+), 36 deletions(-) diff --git a/tests/bugfixes/redmine/test_easyaccess.py b/tests/bugfixes/redmine/test_easyaccess.py index 7bd25c48..a489718b 100644 --- a/tests/bugfixes/redmine/test_easyaccess.py +++ b/tests/bugfixes/redmine/test_easyaccess.py @@ -9,7 +9,7 @@ class EasyaccessTest(metaclass=system_tests.CaseMeta): filename = "$data_path/exiv2-empty_copy.jpg" commands = [ - "$exiv2 -u -v -M\"set Exif.Image.Make Samsung\" $filename", + """$exiv2 -u -v -M"set Exif.Image.Make Samsung" $filename""", "$easyaccess_test $filename" ] stdout = [ diff --git a/tests/bugfixes/redmine/test_issue_445.py b/tests/bugfixes/redmine/test_issue_445.py index ac0fe78a..5d2137ad 100644 --- a/tests/bugfixes/redmine/test_issue_445.py +++ b/tests/bugfixes/redmine/test_issue_445.py @@ -13,9 +13,9 @@ class SetCommentOnImageWithEmptyComment(metaclass=system_tests.CaseMeta): empty_jpg = "$data_path/exiv2-empty_copy.jpg" commands = [ - "$exiv2 -u -v -M'set Exif.Photo.UserComment A comment' $bug_repr", + """$exiv2 -u -v -M"set Exif.Photo.UserComment A comment" $bug_repr""", "$exiv2 -u -b -pt $bug_repr", - "$exiv2 -u -v -M'set Exif.Photo.UserComment A comment' $empty_jpg", + """$exiv2 -u -v -M"set Exif.Photo.UserComment A comment" $empty_jpg""", "$exiv2 -u -b -pt $empty_jpg" ] diff --git a/tests/bugfixes/redmine/test_issue_452.py b/tests/bugfixes/redmine/test_issue_452.py index 2d5c9605..32b34260 100644 --- a/tests/bugfixes/redmine/test_issue_452.py +++ b/tests/bugfixes/redmine/test_issue_452.py @@ -10,9 +10,9 @@ class NonIntrusiveWriteUpdateIFD(metaclass=system_tests.CaseMeta): filename = "$data_path/exiv2-empty_copy.jpg" commands = [ - "$exiv2 -u -v -M\"set Exif.GPSInfo.GPSLatitude SRational -1/3 -2/3 -3/3\" $filename", + """$exiv2 -u -v -M"set Exif.GPSInfo.GPSLatitude SRational -1/3 -2/3 -3/3" $filename""", "$exiv2 -u -pv $filename", - "$exiv2 -u -v -M\"set Exif.GPSInfo.GPSLatitude Rational 1/3 2/3 3/3\" $filename", + """$exiv2 -u -v -M"set Exif.GPSInfo.GPSLatitude Rational 1/3 2/3 3/3" $filename""", "$exiv2 -u -pv $filename", ] diff --git a/tests/bugfixes/redmine/test_issue_498.py b/tests/bugfixes/redmine/test_issue_498.py index 5bf0aad7..37bc4cfc 100644 --- a/tests/bugfixes/redmine/test_issue_498.py +++ b/tests/bugfixes/redmine/test_issue_498.py @@ -11,9 +11,9 @@ class ReadDataAfterTagDelete(metaclass=system_tests.CaseMeta): filename = "$data_path/exiv2-empty_copy.jpg" commands = [ - "$exiv2 -u -v -M\"set Exif.GPSInfo.GPSLatitude 0/1 1/1 2/1\" $filename", + """$exiv2 -u -v -M"set Exif.GPSInfo.GPSLatitude 0/1 1/1 2/1" $filename""", "$exiv2 -u -v -pv $filename", - "$exiv2 -u -v -M\"del Exif.GPSInfo.GPSLatitude\" $filename", + """$exiv2 -u -v -M"del Exif.GPSInfo.GPSLatitude" $filename""", "$exiv2 -u -v -pv $filename" ] diff --git a/tests/bugfixes/redmine/test_issue_528.py b/tests/bugfixes/redmine/test_issue_528.py index ada5cd80..d8ddebeb 100644 --- a/tests/bugfixes/redmine/test_issue_528.py +++ b/tests/bugfixes/redmine/test_issue_528.py @@ -12,7 +12,7 @@ class TypeSizeForExifOnly(metaclass=system_tests.CaseMeta): commands = [ "$exiv2 -u -pt $filename", - "$exiv2 -u -v -M\"set Exif.Image.Software GI\" $filename" + """$exiv2 -u -v -M"set Exif.Image.Software GI" $filename""" ] stdout = ["""Exif.Image.ProcessingSoftware Ascii 20 digiKam-0.9.4-beta4 diff --git a/tests/bugfixes/redmine/test_issue_554.py b/tests/bugfixes/redmine/test_issue_554.py index 11195dac..076db625 100644 --- a/tests/bugfixes/redmine/test_issue_554.py +++ b/tests/bugfixes/redmine/test_issue_554.py @@ -11,7 +11,7 @@ class SettingExifImageDateTimeDateGivesValueTooLarge( filename = "$data_path/exiv2-empty_copy.jpg" commands = [ - "$exiv2 -u -v -M\"set Exif.Image.DateTime Date 2007-05-27\" $filename", + """$exiv2 -u -v -M"set Exif.Image.DateTime Date 2007-05-27" $filename""", "$exiv2 -u -pt $filename" ] stdout = [ diff --git a/tests/bugfixes/redmine/test_issue_662.py b/tests/bugfixes/redmine/test_issue_662.py index 721116f4..3312b95a 100644 --- a/tests/bugfixes/redmine/test_issue_662.py +++ b/tests/bugfixes/redmine/test_issue_662.py @@ -10,29 +10,31 @@ class UnicodeEncodingOfExifUserCommentTag(metaclass=system_tests.CaseMeta): filename = "$data_path/exiv2-empty_copy.jpg" commands = [ - "$exiv2 -u -M\"set Exif.Photo.UserComment charset=Ascii An ascii comment\" $filename", + "$exiv2 -u -M'set Exif.Photo.UserComment charset=Ascii An ascii comment' $filename", "$exiv2 -u -PEnh $filename", - "$exiv2 -u -M\"set Exif.Photo.UserComment charset=Ascii A\\\\nnewline\" $filename", + """$exiv2 -u -M'set Exif.Photo.UserComment charset=Ascii A +newline' $filename""", "$exiv2 -u -PEnh $filename", - "$exiv2 -u -M\"set Exif.Photo.UserComment charset=Unicode A Unicode comment\" $filename", + "$exiv2 -u -M'set Exif.Photo.UserComment charset=Unicode A Unicode comment' $filename", "$exiv2 -u -PEnh $filename", - "$exiv2 -u -M\"set Exif.Photo.UserComment charset=Unicode \\\\u01c4\" $filename", + "$exiv2 -u -M'set Exif.Photo.UserComment charset=Unicode \u01c4' $filename", "$exiv2 -u -PEnh $filename", - "$exiv2 -u -M\"set Exif.Photo.UserComment charset=Unicode A\\\\u01c4C\" $filename", + "$exiv2 -u -M'set Exif.Photo.UserComment charset=Unicode A\u01c4C' $filename", "$exiv2 -u -PEnh $filename", - "$exiv2 -u -M\"set Exif.Photo.UserComment charset=Unicode With\\\\nNewline\" $filename", + """$exiv2 -u -M'set Exif.Photo.UserComment charset=Unicode With +Newline' $filename""", "$exiv2 -u -PEnh $filename", - "$exiv2 -u -M\"set Exif.Photo.UserComment charset=Unicode With\\\\tTab\" $filename", + "$exiv2 -u -M'set Exif.Photo.UserComment charset=Unicode With\tTab' $filename", "$exiv2 -u -PEnh $filename", #Test invalid escape sequences - "$exiv2 -u -M\"set Exif.Photo.UserComment charset=Unicode \\\\ugggg\" $filename", + "$exiv2 -u -M'set Exif.Photo.UserComment charset=Unicode \\\\ugggg' $filename", "$exiv2 -u -PEnh $filename", ] stdout = [ diff --git a/tests/bugfixes/redmine/test_issue_666.py b/tests/bugfixes/redmine/test_issue_666.py index 35d194d1..83d0c2b7 100644 --- a/tests/bugfixes/redmine/test_issue_666.py +++ b/tests/bugfixes/redmine/test_issue_666.py @@ -10,13 +10,7 @@ class OptimizeBinaryArrayElements(metaclass=system_tests.CaseMeta): filename = "$data_path/exiv2-empty_copy.jpg" commands = [ - "$exiv2 -u -v -M'set Exif.Image.Make NIKON' " - "-M'set Exif.Image.Model D90' " - "-M'set Exif.Nikon3.ShutterCount 100' " - "-M'set Exif.Nikon3.SerialNumber 123' " - "-M'set Exif.NikonSi02xx.Version 48 50 51 52' " - "-M'set Exif.NikonSi02xx.ShutterCount 100' $filename", - + """$exiv2 -u -v -M"set Exif.Image.Make NIKON" -M"set Exif.Image.Model D90" -M"set Exif.Nikon3.ShutterCount 100" -M"set Exif.Nikon3.SerialNumber 123" -M"set Exif.NikonSi02xx.Version 48 50 51 52" -M"set Exif.NikonSi02xx.ShutterCount 100" $filename""", "$exiv2 -u -pa -u -b $filename" ] stdout = [ diff --git a/tests/bugfixes/redmine/test_issue_711.py b/tests/bugfixes/redmine/test_issue_711.py index aaa3a67d..bdbb0a2d 100644 --- a/tests/bugfixes/redmine/test_issue_711.py +++ b/tests/bugfixes/redmine/test_issue_711.py @@ -6,14 +6,12 @@ import system_tests URL = "http://dev.exiv2.org/issues/711" COMMANDS = [ - "$exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Initial values, read from the command line' " - "-M'set Exif.Image.DocumentName Float 0.12345' " - "-M'set Exif.Image.ImageDescription Double 0.987654321' $filename", + """$exiv2 -u -v -M"set Exif.Image.ProcessingSoftware Initial values, read from the command line" -M"set Exif.Image.DocumentName Float 0.12345" -M"set Exif.Image.ImageDescription Double 0.987654321" $filename""", "$exiv2 -u -v -PEkyct $filename", - "$exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Non-intrusive update' $filename", + """$exiv2 -u -v -M"set Exif.Image.ProcessingSoftware Non-intrusive update" $filename""", "$exiv2 -u -v -PEkyct $filename", - "$exiv2 -u -v -M'set Exif.Image.ProcessingSoftware Intrusive update, writing the structure from scratch' $filename", + """$exiv2 -u -v -M"set Exif.Image.ProcessingSoftware Intrusive update, writing the structure from scratch" $filename""", "$exiv2 -u -v -PEkyct $filename", ] diff --git a/tests/bugfixes/redmine/test_issue_751.py b/tests/bugfixes/redmine/test_issue_751.py index 8830eb3d..a0e35723 100644 --- a/tests/bugfixes/redmine/test_issue_751.py +++ b/tests/bugfixes/redmine/test_issue_751.py @@ -13,10 +13,10 @@ class AdobeXmpNamespace(metaclass=system_tests.CaseMeta): xmpname = "$data_path/exiv2-empty_copy.xmp" commands = [ - "$exiv2 -v -M'reg imageapp orig/' -M 'set Xmp.imageapp.uuid abcd' $filename", + """$exiv2 -v -M"reg imageapp orig/" -M "set Xmp.imageapp.uuid abcd" $filename""", "$exiv2 -f -eX $filename", "$cat $xmpname", - "$exiv2 -v -M'reg imageapp dest/' -M 'set Xmp.imageapp.uuid abcd' $filename", + """$exiv2 -v -M"reg imageapp dest/" -M "set Xmp.imageapp.uuid abcd" $filename""", "$exiv2 -f -eX $filename", "$cat $xmpname", ] diff --git a/tests/bugfixes/redmine/test_issue_769.py b/tests/bugfixes/redmine/test_issue_769.py index fd2cacb2..ff1c92d5 100644 --- a/tests/bugfixes/redmine/test_issue_769.py +++ b/tests/bugfixes/redmine/test_issue_769.py @@ -11,7 +11,7 @@ class AssertionSvEqualsDFailedRegression(metaclass=system_tests.CaseMeta): filename = "$data_path/exiv2-empty_copy.jpg" commands = [ - "$exiv2 -u -v -M\"add Exif.Image.Make Canon\" -M\"add Exif.CanonCs.0x0001 Short 1\" -M\"add Exif.CanonCs.0x0000 Short 2\" $filename", + """$exiv2 -u -v -M"add Exif.Image.Make Canon" -M"add Exif.CanonCs.0x0001 Short 1" -M"add Exif.CanonCs.0x0000 Short 2" $filename""", "$exiv2 -u -v -PEkyct $filename" ] diff --git a/tests/bugfixes/redmine/test_issue_784.py b/tests/bugfixes/redmine/test_issue_784.py index 51b1661d..4a8ddbff 100644 --- a/tests/bugfixes/redmine/test_issue_784.py +++ b/tests/bugfixes/redmine/test_issue_784.py @@ -13,7 +13,7 @@ class WritingXmpLrHierarchicalSubjectWritesWrongDatatype( commands = [ "$exiv2 -px $filename", - "$exiv2 -M\"add Xmp.lr.hierarchicalSubject root|1st|2nd|3rd|4th|5th\" $filename", + """$exiv2 -M"add Xmp.lr.hierarchicalSubject root|1st|2nd|3rd|4th|5th" $filename""", "$exiv2 -px $filename", ] diff --git a/tests/bugfixes/redmine/test_issue_800.py b/tests/bugfixes/redmine/test_issue_800.py index 0f53e9de..dee1b939 100644 --- a/tests/bugfixes/redmine/test_issue_800.py +++ b/tests/bugfixes/redmine/test_issue_800.py @@ -11,7 +11,7 @@ FORMATS = ["jpg", "psd"] def make_commands(filename): return [ - "$exiv2 -u -v -M'set Exif.Photo.UserComment Test' " + filename, + """$exiv2 -u -v -M"set Exif.Photo.UserComment Test" """ + filename, "$exiv2 -u -pt " + filename ] diff --git a/tests/bugfixes/redmine/test_issue_812.py b/tests/bugfixes/redmine/test_issue_812.py index 97af73ac..066e6141 100644 --- a/tests/bugfixes/redmine/test_issue_812.py +++ b/tests/bugfixes/redmine/test_issue_812.py @@ -30,9 +30,9 @@ class DoNotDestroyHardLinks(metaclass=system_tests.CaseMeta): file_list = "{!s} {!s} {!s}".format(filename, link_1, link_2) commands = [ - "$exiv2 -u -v -M\"set Exif.Photo.UserComment Test Bug $num\" $filename", + """$exiv2 -u -v -M"set Exif.Photo.UserComment Test Bug $num" $filename""", "$exiv2 -PE -g UserComment $file_list", - "$exiv2 -u -v -M\"set Exif.Photo.UserComment Test Bug $num modified\" $filename", + """$exiv2 -u -v -M"set Exif.Photo.UserComment Test Bug $num modified" $filename""", "$exiv2 -PE -g UserComment $file_list" ]