[Python-modules-commits] r8383 - in packages/python-whoosh/trunk/debian (5 files)
odd_bloke-guest at users.alioth.debian.org
odd_bloke-guest at users.alioth.debian.org
Thu May 7 16:14:55 UTC 2009
Date: Thursday, May 7, 2009 @ 16:14:54
Author: odd_bloke-guest
Revision: 8383
Add debian/patches/01-remove-pyparsing.diff to remove the upstream copy of the python-pyparsing library.
Added:
packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff
packages/python-whoosh/trunk/debian/patches/02-python2.4-fixes.diff
(from rev 8339, packages/python-whoosh/trunk/debian/patches/01-python2.4-fixes.diff)
Modified:
packages/python-whoosh/trunk/debian/changelog
packages/python-whoosh/trunk/debian/patches/series
Deleted:
packages/python-whoosh/trunk/debian/patches/01-python2.4-fixes.diff
Modified: packages/python-whoosh/trunk/debian/changelog
===================================================================
--- packages/python-whoosh/trunk/debian/changelog 2009-05-07 11:13:14 UTC (rev 8382)
+++ packages/python-whoosh/trunk/debian/changelog 2009-05-07 16:14:54 UTC (rev 8383)
@@ -1,3 +1,10 @@
+python-whoosh (0.1.19-2) unstable; urgency=low
+
+ * Add debian/patches/01-remove-pyparsing.diff to remove the upstream copy of
+ the python-pyparsing library.
+
+ -- Daniel Watkins <daniel at daniel-watkins.co.uk> Thu, 07 May 2009 16:44:18 +0100
+
python-whoosh (0.1.19-1) unstable; urgency=low
* Initial release. (Closes: #522934)
Deleted: packages/python-whoosh/trunk/debian/patches/01-python2.4-fixes.diff
===================================================================
--- packages/python-whoosh/trunk/debian/patches/01-python2.4-fixes.diff 2009-05-07 11:13:14 UTC (rev 8382)
+++ packages/python-whoosh/trunk/debian/patches/01-python2.4-fixes.diff 2009-05-07 16:14:54 UTC (rev 8383)
@@ -1,267 +0,0 @@
-## 01-python2.4-fixes.diff by Daniel Watkins <daniel at daniel-watkins.co.uk>
-##
-## Fix uses of Python 2.5 idioms so this package will work with Python 2.4.
-
-Index: Whoosh-0.1.13/src/whoosh/query.py
-===================================================================
---- Whoosh-0.1.13.orig/src/whoosh/query.py 2009-04-14 11:44:30.000000000 +0100
-+++ Whoosh-0.1.13/src/whoosh/query.py 2009-04-14 12:41:36.000000000 +0100
-@@ -24,10 +24,10 @@
- from __future__ import division
- from array import array
- from bisect import bisect_left, bisect_right
--from collections import defaultdict
- import fnmatch, re
-
- from whoosh.support.bitvector import BitVector
-+from whoosh.support.defaultdict import defaultdict
- from whoosh.lang.morph_en import variations
-
- # Utility functions
-Index: Whoosh-0.1.13/src/whoosh/support/bitvector.py
-===================================================================
---- Whoosh-0.1.13.orig/src/whoosh/support/bitvector.py 2009-04-14 11:50:01.000000000 +0100
-+++ Whoosh-0.1.13/src/whoosh/support/bitvector.py 2009-04-14 11:51:54.000000000 +0100
-@@ -53,8 +53,13 @@
-
- def __str__(self):
- get = self.__getitem__
-- return "".join("1" if get(i) else "0"
-- for i in xrange(0, self.size))
-+ x = []
-+ for i in xrange(0, self.size):
-+ if get(i):
-+ x.append("1")
-+ else:
-+ x.append("0")
-+ return "".join(x)
-
- def __getitem__(self, index):
- return self.bits[index >> 3] & (1 << (index & 7)) != 0
-@@ -127,4 +132,4 @@
-
-
-
--
-\ No newline at end of file
-+
-Index: Whoosh-0.1.13/src/whoosh/lang/morph_en.py
-===================================================================
---- Whoosh-0.1.13.orig/src/whoosh/lang/morph_en.py 2009-04-14 11:52:20.000000000 +0100
-+++ Whoosh-0.1.13/src/whoosh/lang/morph_en.py 2009-04-14 11:53:12.000000000 +0100
-@@ -900,7 +900,10 @@
- # positional groups are None)
- groups = [g for g in match.groups() if g is not None]
- ending = groups[-1]
-- root = word[:0-len(ending)] if ending else word
-+ if ending:
-+ root = word[:0-len(ending)]
-+ else:
-+ root = word
-
- out = set((word, ))
- results = rules[i * _partition_size + num][1]
-Index: Whoosh-0.1.13/src/whoosh/classify.py
-===================================================================
---- Whoosh-0.1.13.orig/src/whoosh/classify.py 2009-04-14 12:03:07.000000000 +0100
-+++ Whoosh-0.1.13/src/whoosh/classify.py 2009-04-14 12:42:34.000000000 +0100
-@@ -17,10 +17,11 @@
- """Classes and functions for classifying and extracting information from documents.
- """
-
--from __future__ import division, with_statement
--from collections import defaultdict
-+from __future__ import division
- from math import log
-
-+from whoosh.support.defaultdict import defaultdict
-+
-
- # Expansion models
-
-Index: Whoosh-0.1.13/src/whoosh/fields.py
-===================================================================
---- Whoosh-0.1.13.orig/src/whoosh/fields.py 2009-04-14 12:16:13.000000000 +0100
-+++ Whoosh-0.1.13/src/whoosh/fields.py 2009-04-14 12:47:02.000000000 +0100
-@@ -20,9 +20,8 @@
-
- """
-
--from collections import defaultdict
--
- from whoosh.analysis import unstopped, IDAnalyzer, KeywordAnalyzer, StandardAnalyzer, NgramAnalyzer
-+from whoosh.support.defaultdict import defaultdict
-
- # Exceptions
-
-@@ -31,6 +30,11 @@
- class UnknownFieldError(Exception):
- pass
-
-+try:
-+ any
-+except:
-+ from whoosh.support.any import any
-+
- # Field Types
-
- class FieldType(object):
-Index: Whoosh-0.1.13/src/whoosh/support/defaultdict.py
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ Whoosh-0.1.13/src/whoosh/support/defaultdict.py 2009-04-14 12:26:56.000000000 +0100
-@@ -0,0 +1,37 @@
-+try:
-+ from collections import defaultdict
-+except:
-+ class defaultdict(dict):
-+ def __init__(self, default_factory=None, *a, **kw):
-+ if (default_factory is not None and
-+ not hasattr(default_factory, '__call__')):
-+ raise TypeError('first argument must be callable')
-+ dict.__init__(self, *a, **kw)
-+ self.default_factory = default_factory
-+ def __getitem__(self, key):
-+ try:
-+ return dict.__getitem__(self, key)
-+ except KeyError:
-+ return self.__missing__(key)
-+ def __missing__(self, key):
-+ if self.default_factory is None:
-+ raise KeyError(key)
-+ self[key] = value = self.default_factory()
-+ return value
-+ def __reduce__(self):
-+ if self.default_factory is None:
-+ args = tuple()
-+ else:
-+ args = self.default_factory,
-+ return type(self), args, None, None, self.items()
-+ def copy(self):
-+ return self.__copy__()
-+ def __copy__(self):
-+ return type(self)(self.default_factory, self)
-+ def __deepcopy__(self, memo):
-+ import copy
-+ return type(self)(self.default_factory,
-+ copy.deepcopy(self.items()))
-+ def __repr__(self):
-+ return 'defaultdict(%s, %s)' % (self.default_factory,
-+ dict.__repr__(self))
-Index: Whoosh-0.1.13/src/whoosh/writing.py
-===================================================================
---- Whoosh-0.1.13.orig/src/whoosh/writing.py 2009-04-14 12:28:04.000000000 +0100
-+++ Whoosh-0.1.13/src/whoosh/writing.py 2009-04-14 12:29:16.000000000 +0100
-@@ -19,11 +19,11 @@
- """
-
- from array import array
--from collections import defaultdict
- from tempfile import TemporaryFile
-
- from whoosh import index, postpool, reading, structfile, tables
- from whoosh.fields import UnknownFieldError
-+from whoosh.support.defaultdict import defaultdict
- from whoosh.util import fib
-
- # Exceptions
-Index: Whoosh-0.1.13/src/whoosh/util.py
-===================================================================
---- Whoosh-0.1.13.orig/src/whoosh/util.py 2009-04-14 12:33:53.000000000 +0100
-+++ Whoosh-0.1.13/src/whoosh/util.py 2009-04-14 12:34:09.000000000 +0100
-@@ -18,7 +18,6 @@
- Miscellaneous utility functions and classes.
- """
-
--from functools import wraps
- from heapq import heappush, heapreplace
-
- from whoosh.support.bitvector import BitVector
-@@ -171,7 +170,6 @@
- have 'is_closed' and '_sync_lock' attributes.
- """
-
-- @wraps(func)
- def wrapper(self, *args, **kwargs):
- if self.is_closed:
- raise Exception("This object has been closed")
-Index: Whoosh-0.1.13/src/whoosh/spelling.py
-===================================================================
---- Whoosh-0.1.13.orig/src/whoosh/spelling.py 2009-04-14 12:41:48.000000000 +0100
-+++ Whoosh-0.1.13/src/whoosh/spelling.py 2009-04-14 12:42:04.000000000 +0100
-@@ -18,9 +18,8 @@
- as a backend for a spell-checking engine.
- """
-
--from collections import defaultdict
--
- from whoosh import analysis, fields, query, searching, writing
-+from whoosh.support.defaultdict import defaultdict
- from whoosh.support.levenshtein import relative, distance
-
- class SpellChecker(object):
-Index: Whoosh-0.1.13/src/whoosh/highlight.py
-===================================================================
---- Whoosh-0.1.13.orig/src/whoosh/highlight.py 2009-04-14 12:47:54.000000000 +0100
-+++ Whoosh-0.1.13/src/whoosh/highlight.py 2009-04-14 12:48:15.000000000 +0100
-@@ -17,6 +17,11 @@
- from __future__ import division
- from heapq import nlargest
-
-+try:
-+ any
-+except:
-+ from whoosh.support.any import any
-+
-
- # Fragment object
-
-Index: Whoosh-0.1.13/src/whoosh/index.py
-===================================================================
---- Whoosh-0.1.13.orig/src/whoosh/index.py 2009-04-14 12:47:31.000000000 +0100
-+++ Whoosh-0.1.13/src/whoosh/index.py 2009-04-14 12:47:49.000000000 +0100
-@@ -26,6 +26,11 @@
-
- from whoosh import fields, store
-
-+try:
-+ any
-+except:
-+ from whoosh.support.any import any
-+
-
- _DEF_INDEX_NAME = "MAIN"
- _EXTENSIONS = "dci|dcz|tiz|fvz"
-Index: Whoosh-0.1.13/src/whoosh/reading.py
-===================================================================
---- Whoosh-0.1.13.orig/src/whoosh/reading.py 2009-04-14 12:47:09.000000000 +0100
-+++ Whoosh-0.1.13/src/whoosh/reading.py 2009-04-14 12:47:25.000000000 +0100
-@@ -25,6 +25,11 @@
- from whoosh.util import ClosableMixin, protected
- from whoosh.fields import FieldConfigurationError, UnknownFieldError
-
-+try:
-+ any
-+except:
-+ from whoosh.support.any import any
-+
- # Exceptions
-
- class TermNotFound(Exception):
-@@ -642,4 +647,4 @@
-
-
-
--
-\ No newline at end of file
-+
-Index: Whoosh-0.1.13/src/whoosh/support/any.py
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ Whoosh-0.1.13/src/whoosh/support/any.py 2009-04-14 12:46:45.000000000 +0100
-@@ -0,0 +1,5 @@
-+def any(iterable):
-+ for element in iterable:
-+ if element:
-+ return True
-+ return False
Added: packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff
===================================================================
--- packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff (rev 0)
+++ packages/python-whoosh/trunk/debian/patches/01-remove-pyparsing.diff 2009-05-07 16:14:54 UTC (rev 8383)
@@ -0,0 +1,21 @@
+## 01-remove-pyparsing.diff by Daniel Watkins <daniel at daniel-watkins.co.uk>
+##
+## Debian ships the pyparsing module in the python-pyparsing package,
+## so we remove the unnecessary copy here, and fix references to it
+## that we break.
+
+Index: Whoosh-0.1.13/src/whoosh/qparser.py
+===================================================================
+--- Whoosh-0.1.13.orig/src/whoosh/qparser.py 2009-04-07 14:54:31.000000000 +0100
++++ Whoosh-0.1.13/src/whoosh/qparser.py 2009-04-07 14:55:03.000000000 +0100
+@@ -1,8 +1,7 @@
+ import re
+
+-from whoosh.support.pyparsing import alphanums, \
+-CharsNotIn, Literal, Group, Combine, Suppress, Regex, OneOrMore, Forward, Word, Keyword, \
+-Empty, StringEnd, ParserElement
++from pyparsing import alphanums, CharsNotIn, Literal, Group, Combine, Suppress,\
++ Regex, OneOrMore, Forward, Word, Keyword, Empty, StringEnd, ParserElement
+ from whoosh import analysis, query
+
+ """
Copied: packages/python-whoosh/trunk/debian/patches/02-python2.4-fixes.diff (from rev 8339, packages/python-whoosh/trunk/debian/patches/01-python2.4-fixes.diff)
===================================================================
--- packages/python-whoosh/trunk/debian/patches/02-python2.4-fixes.diff (rev 0)
+++ packages/python-whoosh/trunk/debian/patches/02-python2.4-fixes.diff 2009-05-07 16:14:54 UTC (rev 8383)
@@ -0,0 +1,267 @@
+## 01-python2.4-fixes.diff by Daniel Watkins <daniel at daniel-watkins.co.uk>
+##
+## Fix uses of Python 2.5 idioms so this package will work with Python 2.4.
+
+Index: Whoosh-0.1.13/src/whoosh/query.py
+===================================================================
+--- Whoosh-0.1.13.orig/src/whoosh/query.py 2009-04-14 11:44:30.000000000 +0100
++++ Whoosh-0.1.13/src/whoosh/query.py 2009-04-14 12:41:36.000000000 +0100
+@@ -24,10 +24,10 @@
+ from __future__ import division
+ from array import array
+ from bisect import bisect_left, bisect_right
+-from collections import defaultdict
+ import fnmatch, re
+
+ from whoosh.support.bitvector import BitVector
++from whoosh.support.defaultdict import defaultdict
+ from whoosh.lang.morph_en import variations
+
+ # Utility functions
+Index: Whoosh-0.1.13/src/whoosh/support/bitvector.py
+===================================================================
+--- Whoosh-0.1.13.orig/src/whoosh/support/bitvector.py 2009-04-14 11:50:01.000000000 +0100
++++ Whoosh-0.1.13/src/whoosh/support/bitvector.py 2009-04-14 11:51:54.000000000 +0100
+@@ -53,8 +53,13 @@
+
+ def __str__(self):
+ get = self.__getitem__
+- return "".join("1" if get(i) else "0"
+- for i in xrange(0, self.size))
++ x = []
++ for i in xrange(0, self.size):
++ if get(i):
++ x.append("1")
++ else:
++ x.append("0")
++ return "".join(x)
+
+ def __getitem__(self, index):
+ return self.bits[index >> 3] & (1 << (index & 7)) != 0
+@@ -127,4 +132,4 @@
+
+
+
+-
+\ No newline at end of file
++
+Index: Whoosh-0.1.13/src/whoosh/lang/morph_en.py
+===================================================================
+--- Whoosh-0.1.13.orig/src/whoosh/lang/morph_en.py 2009-04-14 11:52:20.000000000 +0100
++++ Whoosh-0.1.13/src/whoosh/lang/morph_en.py 2009-04-14 11:53:12.000000000 +0100
+@@ -900,7 +900,10 @@
+ # positional groups are None)
+ groups = [g for g in match.groups() if g is not None]
+ ending = groups[-1]
+- root = word[:0-len(ending)] if ending else word
++ if ending:
++ root = word[:0-len(ending)]
++ else:
++ root = word
+
+ out = set((word, ))
+ results = rules[i * _partition_size + num][1]
+Index: Whoosh-0.1.13/src/whoosh/classify.py
+===================================================================
+--- Whoosh-0.1.13.orig/src/whoosh/classify.py 2009-04-14 12:03:07.000000000 +0100
++++ Whoosh-0.1.13/src/whoosh/classify.py 2009-04-14 12:42:34.000000000 +0100
+@@ -17,10 +17,11 @@
+ """Classes and functions for classifying and extracting information from documents.
+ """
+
+-from __future__ import division, with_statement
+-from collections import defaultdict
++from __future__ import division
+ from math import log
+
++from whoosh.support.defaultdict import defaultdict
++
+
+ # Expansion models
+
+Index: Whoosh-0.1.13/src/whoosh/fields.py
+===================================================================
+--- Whoosh-0.1.13.orig/src/whoosh/fields.py 2009-04-14 12:16:13.000000000 +0100
++++ Whoosh-0.1.13/src/whoosh/fields.py 2009-04-14 12:47:02.000000000 +0100
+@@ -20,9 +20,8 @@
+
+ """
+
+-from collections import defaultdict
+-
+ from whoosh.analysis import unstopped, IDAnalyzer, KeywordAnalyzer, StandardAnalyzer, NgramAnalyzer
++from whoosh.support.defaultdict import defaultdict
+
+ # Exceptions
+
+@@ -31,6 +30,11 @@
+ class UnknownFieldError(Exception):
+ pass
+
++try:
++ any
++except:
++ from whoosh.support.any import any
++
+ # Field Types
+
+ class FieldType(object):
+Index: Whoosh-0.1.13/src/whoosh/support/defaultdict.py
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ Whoosh-0.1.13/src/whoosh/support/defaultdict.py 2009-04-14 12:26:56.000000000 +0100
+@@ -0,0 +1,37 @@
++try:
++ from collections import defaultdict
++except:
++ class defaultdict(dict):
++ def __init__(self, default_factory=None, *a, **kw):
++ if (default_factory is not None and
++ not hasattr(default_factory, '__call__')):
++ raise TypeError('first argument must be callable')
++ dict.__init__(self, *a, **kw)
++ self.default_factory = default_factory
++ def __getitem__(self, key):
++ try:
++ return dict.__getitem__(self, key)
++ except KeyError:
++ return self.__missing__(key)
++ def __missing__(self, key):
++ if self.default_factory is None:
++ raise KeyError(key)
++ self[key] = value = self.default_factory()
++ return value
++ def __reduce__(self):
++ if self.default_factory is None:
++ args = tuple()
++ else:
++ args = self.default_factory,
++ return type(self), args, None, None, self.items()
++ def copy(self):
++ return self.__copy__()
++ def __copy__(self):
++ return type(self)(self.default_factory, self)
++ def __deepcopy__(self, memo):
++ import copy
++ return type(self)(self.default_factory,
++ copy.deepcopy(self.items()))
++ def __repr__(self):
++ return 'defaultdict(%s, %s)' % (self.default_factory,
++ dict.__repr__(self))
+Index: Whoosh-0.1.13/src/whoosh/writing.py
+===================================================================
+--- Whoosh-0.1.13.orig/src/whoosh/writing.py 2009-04-14 12:28:04.000000000 +0100
++++ Whoosh-0.1.13/src/whoosh/writing.py 2009-04-14 12:29:16.000000000 +0100
+@@ -19,11 +19,11 @@
+ """
+
+ from array import array
+-from collections import defaultdict
+ from tempfile import TemporaryFile
+
+ from whoosh import index, postpool, reading, structfile, tables
+ from whoosh.fields import UnknownFieldError
++from whoosh.support.defaultdict import defaultdict
+ from whoosh.util import fib
+
+ # Exceptions
+Index: Whoosh-0.1.13/src/whoosh/util.py
+===================================================================
+--- Whoosh-0.1.13.orig/src/whoosh/util.py 2009-04-14 12:33:53.000000000 +0100
++++ Whoosh-0.1.13/src/whoosh/util.py 2009-04-14 12:34:09.000000000 +0100
+@@ -18,7 +18,6 @@
+ Miscellaneous utility functions and classes.
+ """
+
+-from functools import wraps
+ from heapq import heappush, heapreplace
+
+ from whoosh.support.bitvector import BitVector
+@@ -171,7 +170,6 @@
+ have 'is_closed' and '_sync_lock' attributes.
+ """
+
+- @wraps(func)
+ def wrapper(self, *args, **kwargs):
+ if self.is_closed:
+ raise Exception("This object has been closed")
+Index: Whoosh-0.1.13/src/whoosh/spelling.py
+===================================================================
+--- Whoosh-0.1.13.orig/src/whoosh/spelling.py 2009-04-14 12:41:48.000000000 +0100
++++ Whoosh-0.1.13/src/whoosh/spelling.py 2009-04-14 12:42:04.000000000 +0100
+@@ -18,9 +18,8 @@
+ as a backend for a spell-checking engine.
+ """
+
+-from collections import defaultdict
+-
+ from whoosh import analysis, fields, query, searching, writing
++from whoosh.support.defaultdict import defaultdict
+ from whoosh.support.levenshtein import relative, distance
+
+ class SpellChecker(object):
+Index: Whoosh-0.1.13/src/whoosh/highlight.py
+===================================================================
+--- Whoosh-0.1.13.orig/src/whoosh/highlight.py 2009-04-14 12:47:54.000000000 +0100
++++ Whoosh-0.1.13/src/whoosh/highlight.py 2009-04-14 12:48:15.000000000 +0100
+@@ -17,6 +17,11 @@
+ from __future__ import division
+ from heapq import nlargest
+
++try:
++ any
++except:
++ from whoosh.support.any import any
++
+
+ # Fragment object
+
+Index: Whoosh-0.1.13/src/whoosh/index.py
+===================================================================
+--- Whoosh-0.1.13.orig/src/whoosh/index.py 2009-04-14 12:47:31.000000000 +0100
++++ Whoosh-0.1.13/src/whoosh/index.py 2009-04-14 12:47:49.000000000 +0100
+@@ -26,6 +26,11 @@
+
+ from whoosh import fields, store
+
++try:
++ any
++except:
++ from whoosh.support.any import any
++
+
+ _DEF_INDEX_NAME = "MAIN"
+ _EXTENSIONS = "dci|dcz|tiz|fvz"
+Index: Whoosh-0.1.13/src/whoosh/reading.py
+===================================================================
+--- Whoosh-0.1.13.orig/src/whoosh/reading.py 2009-04-14 12:47:09.000000000 +0100
++++ Whoosh-0.1.13/src/whoosh/reading.py 2009-04-14 12:47:25.000000000 +0100
+@@ -25,6 +25,11 @@
+ from whoosh.util import ClosableMixin, protected
+ from whoosh.fields import FieldConfigurationError, UnknownFieldError
+
++try:
++ any
++except:
++ from whoosh.support.any import any
++
+ # Exceptions
+
+ class TermNotFound(Exception):
+@@ -642,4 +647,4 @@
+
+
+
+-
+\ No newline at end of file
++
+Index: Whoosh-0.1.13/src/whoosh/support/any.py
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ Whoosh-0.1.13/src/whoosh/support/any.py 2009-04-14 12:46:45.000000000 +0100
+@@ -0,0 +1,5 @@
++def any(iterable):
++ for element in iterable:
++ if element:
++ return True
++ return False
Modified: packages/python-whoosh/trunk/debian/patches/series
===================================================================
--- packages/python-whoosh/trunk/debian/patches/series 2009-05-07 11:13:14 UTC (rev 8382)
+++ packages/python-whoosh/trunk/debian/patches/series 2009-05-07 16:14:54 UTC (rev 8383)
@@ -1 +1,2 @@
-01-python2.4-fixes.diff
+01-remove-pyparsing.diff
+02-python2.4-fixes.diff
More information about the Python-modules-commits
mailing list