[Python-modules-commits] r14969 - in packages/pdfminer/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Thursday, December 2, 2010 @ 16:44:28
  Author: jwilk
Revision: 14969

Backport an upstream patch to fix test failures.

Added:
  packages/pdfminer/trunk/debian/patches/fix-test-psparser.diff
Modified:
  packages/pdfminer/trunk/debian/changelog
  packages/pdfminer/trunk/debian/patches/series

Modified: packages/pdfminer/trunk/debian/changelog
===================================================================
--- packages/pdfminer/trunk/debian/changelog	2010-12-02 16:08:08 UTC (rev 14968)
+++ packages/pdfminer/trunk/debian/changelog	2010-12-02 16:44:28 UTC (rev 14969)
@@ -2,8 +2,9 @@
 
   * New upstream release.
   * Fix a typo in the pdf2txt manual page.
+  * Backport an upstream patch to fix test failures. [fix-test-psparser.diff]
 
- -- Jakub Wilk <jwilk at debian.org>  Thu, 02 Dec 2010 16:58:42 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Thu, 02 Dec 2010 17:43:35 +0100
 
 pdfminer (20100829+dfsg-1) experimental; urgency=low
 

Added: packages/pdfminer/trunk/debian/patches/fix-test-psparser.diff
===================================================================
--- packages/pdfminer/trunk/debian/patches/fix-test-psparser.diff	                        (rev 0)
+++ packages/pdfminer/trunk/debian/patches/fix-test-psparser.diff	2010-12-02 16:44:28 UTC (rev 14969)
@@ -0,0 +1,63 @@
+Description: Fix test failures in pdfminer.psparser.
+Origin: backport, http://code.google.com/p/pdfminerr/source/detail?r=265
+Last-Update: 2010-12-02
+
+--- a/pdfminer/psparser.py
++++ b/pdfminer/psparser.py
+@@ -411,12 +411,12 @@
+ 
+     def _parse_wopen(self, s, i):
+         c = s[i]
+-        if c.isspace() or HEX.match(c):
+-            return (self._parse_hexstring, i)
+         if c == '<':
+             self._add_token(KEYWORD_DICT_BEGIN)
+             i += 1
+-        return (self._parse_main, i)
++            return (self._parse_main, i)
++        else:
++            return (self._parse_hexstring, i)
+ 
+     def _parse_wclose(self, s, i):
+         c = s[i]
+@@ -583,7 +583,7 @@
+ baa)
+ (foo\
+ baa)
+-<20> < 40 4020 >
++<> <20> < 40 4020 >
+ <abcd00
+ 12345>
+ func/a/b{(c)do*}def
+@@ -598,12 +598,12 @@
+       (65, 1.234), (71, 'abc'), (77, ''), (80, 'abc ( def ) ghi'),
+       (98, 'def \x00 4ghi'), (118, 'bach\\slask'), (132, 'foo\nbaa'),
+       (143, 'this % is not a comment.'), (170, 'foo\nbaa'), (180, 'foobaa'),
+-      (191, ' '), (196, '@@ '), (208, '\xab\xcd\x00\x124\x05'),
+-      (223, KWD('func')), (227, LIT('a')), (229, LIT('b')),
+-      (231, KWD('{')), (232, 'c'), (235, KWD('do*')), (238, KWD('}')),
+-      (239, KWD('def')), (243, KWD('[')), (245, 1), (247, 'z'), (251, KWD('!')),
+-      (253, KWD(']')), (255, KWD('<<')), (258, LIT('foo')), (263, 'bar'),
+-      (269, KWD('>>'))
++      (191, ''), (194, ' '), (199, '@@ '), (211, '\xab\xcd\x00\x124\x05'),
++      (226, KWD('func')), (230, LIT('a')), (232, LIT('b')),
++      (234, KWD('{')), (235, 'c'), (238, KWD('do*')), (241, KWD('}')),
++      (242, KWD('def')), (246, KWD('[')), (248, 1), (250, 'z'), (254, KWD('!')),
++      (256, KWD(']')), (258, KWD('<<')), (261, LIT('foo')), (266, 'bar'),
++      (272, KWD('>>'))
+       ]
+ 
+     OBJS = [
+@@ -612,9 +612,9 @@
+       (65, 1.234), (71, 'abc'), (77, ''), (80, 'abc ( def ) ghi'),
+       (98, 'def \x00 4ghi'), (118, 'bach\\slask'), (132, 'foo\nbaa'),
+       (143, 'this % is not a comment.'), (170, 'foo\nbaa'), (180, 'foobaa'),
+-      (191, ' '), (196, '@@ '), (208, '\xab\xcd\x00\x124\x05'),
+-      (227, LIT('a')), (229, LIT('b')), (232, 'c'), (243, [1, 'z']),
+-      (255, {'foo': 'bar'}),
++      (191, ''), (194, ' '), (199, '@@ '), (211, '\xab\xcd\x00\x124\x05'),
++      (230, LIT('a')), (232, LIT('b')), (234, ['c']), (246, [1, 'z']),
++      (258, {'foo': 'bar'}),
+       ]
+ 
+     def get_tokens(self, s):

Modified: packages/pdfminer/trunk/debian/patches/series
===================================================================
--- packages/pdfminer/trunk/debian/patches/series	2010-12-02 16:08:08 UTC (rev 14968)
+++ packages/pdfminer/trunk/debian/patches/series	2010-12-02 16:44:28 UTC (rev 14969)
@@ -1 +1,2 @@
 pickle-protocol-2.diff
+fix-test-psparser.diff