Attachment #156 for bug #679

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 679
Collapse All | Expand All




    if l%2: return args[-1]
utility_builtins['test'] = test

def reorder(s, swith=None, swithout=()):
    # s, swith, and swithout are sequences treated as sets.
    # The result is subtract(intersect(s, swith), swithout),
    # unless swith is None, in which case it is subtract(s, swithout).
    if swith is None: swith=s
    d={}
    tt=type(())
    for i in s:

    a=r.append
    h=d.has_key

    for i in swithout:
        if type(i) is tt and len(i)==2: k, v = i
        else:                           k= v = i
        if h(k): del d[k]

    for i in swith:
        if type(i) is tt and len(i)==2: k, v = i
        else:                           k= v = i
        if h(k):

Return to bug 679

Lines 46-56 Link Here

(-)koffice/lib/kross/python/scripts/RestrictedPython/Utilities.py.ORI (-7 / +7 lines)
46	if l%2: return args[-1]	46	if l%2: return args[-1]
47	utility_builtins['test'] = test	47	utility_builtins['test'] = test
48		48
49	def reorder(s, with=None, without=()):	49	def reorder(s, swith=None, swithout=()):
50	# s, with, and without are sequences treated as sets.	50	# s, swith, and swithout are sequences treated as sets.
51	# The result is subtract(intersect(s, with), without),	51	# The result is subtract(intersect(s, swith), swithout),
52	# unless with is None, in which case it is subtract(s, without).	52	# unless swith is None, in which case it is subtract(s, swithout).
53	if with is None: with=s	53	if swith is None: swith=s
54	d={}	54	d={}
55	tt=type(())	55	tt=type(())
56	for i in s:	56	for i in s:
Lines 61-72 Link Here
61	a=r.append	61	a=r.append
62	h=d.has_key	62	h=d.has_key
63		63
64	for i in without:	64	for i in swithout:
65	if type(i) is tt and len(i)==2: k, v = i	65	if type(i) is tt and len(i)==2: k, v = i
66	else: k= v = i	66	else: k= v = i
67	if h(k): del d[k]	67	if h(k): del d[k]
68		68
69	for i in with:	69	for i in swith:
70	if type(i) is tt and len(i)==2: k, v = i	70	if type(i) is tt and len(i)==2: k, v = i
71	else: k= v = i	71	else: k= v = i
72	if h(k):	72	if h(k):