From 3725f440d603b6e43f8292eb575c6663e9621cab Mon Sep 17 00:00:00 2001 From: Hugo Date: Thu, 26 Dec 2019 17:07:54 +0200 Subject: [PATCH 1/2] Implicitly concatenate strings --- winbuild/build_dep.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winbuild/build_dep.py b/winbuild/build_dep.py index 5762de5e5..778570139 100644 --- a/winbuild/build_dep.py +++ b/winbuild/build_dep.py @@ -225,8 +225,8 @@ set DefaultPlatformToolset=v100 if bit == 64: script += ( r"copy /Y /B " - + r'"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib\x64\*.Lib" ' - + r"%%FREETYPE%%\builds\windows\vc2010" + r'"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib\x64\*.Lib" ' + r"%%FREETYPE%%\builds\windows\vc2010" ) properties += r" /p:_IsNativeEnvironment=false" script += ( From 86be41a16725d75115514eae0ec39194417fd768 Mon Sep 17 00:00:00 2001 From: Hugo Date: Thu, 26 Dec 2019 17:08:36 +0200 Subject: [PATCH 2/2] Concatenate string literals on same line --- Tests/test_lib_pack.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/test_lib_pack.py b/Tests/test_lib_pack.py index 91479e343..f9e6e7c4c 100644 --- a/Tests/test_lib_pack.py +++ b/Tests/test_lib_pack.py @@ -377,7 +377,7 @@ class TestLibUnpack(PillowTestCase): self.assert_unpack( "RGBA", "RGBa;16L", - b"\x88\x01\x88\x02\x88\x03\x88\x00" b"\x88\x10\x88\x20\x88\x30\x88\xff", + b"\x88\x01\x88\x02\x88\x03\x88\x00\x88\x10\x88\x20\x88\x30\x88\xff", (0, 0, 0, 0), (16, 32, 48, 255), ) @@ -392,7 +392,7 @@ class TestLibUnpack(PillowTestCase): self.assert_unpack( "RGBA", "RGBa;16B", - b"\x01\x88\x02\x88\x03\x88\x00\x88" b"\x10\x88\x20\x88\x30\x88\xff\x88", + b"\x01\x88\x02\x88\x03\x88\x00\x88\x10\x88\x20\x88\x30\x88\xff\x88", (0, 0, 0, 0), (16, 32, 48, 255), )