1.1 --- a/micropython/data.py Thu Nov 28 15:49:39 2013 +0100
1.2 +++ b/micropython/data.py Thu Nov 28 23:47:49 2013 +0100
1.3 @@ -1619,7 +1619,7 @@
1.4
1.5 if parent.has_key(name):
1.6 assignments = parent[name].static_assignments
1.7 - if assignments > 1:
1.8 + if assignments >= 1:
1.9 name = "%s#%d" % (name, assignments + 1)
1.10
1.11 cls = Class(name, parent, module, node, original_name)
1.12 @@ -1644,7 +1644,7 @@
1.13
1.14 if parent.has_key(name):
1.15 assignments = parent[name].static_assignments
1.16 - if assignments > 1:
1.17 + if assignments >= 1:
1.18 name = "%s#%d" % (name, assignments + 1)
1.19
1.20 fn = Function(name, parent, argnames, defaults, has_star, has_dstar,
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/tests/call_func_default_nested_multiple.py Thu Nov 28 23:47:49 2013 +0100
2.3 @@ -0,0 +1,16 @@
2.4 +#!/usr/bin/env python
2.5 +
2.6 +def outer(x):
2.7 + if x > 0:
2.8 + def inner(y, z=x):
2.9 + return y + z
2.10 + else:
2.11 + def inner(y, z=x):
2.12 + return y - z
2.13 + return inner
2.14 +
2.15 +result_3 = outer(1)(2)
2.16 +result_4 = outer(2)(2)
2.17 +result2_3 = outer(-1)(2)
2.18 +
2.19 +# vim: tabstop=4 expandtab shiftwidth=4