Merge remote-tracking branch 'upstream/master' into listsort. Lots of conflict fun.

Conflicts:
	py/obj.h
	py/objbool.c
	py/objboundmeth.c
	py/objcell.c
	py/objclass.c
	py/objclosure.c
	py/objcomplex.c
	py/objdict.c
	py/objexcept.c
	py/objfun.c
	py/objgenerator.c
	py/objinstance.c
	py/objmodule.c
	py/objrange.c
	py/objset.c
	py/objslice.c

1 files changed, 20 insertions, 12 deletions

diff --git a/examples/mandel.py b/examples/mandel.py
index b13b7d87f8..996132a915 100644
--- a/examples/mandel.py
+++ b/examples/mandel.py
@@ -1,14 +1,22 @@
-@micropython.native
-def in_set(c):
-    z = 0
-    for i in range(40):
-        z = z*z + c
-        if abs(z) > 60:
-            return False
-    return True
+def mandelbrot():
+    # returns True if c, complex, is in the Mandelbrot set
+    @micropython.native
+    def in_set(c):
+        z = 0
+        for i in range(40):
+            z = z*z + c
+            if abs(z) > 60:
+                return False
+        return True
 
-for v in range(31):
-    line = []
+    lcd.clear()
     for u in range(91):
-        line.append('*' if in_set((u / 30 - 2) + (v / 15 - 1) * 1j) else ' ')
-    print(''.join(line))
+        for v in range(31):
+            if in_set((u / 30 - 2) + (v / 15 - 1) * 1j):
+                lcd.set(u, v)
+    lcd.show()
+
+# PC testing
+import lcd
+lcd = lcd.LCD(128, 32)
+mandelbrot()