# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1385678869 -3600
# Node ID bd6f662272142e27cef7227837845e0e40fc2d99
# Parent  4fec4d70b1f2f60fc717646db56087ff092b5de4# Parent  cd1124f79600deb195a0b93cdac3b5b16dc0c660
Merged branches.

diff -r 4fec4d70b1f2 -r bd6f66227214 micropython/data.py
--- a/micropython/data.py	Thu Nov 28 15:49:39 2013 +0100
+++ b/micropython/data.py	Thu Nov 28 23:47:49 2013 +0100
@@ -1619,7 +1619,7 @@
 
         if parent.has_key(name):
             assignments = parent[name].static_assignments
-            if assignments > 1:
+            if assignments >= 1:
                 name = "%s#%d" % (name, assignments + 1)
 
         cls = Class(name, parent, module, node, original_name)
@@ -1644,7 +1644,7 @@
 
     if parent.has_key(name):
         assignments = parent[name].static_assignments
-        if assignments > 1:
+        if assignments >= 1:
             name = "%s#%d" % (name, assignments + 1)
 
     fn = Function(name, parent, argnames, defaults, has_star, has_dstar,
diff -r 4fec4d70b1f2 -r bd6f66227214 tests/call_func_default_nested_multiple.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/call_func_default_nested_multiple.py	Thu Nov 28 23:47:49 2013 +0100
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+def outer(x):
+    if x > 0:
+        def inner(y, z=x):
+            return y + z
+    else:
+        def inner(y, z=x):
+            return y - z
+    return inner
+
+result_3 = outer(1)(2)
+result_4 = outer(2)(2)
+result2_3 = outer(-1)(2)
+
+# vim: tabstop=4 expandtab shiftwidth=4