From c0e50b47e0a48a5fbf62856a704e7b91fc1c8ce6 Mon Sep 17 00:00:00 2001 From: Eric Lapouyade Date: Sun, 10 Sep 2017 12:41:15 +0200 Subject: [PATCH] Improve image attachment for InlineImage ojects --- CHANGES.rst | 4 ++++ docxtpl/__init__.py | 2 +- tests/test_files/cellbg.docx | Bin 8213 -> 8213 bytes tests/test_files/dynamic_table.docx | Bin 5265 -> 5265 bytes tests/test_files/escape.docx | Bin 8449 -> 8449 bytes tests/test_files/header_footer.docx | Bin 12560 -> 12560 bytes tests/test_files/header_footer_entities.docx | Bin 9879 -> 9879 bytes tests/test_files/header_footer_utf8.docx | Bin 13957 -> 13957 bytes tests/test_files/inline_image.docx | Bin 264572 -> 264572 bytes tests/test_files/nested_for.docx | Bin 11541 -> 11541 bytes tests/test_files/order.docx | Bin 9341 -> 9341 bytes tests/test_files/richtext.docx | Bin 8897 -> 8897 bytes tests/test_files/richtext_and_if.docx | Bin 7584 -> 7584 bytes tests/test_files/subdoc.docx | Bin 56198 -> 56198 bytes 14 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 65e9539..14b4d3a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,7 @@ +0.4.1 (2017-09-10) +------------------ +- Improve image attachment for InlineImage ojects + 0.4.0 (2017-09-09) ------------------ - Add replace_media() method (useful for header/footer images) diff --git a/docxtpl/__init__.py b/docxtpl/__init__.py index 21d3886..9907907 100644 --- a/docxtpl/__init__.py +++ b/docxtpl/__init__.py @@ -5,7 +5,7 @@ Created : 2015-03-12 @author: Eric Lapouyade ''' -__version__ = '0.4.0' +__version__ = '0.4.1' from lxml import etree from docx import Document diff --git a/tests/test_files/cellbg.docx b/tests/test_files/cellbg.docx index fb18e65785ca0750104522e49e3e2340bf0d7a37..44d82f9712ffffdbd34675eaa65fc511722bf1af 100644 GIT binary patch delta 199 zcmbR0Fx7!Kz?+#xgn@y9gP|iuYa?$nBQucRJeiRn!dS|*5W?_eDS|Nev1YM=)o636 zLPUbOzp;Wvd<18MMJB%zdJGo0ApDmJ!Vs%s12HE1%G!bHK3Ov`eO%TWOtZ?_fN2*f f-7M!0=AV^w0Mi2UwqQCy-X2U(l830jDDMIQMKL|E delta 199 zcmbR0Fx7!Kz?+#xgn@y9gCQnKb0cpvBQucRJeiRn!dS|*5W?_eDS|Nev1YM=)o636 zLPUbOzp;Wvd<18MMJB%zdJGo0ApDmJ!Vs%s12HE1%G!bHK3Ov`eO%TWOtZ?_fN2*f f-7M!0=AV^w0Mi2UwqQCy-X2U(l830jDDMIQ%au8$ diff --git a/tests/test_files/dynamic_table.docx b/tests/test_files/dynamic_table.docx index 360513512a2aa3fb130aa8d1e2572916121e4748..d96b96a0e7086bfab61fcd547751a05bb372bb7b 100644 GIT binary patch delta 165 zcmbQJIZ=~0z?+#xgn@y9gP|iuYa?$aBQucRT*=4_VRSORWCM$oa&m)3CO30^2Mg44 zdqI?(;`zn|7CFo>4-t7PkOoofCu9ebncOdA2BuF4*??(wVRtYcC=B6G5Vi&LF9=(K NX4-t7PkOoofCu9ebncOdA2BuF4*??(wVRtYcC=B6G5Vi&LF9=(K NX(UEFu|)}k;!_(kHG>WB09`qhO_u*HV|X7rJNm@u97nY)0^e2!SqKt8!&Ak g525qr-NF2w@(y77kGw6Iwo$ML({&0Eb$b(UEFu|)}k;!_(kHG>WB09`qhO_u*HV|X7rJNm@u97nY)0^e2!SqKt8!&Ak g525qr-NF2w@(y77kGw6Iwo$ML({&0Eb$bq$?(r>g)KW7LC~VGpHi^&ol}fog8( oLDc+)%310|)RyZ*%-N=I1vcZeKEz!n2A*JkgMl-cK4#zr0B4Yag#Z8m delta 396 zcmbP`G$DyMz?+#xgn@y9gCQnKb0hCLMrI(r`5q%bgzq$?(r>g)KW7LC~VGpHi^&ol}fog8( oLDc+)%310|)RyZ*%-N=I1vcZeKEz!n2A*JkgMl-cK4#zr0ALS!aR2}S diff --git a/tests/test_files/header_footer_entities.docx b/tests/test_files/header_footer_entities.docx index 31c949c4bec0a4b743a09e007cd4308a60702993..189831af82eb7660ea01a0ead03c9248094063e0 100644 GIT binary patch delta 282 zcmbR4JKdKzz?+#xgn@y9gP|iuYa{PcMrI(rc`KtdgmIbaC=*y@Hme(0WbzZXQy_uK z8`-~sC021TL6olNe8CEqnZ^GHEHhIe5+d_eFbl#+5}pEK{1nmP1glYz%Y%qal@Ek4 zUMfrlGbT4G*@2Baq+|xBe=FI5X)9%SFx{dIkw2>J3FZr`ID_eM6$daqO9i6-riv|? bFR5w`k%!V#Rjt7MOR5lagw-JOfog65WHVbS delta 282 zcmbR4JKdKzz?+#xgn@y9gCRCab0hCkMrI(rc`KtdgmIbaC=*y@Hme(0WbzZXQy_uK z8`-~sC021TL6olNe8CEqnZ^GHEHhIe5+d_eFbl#+5}pEK{1nmP1glYz%Y%qal@Ek4 zUMfrlGbT4G*@2Baq+|xBe=FI5X)9%SFx{dIkw2>J3FZr`ID_eM6$daqO9i6-riv|? bFR5w`k%!V#Rjt7MOR5lagw-JOfog65UYu2F diff --git a/tests/test_files/header_footer_utf8.docx b/tests/test_files/header_footer_utf8.docx index 3777d57e0e1dd4e540dc120556b01e914b06a4e8..9b67a1e0d5b58693ab3331b29911d85a6b388c6f 100644 GIT binary patch delta 317 zcmZq8ZO!Ek@MdNaVPIh3VCYEE+Q_?ykr_yDKEuclVccVy17Xy%)Ik{kSWh!U)Np1% zM9jIrv4TYm1Pz(Mj1*yS2xF6|BZToy+#JF%kg|d>a%HR_+E>Xcv4C}*SB&BXF(&Ki zZvoSf^}m57?idJwl}>(dXa|-sFfs$vnMT%NdbyDen0^MORgK-j{Cr~vFulpx7EFIK shNw3%fzWv-5PfS+Ao6cb?7`~vO(EiWrdDA7YEy{4Z%jSGda%HR_+E>Xcv4C}*SB&BXF(&Ki zZvoSf^}m57?idJwl}>(dXa|-sFfs$vnMT%NdbyDen0^MORgK-j{Cr~vFulpx7EFIK shNw3%fzWv-5PfS+Ao6cb?7`~vO(EiWrdDA7YEy{4Z%jSGd&J?YUybBnaf%N7Lj4}|$d8SSXBbo&&^^bK4L}V%Z z7Y?xEIRc4bkxfDy6!?I;z29v;@8&ARz~CS>nK4Oh^A)2IA+SPi*Ap^e#<#?e++fD5 z+^szPAT2TR`tn!zGBJGK&op_zk!bVbs`kTGjN1=aF+JG}Qn`JV1@qIbVAiB}%->kS ztnM$&%1j{E^o`$`&w_;-zcX7hgIRljG2i0^OU`3qu>&*iv#^+f84|2ekw{h+Yp}?4 zRu&sD;~I=1%Esaj7KvwLaR4(G!5B|r3=MXuR5pyU4#xNhW0-J2)s%Cv*n-X3&cR|2 OX8h!UT57?`;sOAQDTMw2 delta 400 zcmew}N#M^U0p0*_W)=|!1_lm>*d)!3ybBnaf%N7Lj4}|$d8SSXBbo&&^^bK4L}V%Z z7Y?xEIRc4bkxfDy6!?I;z29v;@8&ARz~CS>nK4Oh^A)2IA+SPi*Ap^e#<#?e++fD5 z+^szPAT2TR`tn!zGBJGK&op_zk!bVbs`kTGjN1=aF+JG}Qn`JV1@qIbVAiB}%->kS ztnM$&%1j{E^o`$`&w_;-zcX7hgIRljG2i0^OU`3qu>&*iv#^+f84|2ekw{h+Yp}?4 zRu&sD;~I=1%Esaj7KvwLaR4(G!5B|r3=MXuR5pyU4#xNhW0-J2)s%Cv*n-X3&cR|2 OX8h!UT57?`;sO9^m3{;O diff --git a/tests/test_files/nested_for.docx b/tests/test_files/nested_for.docx index 039b4b6adabfcf543af4d87110aea078211c6513..6f997a20e636bc1ce0e585cbb98c24137e364a83 100644 GIT binary patch delta 316 zcmbOlH8qMiz?+#xgn@y9gP}7;Ya{O-MrI(r`3xgJgmI5)CWKMNk^x~nWld%QtMTT_ z0*g%E!TlI4Fpp;rM2Rh*3xv_a?*w6-6j%XalnAYaFcd_-v4V9;N<}e)8D+9Q93aNz zqpGXHbg|kuutbi!09eoDdJQ|U!~qR6F#S`*8cdsO+JNaYD7{tF9nAl)X%D6ywQRw3 tqZUN{eklD{3!=|P8zNt$?EqG{UmGI+PumL2x7LB!TchI%=AY2<1pw>GX2$>k delta 316 zcmbOlH8qMiz?+#xgn@y9gCRCab0hB_MrI(r`3xgJgmI5)CWKMNk^x~nWld%QtMTT_ z0*g%E!TlI4Fpp;rM2Rh*3xv_a?*w6-6j%XalnAYaFcd_-v4V9;N<}e)8D+9Q93aNz zqpGXHbg|kuutbi!09eoDdJQ|U!~qR6F#S`*8cdsO+JNaYD7{tF9nAl)X%D6ywQRw3 tqZUN{eklD{3!=|P8zNt$?EqG{UmGI+PumL2x7LB!TchI%=AY2<1po-TU@HIs diff --git a/tests/test_files/order.docx b/tests/test_files/order.docx index 57b4ac3e5091992fd494c4bdfa0a895f88571e31..82e9ddf1388d3667fe5ed2bd91b18e4b8e46142a 100644 GIT binary patch delta 199 zcmezC@z;Ylz?+#xgn@y9gP}7;Ya?$nBQucRJeiRn!dS}0$^;f!%TfRlQDB?K0v6fH zr3w*w$o-8KEOJY5HdthGh45prK%B@gi0)|da4wL@&*1&d7nB>WgGa6?3k8O&gn_{a`oO#Ufv2d1qQ%)oT9f;E`ls9*!8 hKR{`HMRzd2QqciS?@_b`(|;80!L*$cM18H23jjWVJ{$l5 delta 199 zcmX@;deD_Oz?+#xgn@y9gCRCab0cpvBQucRJeiRn!dS}0#sn5w$C3{bQDA$=0u~YE zR)vUI@_b_jix>&*1&d7nB>WgGa6?3k8O&gn_{a`oO#Ufv2d1qQ%)oT9f;E`ls9*!8 hKR{`HMRzd2QqciS?@_b`(|;80!L*$cM18H23joCAIuZZ? diff --git a/tests/test_files/richtext_and_if.docx b/tests/test_files/richtext_and_if.docx index 27516873f4e57c2e8c015bf0dcb4f5beb3dc3adb..813560ab75e73f6fb4e0a2e1fddca9cfbd7a639d 100644 GIT binary patch delta 199 zcmZ2ry}+6`z?+#xgn@y9gP}7;Ya?$nBQucRJeiRn!dS{Q8N#q;$%HVLvrb_GtFhxy zg@~kaeq#lT#PiPqi%k9}@E9!cMDPPd?RAlVU?r1pNZEm8CQC}2f$1P=YcM@Q+6GLY ghthm9?qGg|j02dSEn^F&Z_C(&X<1o_`WRUk0IvW(ZU6uP delta 199 zcmZ2ry}+6`z?+#xgn@y9gCRCab0cpvBQucRJeiRn!dS{Q8N#q;$%HVLvrb_GtFhxy zg@~kaeq#lT#PiPqi%k9}@E9!cMDPPd?RAlVU?r1pNZEm8CQC}2f$1P=YcM@Q+6GLY ghthm9?qGg|j02dSEn^F&Z_C(&X<1o_`WRUk05x+uWB>pF diff --git a/tests/test_files/subdoc.docx b/tests/test_files/subdoc.docx index 335b804ed2ddfd796cdaea1514763381dc5ca9b9..08c9ab5cd6cce4b4c715fdcb5ebbf475ac96a733 100644 GIT binary patch delta 218 zcmZqM&fK=0nK!_jnMH(wfq{deGev77Zx16gkls9pksrcX$Fvy22w^FOFwU@svxC*B z@tQ+K68N5O1&eqb`Nj%nIG)-ImYU3X<}p~{`59woFhll2GzW+=x%!43nBH^43`~E$ tVGX8@Z`y$AA}GD_raPGb`=$e!wz~zP8*kZy`3G;=gK6g55PeR!T>yaxPyYY_ delta 218 zcmZqM&fK=0nK!_jnMH(wfq{b|Hc4|MZx16gkls9pksrcX$Fvy22w^FOFwU@svxC*B z@tQ+K68N5O1&eqb`Nj%nIG)-ImYU3X<}p~{`59woFhll2GzW+=x%!43nBH^43`~E$ tVGX8@Z`y$AA}GD_raPGb`=$e!wz~zP8*kZy`3G;=gK6g55PeR!T>!wuOP2ru