summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-08 03:22:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-08 03:22:51 -0600
commit5ec453c2580654ef1d9c019964fa3b9cf3c601a9 (patch)
tree9aa20ad020b1359f468513215fbc04269d155faa
parentc15aa3507935cdd7fee59fc62fe767f7ec874810 (diff)
downloadkoffice-5ec453c2580654ef1d9c019964fa3b9cf3c601a9.tar.gz
koffice-5ec453c2580654ef1d9c019964fa3b9cf3c601a9.zip
Fix koffice python syntax errors
This closes Bug 679
-rw-r--r--lib/kross/python/scripts/RestrictedPython/Utilities.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/kross/python/scripts/RestrictedPython/Utilities.py b/lib/kross/python/scripts/RestrictedPython/Utilities.py
index 87eef69b..72de7b48 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):