[Python-modules-commits] r9921 - in packages/python-whoosh/trunk (4 files)
bzed at users.alioth.debian.org
bzed at users.alioth.debian.org
Fri Oct 2 15:20:47 UTC 2009
Date: Friday, October 2, 2009 @ 15:20:45
Author: bzed
Revision: 9921
* New upstream release.
* Whoosh is not compatible with 2.4 thanks to pickling problems,
drop compat patch and limit versions in debian/pyversions.
Modified:
packages/python-whoosh/trunk/debian/ (properties)
packages/python-whoosh/trunk/debian/changelog
packages/python-whoosh/trunk/debian/watch
Deleted:
packages/python-whoosh/trunk/debian/patches/02-python2.4-fixes.diff
Property changes on: packages/python-whoosh/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: packages/python-whoosh/trunk/debian/changelog
===================================================================
--- packages/python-whoosh/trunk/debian/changelog 2009-10-02 00:49:32 UTC (rev 9920)
+++ packages/python-whoosh/trunk/debian/changelog 2009-10-02 15:20:45 UTC (rev 9921)
@@ -1,3 +1,12 @@
+python-whoosh (0.3.~0b24-1) experimental; urgency=low
+
+ [ Bernd Zeimetz ]
+ * New upstream release.
+ * Whoosh is not compatible with 2.4 thanks to pickling problems,
+ drop compat patch and limit versions in debian/pyversions.
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> Fri, 02 Oct 2009 16:51:08 +0200
+
python-whoosh (0.1.22-1) unstable; urgency=low
* New upstream release.
Deleted: packages/python-whoosh/trunk/debian/patches/02-python2.4-fixes.diff
===================================================================
--- packages/python-whoosh/trunk/debian/patches/02-python2.4-fixes.diff 2009-10-02 00:49:32 UTC (rev 9920)
+++ packages/python-whoosh/trunk/debian/patches/02-python2.4-fixes.diff 2009-10-02 15:20:45 UTC (rev 9921)
@@ -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: python-whoosh-0.1.20/src/whoosh/query.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/query.py 2009-04-27 03:30:53.000000000 +0100
-+++ python-whoosh-0.1.20/src/whoosh/query.py 2009-05-27 16:15:42.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: python-whoosh-0.1.20/src/whoosh/support/bitvector.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/support/bitvector.py 2009-03-18 06:04:40.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/support/bitvector.py 2009-05-27 16:15:42.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: python-whoosh-0.1.20/src/whoosh/lang/morph_en.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/lang/morph_en.py 2009-03-18 06:04:37.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/lang/morph_en.py 2009-05-27 16:15:42.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: python-whoosh-0.1.20/src/whoosh/classify.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/classify.py 2009-03-21 04:27:37.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/classify.py 2009-05-27 16:15:42.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: python-whoosh-0.1.20/src/whoosh/fields.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/fields.py 2009-05-25 21:22:37.000000000 +0100
-+++ python-whoosh-0.1.20/src/whoosh/fields.py 2009-05-27 16:16:43.000000000 +0100
-@@ -21,9 +21,9 @@
- """
-
- import re
--from collections import defaultdict
-
- from whoosh.analysis import unstopped, IDAnalyzer, RegexAnalyzer, KeywordAnalyzer, StandardAnalyzer, NgramAnalyzer
-+from whoosh.support.defaultdict import defaultdict
-
- # Exceptions
-
-@@ -32,6 +32,11 @@
- class UnknownFieldError(Exception):
- pass
-
-+try:
-+ any
-+except:
-+ from whoosh.support.any import any
-+
- # Field Types
-
- class FieldType(object):
-Index: python-whoosh-0.1.20/src/whoosh/support/defaultdict.py
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/support/defaultdict.py 2009-05-27 16:15:42.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: python-whoosh-0.1.20/src/whoosh/writing.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/writing.py 2009-05-25 21:22:38.000000000 +0100
-+++ python-whoosh-0.1.20/src/whoosh/writing.py 2009-05-27 16:15:42.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: python-whoosh-0.1.20/src/whoosh/util.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/util.py 2009-05-25 21:22:38.000000000 +0100
-+++ python-whoosh-0.1.20/src/whoosh/util.py 2009-05-27 16:15:42.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
-@@ -172,7 +171,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: python-whoosh-0.1.20/src/whoosh/spelling.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/spelling.py 2009-03-21 04:27:37.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/spelling.py 2009-05-27 16:15:42.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: python-whoosh-0.1.20/src/whoosh/highlight.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/highlight.py 2009-03-18 06:04:40.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/highlight.py 2009-05-27 16:15:42.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: python-whoosh-0.1.20/src/whoosh/index.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/index.py 2009-05-25 21:22:38.000000000 +0100
-+++ python-whoosh-0.1.20/src/whoosh/index.py 2009-05-27 16:15:42.000000000 +0100
-@@ -28,6 +28,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: python-whoosh-0.1.20/src/whoosh/reading.py
-===================================================================
---- python-whoosh-0.1.20.orig/src/whoosh/reading.py 2009-05-25 21:22:38.000000000 +0100
-+++ python-whoosh-0.1.20/src/whoosh/reading.py 2009-05-27 16:15:42.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):
-@@ -641,4 +646,4 @@
-
-
-
--
-\ No newline at end of file
-+
-Index: python-whoosh-0.1.20/src/whoosh/support/any.py
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ python-whoosh-0.1.20/src/whoosh/support/any.py 2009-05-27 16:15:42.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/watch
===================================================================
--- packages/python-whoosh/trunk/debian/watch 2009-10-02 00:49:32 UTC (rev 9920)
+++ packages/python-whoosh/trunk/debian/watch 2009-10-02 15:20:45 UTC (rev 9921)
@@ -1,2 +1,3 @@
version=3
+opts="uversionmangle=s/([^a-zA-Z]*)([^a-zA-Z].*)/$1~$2/" \
http://pypi.python.org/packages/source/W/Whoosh/Whoosh-(.*)\.tar\.gz
More information about the Python-modules-commits
mailing list