[Python-modules-commits] r4437 - in packages/simpleparse/trunk/debian (7 files)
bernat-guest at users.alioth.debian.org
bernat-guest at users.alioth.debian.org
Sat Jan 26 16:13:20 UTC 2008
Date: Saturday, January 26, 2008 @ 16:13:19
Author: bernat-guest
Revision: 4437
Add a patch to remove warnings due to the use of "with" keyword. Also
remove restriction << 2.6 for python.
Added:
packages/simpleparse/trunk/debian/patches/
packages/simpleparse/trunk/debian/patches/remove-with-keyword.patch
packages/simpleparse/trunk/debian/patches/series
Modified:
packages/simpleparse/trunk/debian/changelog
packages/simpleparse/trunk/debian/control
packages/simpleparse/trunk/debian/pyversions
packages/simpleparse/trunk/debian/rules
Modified: packages/simpleparse/trunk/debian/changelog
===================================================================
--- packages/simpleparse/trunk/debian/changelog 2008-01-26 15:58:19 UTC (rev 4436)
+++ packages/simpleparse/trunk/debian/changelog 2008-01-26 16:13:19 UTC (rev 4437)
@@ -1,3 +1,11 @@
+simpleparse (2.1.0a1-2) UNRELEASED; urgency=low
+
+ * Do not forbid to build against furture Python 2.6 and add a patch to
+ remove the use of "with" as variable since it will become a reserved
+ keyword.
+
+ -- Vincent Bernat <bernat at luffy.cx> Sat, 26 Jan 2008 16:58:17 +0100
+
simpleparse (2.1.0a1-1) unstable; urgency=low
* New upstream release (Closes: #357537).
Modified: packages/simpleparse/trunk/debian/control
===================================================================
--- packages/simpleparse/trunk/debian/control 2008-01-26 15:58:19 UTC (rev 4436)
+++ packages/simpleparse/trunk/debian/control 2008-01-26 16:13:19 UTC (rev 4437)
@@ -3,16 +3,17 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Vincent Bernat <bernat at luffy.cx>
-Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all-dev (>= 2.3.5-11), python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1)
+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all-dev (>= 2.3.5-11), python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1), quilt, patchutils (>= 0.2.25)
Vcs-Svn: svn://svn.debian.org/python-modules/packages/simpleparse/trunk
Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/simpleparse/trunk/?op=log
Standards-Version: 3.7.3
Homepage: http://simpleparse.sourceforge.net/
-XS-Python-Version: >= 2.4, << 2.6
+XS-Python-Version: >= 2.4
Package: python-simpleparse
Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, python-simpleparse-mxtexttools (>= ${binary:Version}), python-simpleparse-mxtexttools (<< ${binary:Version}.1~)
+Depends: ${python:Depends}, ${shlibs:Depends}
+Python-Depends: python-simpleparse-mxtexttools (>= ${binary:Version})
Provides: ${python:Provides}
Suggests: python-simpleparse-doc
XB-Python-Version: ${python:Versions}
Added: packages/simpleparse/trunk/debian/patches/remove-with-keyword.patch
===================================================================
--- packages/simpleparse/trunk/debian/patches/remove-with-keyword.patch (rev 0)
+++ packages/simpleparse/trunk/debian/patches/remove-with-keyword.patch 2008-01-26 16:13:19 UTC (rev 4437)
@@ -0,0 +1,129 @@
+--- SimpleParse-2.1.0a1/stt/TextTools/TextTools.py~ 2006-02-19 00:33:56.000000000 +0100
++++ SimpleParse-2.1.0a1/stt/TextTools/TextTools.py 2008-01-26 17:07:18.000000000 +0100
+@@ -167,7 +167,7 @@
+ # Extra stuff useful in combination with the C functions
+ #
+
+-def replace(text,what,with,start=0,stop=None,
++def replace(text,what,withwhat,start=0,stop=None,
+
+ SearchObject=TextSearch,join=join,joinlist=joinlist,tag=tag,
+ string_replace=string.replace,type=type,
+@@ -188,11 +188,11 @@
+ what = so.match
+ if stop is None:
+ if start == 0 and len(what) < 2:
+- return string_replace(text,what,with)
++ return string_replace(text,what,withwhat)
+ stop = len(text)
+ t = ((text,sWordStart,so,+2),
+ # Found something, replace and continue searching
+- (with,Skip+AppendTagobj,len(what),-1,-1),
++ (withwhat,Skip+AppendTagobj,len(what),-1,-1),
+ # Rest of text
+ (text,Move,ToEOF)
+ )
+@@ -203,13 +203,13 @@
+
+ # Alternative (usually slower) versions using different techniques:
+
+-def _replace2(text,what,with,start=0,stop=None,
++def _replace2(text,what,withwhat,start=0,stop=None,
+
+ join=join,joinlist=joinlist,tag=tag,
+ TextSearchType=TextSearchType,TextSearch=TextSearch):
+
+ """Analogon to string.replace; returns a string with all occurences
+- of what in text[start:stop] replaced by with.
++ of what in text[start:stop] replaced by withwhat.
+
+ This version uses a one entry tag-table and a
+ Boyer-Moore-Search-object. what can be a string or a
+@@ -226,13 +226,13 @@
+ stop = len(text)
+ if type(what) is not TextSearchType:
+ what=TextSearch(what)
+- t = ((with,sFindWord,what,+1,+0),)
++ t = ((withwhat,sFindWord,what,+1,+0),)
+ found,taglist,last = tag(text,t,start,stop)
+ if not found:
+ return text
+ return join(joinlist(text,taglist))
+
+-def _replace3(text,what,with,
++def _replace3(text,what,withwhat,
+
+ join=string.join,TextSearch=TextSearch,
+ TextSearchType=TextSearchType):
+@@ -245,12 +245,12 @@
+ l = []
+ x = 0
+ for left,right in slices:
+- l.append(text[x:left] + with)
++ l.append(text[x:left] + withwhat)
+ x = right
+ l.append(text[x:])
+ return join(l,'')
+
+-def _replace4(text,what,with,
++def _replace4(text,what,withwhat,
+
+ join=join,joinlist=joinlist,tag=tag,TextSearch=TextSearch,
+ TextSearchType=TextSearchType):
+@@ -262,7 +262,7 @@
+ return text
+ repl = [None]*len(slices)
+ for i in range(len(slices)):
+- repl[i] = (with,)+slices[i]
++ repl[i] = (withwhat,)+slices[i]
+ return join(joinlist(text,repl))
+
+ def multireplace(text,replacements,start=0,stop=None,
+@@ -569,16 +569,16 @@
+ print 'Replacing strings'
+ print '-'*72
+ print
+- for what,with in (('m','M'),('mx','MX'),('mxText','MXTEXT'),
++ for what,withwhat in (('m','M'),('mx','MX'),('mxText','MXTEXT'),
+ ('hmm','HMM'),('hmmm','HMM'),('hmhmm','HMM')):
+- print 'Replace "%s" with "%s"' % (what,with)
++ print 'Replace "%s" with "%s"' % (what,withwhat)
+ t.start()
+ for i in range(100):
+- rtext = string.replace(text,what,with)
++ rtext = string.replace(text,what,withwhat)
+ print 'with string.replace:',t.stop(),'sec.'
+ t.start()
+ for i in range(100):
+- ttext = replace(text,what,with)
++ ttext = replace(text,what,withwhat)
+ print 'with tag.replace:',t.stop(),'sec.'
+ if ttext != rtext:
+ print 'results are NOT ok !'
+@@ -586,7 +586,7 @@
+ mismatch(rtext,ttext)
+ t.start()
+ for i in range(100):
+- ttext = _replace2(text,what,with)
++ ttext = _replace2(text,what,withwhat)
+ print 'with tag._replace2:',t.stop(),'sec.'
+ if ttext != rtext:
+ print 'results are NOT ok !'
+@@ -594,7 +594,7 @@
+ print rtext
+ t.start()
+ for i in range(100):
+- ttext = _replace3(text,what,with)
++ ttext = _replace3(text,what,withwhat)
+ print 'with tag._replace3:',t.stop(),'sec.'
+ if ttext != rtext:
+ print 'results are NOT ok !'
+@@ -602,7 +602,7 @@
+ print rtext
+ t.start()
+ for i in range(100):
+- ttext = _replace4(text,what,with)
++ ttext = _replace4(text,what,withwhat)
+ print 'with tag._replace4:',t.stop(),'sec.'
+ if ttext != rtext:
+ print 'results are NOT ok !'
Added: packages/simpleparse/trunk/debian/patches/series
===================================================================
--- packages/simpleparse/trunk/debian/patches/series (rev 0)
+++ packages/simpleparse/trunk/debian/patches/series 2008-01-26 16:13:19 UTC (rev 4437)
@@ -0,0 +1 @@
+remove-with-keyword.patch
Modified: packages/simpleparse/trunk/debian/pyversions
===================================================================
--- packages/simpleparse/trunk/debian/pyversions 2008-01-26 15:58:19 UTC (rev 4436)
+++ packages/simpleparse/trunk/debian/pyversions 2008-01-26 16:13:19 UTC (rev 4437)
@@ -1 +1 @@
-2.4-2.5
+2.4-
Modified: packages/simpleparse/trunk/debian/rules
===================================================================
--- packages/simpleparse/trunk/debian/rules 2008-01-26 15:58:19 UTC (rev 4436)
+++ packages/simpleparse/trunk/debian/rules 2008-01-26 16:13:19 UTC (rev 4437)
@@ -4,6 +4,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
SHARE=$(CURDIR)/debian/python-simpleparse/usr/share
More information about the Python-modules-commits
mailing list