head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.8 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.4 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.2 pkgsrc-2011Q2-base:1.4 pkgsrc-2010Q4:1.3.0.14 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.12 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.10 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.8 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.6 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.4 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.2 pkgsrc-2009Q2-base:1.3 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.36 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.34 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.4 date 2011.01.11.11.59.19; author drochner; state dead; branches; next 1.3; 1.3 date 2009.07.06.21.42.38; author joerg; state Exp; branches; next 1.2; 1.2 date 2002.10.24.17.26.14; author drochner; state dead; branches; next 1.1; 1.1 date 2002.01.15.18.25.39; author drochner; state Exp; branches; next ; desc @@ 1.4 log @update to 3.1.3 changes: misc fixes and improvements @ text @$NetBSD: patch-aa,v 1.3 2009/07/06 21:42:38 joerg Exp $ --- mx/TextTools/TextTools.py.orig 2009-07-06 21:37:44.000000000 +0000 +++ mx/TextTools/TextTools.py @@@@ -167,7 +167,7 @@@@ def word_in_list(l): # Extra stuff useful in combination with the C functions # -def replace(text,what,with,start=0,stop=None, +def replace(text,what,with_,start=0,stop=None, SearchObject=BMS,join=join,joinlist=joinlist,tag=tag, string_replace=string.replace,type=type, @@@@ -188,11 +188,11 @@@@ def replace(text,what,with,start=0,stop= 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,with_) stop = len(text) t = ((text,sWordStart,so,+2), # Found something, replace and continue searching - (with,Skip+AppendTagobj,len(what),-1,-1), + (with_,Skip+AppendTagobj,len(what),-1,-1), # Rest of text (text,Move,ToEOF) ) @@@@ -203,7 +203,7 @@@@ def replace(text,what,with,start=0,stop= # Alternative (usually slower) versions using different techniques: -def _replace2(text,what,with,start=0,stop=None, +def _replace2(text,what,with_,start=0,stop=None, join=join,joinlist=joinlist,tag=tag, StringType=types.StringType,BMS=BMS): @@@@ -222,13 +222,13 @@@@ def _replace2(text,what,with,start=0,sto stop = len(text) if type(what) == StringType: what=BMS(what) - t = ((with,sFindWord,what,+1,+0),) + t = ((with_,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,with_, join=string.join,FS=FS, StringType=types.StringType): @@@@ -241,12 +241,12 @@@@ def _replace3(text,what,with, l = [] x = 0 for left,right in slices: - l.append(text[x:left] + with) + l.append(text[x:left] + with_) x = right l.append(text[x:]) return join(l,'') -def _replace4(text,what,with, +def _replace4(text,what,with_, join=join,joinlist=joinlist,tag=tag,FS=FS, StringType=types.StringType): @@@@ -258,7 +258,7 @@@@ def _replace4(text,what,with, return text repl = [None]*len(slices) for i in range(len(slices)): - repl[i] = (with,)+slices[i] + repl[i] = (with_,)+slices[i] return join(joinlist(text,repl)) def multireplace(text,replacements,start=0,stop=None, @@@@ -554,16 +554,16 @@@@ def _bench(file='mxTextTools/mxTextTools print 'Replacing strings' print '-'*72 print - for what,with in (('m','M'),('mx','MX'),('mxText','MXTEXT'), + for what,with_ 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,with_) t.start() for i in range(100): - rtext = string.replace(text,what,with) + rtext = string.replace(text,what,with_) print 'with string.replace:',t.stop(),'sec.' t.start() for i in range(100): - ttext = replace(text,what,with) + ttext = replace(text,what,with_) print 'with tag.replace:',t.stop(),'sec.' if ttext != rtext: print 'results are NOT ok !' @@@@ -571,7 +571,7 @@@@ def _bench(file='mxTextTools/mxTextTools mismatch(rtext,ttext) t.start() for i in range(100): - ttext = _replace2(text,what,with) + ttext = _replace2(text,what,with_) print 'with tag._replace2:',t.stop(),'sec.' if ttext != rtext: print 'results are NOT ok !' @@@@ -579,7 +579,7 @@@@ def _bench(file='mxTextTools/mxTextTools print rtext t.start() for i in range(100): - ttext = _replace3(text,what,with) + ttext = _replace3(text,what,with_) print 'with tag._replace3:',t.stop(),'sec.' if ttext != rtext: print 'results are NOT ok !' @@@@ -587,7 +587,7 @@@@ def _bench(file='mxTextTools/mxTextTools print rtext t.start() for i in range(100): - ttext = _replace4(text,what,with) + ttext = _replace4(text,what,with_) print 'with tag._replace4:',t.stop(),'sec.' if ttext != rtext: print 'results are NOT ok !' @ 1.3 log @with is a reserved word for Python 2.6, so avoid it. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @-update to 2.0.4 (from 1.3.0... there are too many changes to list, compatibility is maintained afaict, except an additional "mx" prefix in the namespace -make it a "distutils" pkg, so it works with Python-2.2.x -license change - now freely redistibutable @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2002/01/15 18:25:39 drochner Exp $ d3 5 a7 8 --- mxDateTime/Makefile.pre.in.orig Sun Jan 13 00:30:21 2002 +++ mxDateTime/Makefile.pre.in Sun Jan 13 00:31:30 2002 @@@@ -92,7 +92,7 @@@@ TARGET= python # Installed python binary (used only by boot target) -PYTHON= python +PYTHON= ${PYTHONBIN} d9 116 a124 2 # Add more -I and -D options here CFLAGS= $(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS) @ 1.1 log @convert to use python/extension.buildlink.mk @ text @d1 1 a1 1 $NetBSD$ @