From 5ec453c2580654ef1d9c019964fa3b9cf3c601a9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 8 Jan 2012 03:22:51 -0600 Subject: [PATCH] Fix koffice python syntax errors This closes Bug 679 --- .../python/scripts/RestrictedPython/Utilities.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/kross/python/scripts/RestrictedPython/Utilities.py b/lib/kross/python/scripts/RestrictedPython/Utilities.py index 87eef69b8..72de7b489 100644 --- a/lib/kross/python/scripts/RestrictedPython/Utilities.py +++ b/lib/kross/python/scripts/RestrictedPython/Utilities.py @@ -46,11 +46,11 @@ def test(*args): if l%2: return args[-1] utility_builtins['test'] = test -def reorder(s, with=None, without=()): - # s, with, and without are sequences treated as sets. - # The result is subtract(intersect(s, with), without), - # unless with is None, in which case it is subtract(s, without). - if with is None: with=s +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: @@ -61,12 +61,12 @@ def reorder(s, with=None, without=()): a=r.append h=d.has_key - for i in without: + 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 with: + for i in swith: if type(i) is tt and len(i)==2: k, v = i else: k= v = i if h(k):