From 003ec30452d74f1c5667af2010f003db426049c7 Mon Sep 17 00:00:00 2001 From: "Dave Shepard (CDH)" Date: Wed, 30 Mar 2016 12:33:08 -0700 Subject: [PATCH 1/3] Ignore images when writing plaintext files --- pyth/plugins/plaintext/.writer.py.swp | Bin 0 -> 12288 bytes pyth/plugins/plaintext/writer.py | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 pyth/plugins/plaintext/.writer.py.swp diff --git a/pyth/plugins/plaintext/.writer.py.swp b/pyth/plugins/plaintext/.writer.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..0f3ac17b357c754b4fce41cb2b19add067de45e3 GIT binary patch literal 12288 zcmeI2O^X~w7{_Z3NM1}7#~ zY?kQ7n~301K|T2e1oe~;;KAs{mqX4T6oU6f{8x2V_4Le!h__%h{H9;(d8(f0Ur*OC zOuf6bx%Mi3CVHCSc#M!=8he|;-=81&>tRBA@r0?z_dEWr-FwQgbs_DJM@-0~wVtP2 ztc#21lR=tuIULcnPdDOZ5=)+nR<bVbL&rD0k42pz$@St@CtYZyaHYUuYgy;E8rFI3Os-c#63d(z<>R%g9sk~ z|J&dHdyf)w2mA(p1-HOw;8U;*Zh*^R6TAQpgS*EFxea~*pMY&J0b}qYI1P@0yGIH6 z8GH>s0`Gt~zy`PkRsjLG9wFolunTU0iy#Dtz(Mfm5kh_fKZ4ufOYkA+fwSOA@cUtm z1HJ+`!OP$&umJ8HBIG;pE%*j}3?|?l*n=M5gAc$JunL|7&w@5M50qw4faAa)UIDLw zSHLUa6?niEp!**>tLdiNgMuafh>IRJ_R+;QT_)3(>UtQ9Uc&M)i}QGp$Jww+vz+z$ z^~SwSX`AX^oyP@UWU=fHuev8ur_)X1qUdzqp6jLT9i0THXh3V^g3=e2f z^XR8J4Yv@J4X;7DpiE$^VjfEtBCmWW>ZaIzC}d;B`D#DjgeBT%d=g&B%7s>k^PX1i zv{kLg`c%1wsf+Da zBpl<_2Aj9pZyM*VR6z7pIiqErRQ)Ou)ksQmBXLw@372JzmD(y>7mcw*vg06#wo)!a zJ3kQ<-L%KTK<|2+$a;MADvP;Oj|8PRv<1JY|ZSBI1rv}bm> zMr)&Zz^dp~n#x+G>FUgmSeaFMT`j9x6@;@lRpIVkX#_#7FmfixxhVB6r`-iUJvjwq z*TSVnRZ!E7G9Qbss{Tri>1OS_c&160tM-%hA{){n!|R>1Q95C?&qbV6@l(9RT`mUI zh)T-oZtqo{b1O(Ss_Mct|HoCszQ<12nRi(S=qA?ISvhHHeg>(YnA#NFBq}a@IOlb{ z#H`G$Z^W9avon7MOM$Uet3uOR>5yE!c5y`hyLA(@D!1ukwJK|0!M62V*QVyG?pIa~ z`rEI3Y3F{lnT@nS23+lGeN802cA2g*z literal 0 HcmV?d00001 diff --git a/pyth/plugins/plaintext/writer.py b/pyth/plugins/plaintext/writer.py index 9dd8bfd..e766981 100644 --- a/pyth/plugins/plaintext/writer.py +++ b/pyth/plugins/plaintext/writer.py @@ -46,6 +46,8 @@ def go(self): def paragraph(self, paragraph, prefix=""): content = [] for text in paragraph.content: + if text.__class__ is document.Image: + continue content.append(u"".join(text.content)) content = u"".join(content).encode("utf-8") From d922e8ba792fe208196ead79c1096d47ed597dd6 Mon Sep 17 00:00:00 2001 From: "Dave Shepard (CDH)" Date: Wed, 30 Mar 2016 12:33:08 -0700 Subject: [PATCH 2/3] Ignore images when writing plaintext files --- pyth/plugins/plaintext/.writer.py.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 pyth/plugins/plaintext/.writer.py.swp diff --git a/pyth/plugins/plaintext/.writer.py.swp b/pyth/plugins/plaintext/.writer.py.swp deleted file mode 100644 index 0f3ac17b357c754b4fce41cb2b19add067de45e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2O^X~w7{_Z3NM1}7#~ zY?kQ7n~301K|T2e1oe~;;KAs{mqX4T6oU6f{8x2V_4Le!h__%h{H9;(d8(f0Ur*OC zOuf6bx%Mi3CVHCSc#M!=8he|;-=81&>tRBA@r0?z_dEWr-FwQgbs_DJM@-0~wVtP2 ztc#21lR=tuIULcnPdDOZ5=)+nR<bVbL&rD0k42pz$@St@CtYZyaHYUuYgy;E8rFI3Os-c#63d(z<>R%g9sk~ z|J&dHdyf)w2mA(p1-HOw;8U;*Zh*^R6TAQpgS*EFxea~*pMY&J0b}qYI1P@0yGIH6 z8GH>s0`Gt~zy`PkRsjLG9wFolunTU0iy#Dtz(Mfm5kh_fKZ4ufOYkA+fwSOA@cUtm z1HJ+`!OP$&umJ8HBIG;pE%*j}3?|?l*n=M5gAc$JunL|7&w@5M50qw4faAa)UIDLw zSHLUa6?niEp!**>tLdiNgMuafh>IRJ_R+;QT_)3(>UtQ9Uc&M)i}QGp$Jww+vz+z$ z^~SwSX`AX^oyP@UWU=fHuev8ur_)X1qUdzqp6jLT9i0THXh3V^g3=e2f z^XR8J4Yv@J4X;7DpiE$^VjfEtBCmWW>ZaIzC}d;B`D#DjgeBT%d=g&B%7s>k^PX1i zv{kLg`c%1wsf+Da zBpl<_2Aj9pZyM*VR6z7pIiqErRQ)Ou)ksQmBXLw@372JzmD(y>7mcw*vg06#wo)!a zJ3kQ<-L%KTK<|2+$a;MADvP;Oj|8PRv<1JY|ZSBI1rv}bm> zMr)&Zz^dp~n#x+G>FUgmSeaFMT`j9x6@;@lRpIVkX#_#7FmfixxhVB6r`-iUJvjwq z*TSVnRZ!E7G9Qbss{Tri>1OS_c&160tM-%hA{){n!|R>1Q95C?&qbV6@l(9RT`mUI zh)T-oZtqo{b1O(Ss_Mct|HoCszQ<12nRi(S=qA?ISvhHHeg>(YnA#NFBq}a@IOlb{ z#H`G$Z^W9avon7MOM$Uet3uOR>5yE!c5y`hyLA(@D!1ukwJK|0!M62V*QVyG?pIa~ z`rEI3Y3F{lnT@nS23+lGeN802cA2g*z From 50f23c67c7707dfe60c5950cf16e7c676a507d20 Mon Sep 17 00:00:00 2001 From: "Dave Shepard (CDH)" Date: Wed, 30 Mar 2016 12:40:18 -0700 Subject: [PATCH 3/3] Handle escaped single quotes --- pyth/plugins/rtf15/reader.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pyth/plugins/rtf15/reader.py b/pyth/plugins/rtf15/reader.py index 7a74162..72b41d7 100644 --- a/pyth/plugins/rtf15/reader.py +++ b/pyth/plugins/rtf15/reader.py @@ -170,9 +170,19 @@ def getControl(self): first = False if next == "'": - # ANSI escape, takes two hex digits - chars.extend("ansi_escape") - digits.extend(self.source.read(2)) + possible_digits = self.source.read(2) + try: + # Test for ANSI escape + true_digits = [ + int(possible_digits[0], 16), + int(possible_digits[1], 16) + ] + # ANSI escape, takes two hex digits + chars.extend("ansi_escape") + digits.extend(true_digits) + except ValueError: + # It's just an escaped quote mark, so reset the file header + self.source.seek(-2, 1) break if next == ' ':