[Python-modules-commits] r9924 - in packages/python-whoosh/trunk/debian/patches (2 files)

[bzed at users.alioth.debian.org]

    Date: Friday, October 2, 2009 @ 15:27:46
  Author: bzed
Revision: 9924

Updating patches.

Modified:
  packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff
  packages/python-whoosh/trunk/debian/patches/series

Modified: packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff
===================================================================
--- packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff	2009-10-02 15:25:19 UTC (rev 9923)
+++ packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff	2009-10-02 15:27:46 UTC (rev 9924)
@@ -4,19 +4,29 @@
 ## so we remove the unnecessary copy here, and fix references to it
 ## that we break.
 
-Index: python-whoosh-0.1.19/src/whoosh/qparser.py
-===================================================================
---- python-whoosh-0.1.19.orig/src/whoosh/qparser.py	2009-04-30 04:08:28.000000000 +0100
-+++ python-whoosh-0.1.19/src/whoosh/qparser.py	2009-05-07 16:56:25.000000000 +0100
-@@ -1,8 +1,8 @@
+--- a/src/whoosh/qparser.py
++++ b/src/whoosh/qparser.py
+@@ -56,17 +56,16 @@ http://pyparsing.wikispaces.com/space/sh
+ 
  import re
  
--from whoosh.support.pyparsing import alphanums, printables, \
--CharsNotIn, Literal, Group, Combine, Suppress, Regex, OneOrMore, Forward, Word, Keyword, \
--Empty, StringEnd, ParserElement
-+from pyparsing import alphanums, printables, CharsNotIn, Literal, Group, \
-+        Combine, Suppress, Regex, OneOrMore, Forward, Word, Keyword, Empty, \
-+        StringEnd, ParserElement
- from whoosh import analysis, query
+-from whoosh.support.pyparsing import printables, alphanums
+-from whoosh.support.pyparsing import ZeroOrMore, OneOrMore
+-from whoosh.support.pyparsing import Group, Combine, Suppress, Optional, FollowedBy
+-from whoosh.support.pyparsing import Literal, CharsNotIn, Word, Keyword
+-from whoosh.support.pyparsing import Empty, White, Forward, QuotedString
+-from whoosh.support.pyparsing import StringEnd, ParserElement
++from pyparsing import printables, alphanums
++from pyparsing import ZeroOrMore, OneOrMore
++from pyparsing import Group, Combine, Suppress, Optional, FollowedBy
++from pyparsing import Literal, CharsNotIn, Word, Keyword
++from pyparsing import Empty, White, Forward, QuotedString
++from pyparsing import StringEnd, ParserElement
  
- """
+ from whoosh.analysis import NgramAnalyzer
+ from whoosh.query import *
+ 
+-
+ def _make_default_parser():
+     escapechar = "\\"
+     

Modified: packages/python-whoosh/trunk/debian/patches/series
===================================================================
--- packages/python-whoosh/trunk/debian/patches/series	2009-10-02 15:25:19 UTC (rev 9923)
+++ packages/python-whoosh/trunk/debian/patches/series	2009-10-02 15:27:46 UTC (rev 9924)
@@ -1,2 +1 @@
 01-remove-pyparsing.diff
-02-python2.4-fixes.diff