[pypy-svn] r74413 - in pypy/extradoc/talk/pycon-italy-2010/pypy_demo: . mandelbrot manderlbrot

antocuni at codespeak.net antocuni at codespeak.net
Thu May 6 14:54:35 CEST 2010


Author: antocuni
Date: Thu May  6 14:54:33 2010
New Revision: 74413

Added:
   pypy/extradoc/talk/pycon-italy-2010/pypy_demo/mandelbrot/
      - copied from r74381, pypy/extradoc/talk/pycon-italy-2010/pypy_demo/manderlbrot/
Removed:
   pypy/extradoc/talk/pycon-italy-2010/pypy_demo/manderlbrot/
Modified:
   pypy/extradoc/talk/pycon-italy-2010/pypy_demo/mandelbrot/py_mandel.py
   pypy/extradoc/talk/pycon-italy-2010/pypy_demo/mandelbrot/views.py
   pypy/extradoc/talk/pycon-italy-2010/pypy_demo/settings.py
   pypy/extradoc/talk/pycon-italy-2010/pypy_demo/urls.py
Log:
typo: s/manderlbrot/mandelbrot


Modified: pypy/extradoc/talk/pycon-italy-2010/pypy_demo/mandelbrot/py_mandel.py
==============================================================================
--- pypy/extradoc/talk/pycon-italy-2010/pypy_demo/manderlbrot/py_mandel.py	(original)
+++ pypy/extradoc/talk/pycon-italy-2010/pypy_demo/mandelbrot/py_mandel.py	Thu May  6 14:54:33 2010
@@ -10,7 +10,7 @@
 
 # Changing the values below will change the resulting image
 
-def manderlbrot(image_width, image_height):
+def mandelbrot(image_width, image_height):
     start_real=-2.00
     start_imag=-1.00
     end_real=1.00

Modified: pypy/extradoc/talk/pycon-italy-2010/pypy_demo/mandelbrot/views.py
==============================================================================
--- pypy/extradoc/talk/pycon-italy-2010/pypy_demo/manderlbrot/views.py	(original)
+++ pypy/extradoc/talk/pycon-italy-2010/pypy_demo/mandelbrot/views.py	Thu May  6 14:54:33 2010
@@ -6,26 +6,26 @@
 def empty(request):
     return HttpResponse('')
 
-# render a manderlbrot image
+# render a mandelbrot image
 def render(request):
     w = int(request.GET.get('w', 320))
     h = int(request.GET.get('h', 240))
 
-    from py_mandel import manderlbrot
-    img = manderlbrot(w, h)
+    from py_mandel import mandelbrot
+    img = mandelbrot(w, h)
     return HttpResponse(img, content_type="image/bmp")
 
 
-# render a manderlbrot image through the execnet pypy child, which is set up
+# render a mandelbrot image through the execnet pypy child, which is set up
 # below
 def pypy_render(request):
     w = int(request.GET.get('w', 320))
     h = int(request.GET.get('h', 240))
 
     channel = pypy.remote_exec("""
-        from py_mandel import manderlbrot
+        from py_mandel import mandelbrot
         w, h = channel.receive()
-        img = manderlbrot(w, h)
+        img = mandelbrot(w, h)
         channel.send(img)
     """)
     channel.send((w, h))
@@ -45,7 +45,7 @@
 pypy.remote_exec("""
     import sys
     import os
-    os.chdir("manderlbrot")
+    os.chdir("mandelbrot")
     sys.path.insert(0, '')
 """)
 

Modified: pypy/extradoc/talk/pycon-italy-2010/pypy_demo/settings.py
==============================================================================
--- pypy/extradoc/talk/pycon-italy-2010/pypy_demo/settings.py	(original)
+++ pypy/extradoc/talk/pycon-italy-2010/pypy_demo/settings.py	Thu May  6 14:54:33 2010
@@ -76,5 +76,5 @@
     ## 'django.contrib.contenttypes',
     ## 'django.contrib.sessions',
     ## 'django.contrib.sites',
-    'pypy_demo.manderlbrot',
+    'pypy_demo.mandelbrot',
 )

Modified: pypy/extradoc/talk/pycon-italy-2010/pypy_demo/urls.py
==============================================================================
--- pypy/extradoc/talk/pycon-italy-2010/pypy_demo/urls.py	(original)
+++ pypy/extradoc/talk/pycon-italy-2010/pypy_demo/urls.py	Thu May  6 14:54:33 2010
@@ -6,9 +6,9 @@
 
 urlpatterns = patterns('',
     # Example:
-    (r'^render$', 'pypy_demo.manderlbrot.views.render'),
-    (r'^pypy_render$', 'pypy_demo.manderlbrot.views.pypy_render'),
-    (r'^empty$', 'pypy_demo.manderlbrot.views.empty'),       
+    (r'^render$', 'pypy_demo.mandelbrot.views.render'),
+    (r'^pypy_render$', 'pypy_demo.mandelbrot.views.pypy_render'),
+    (r'^empty$', 'pypy_demo.mandelbrot.views.empty'),       
 
     # Uncomment the admin/doc line below and add 'django.contrib.admindocs' 
     # to INSTALLED_APPS to enable admin documentation:



More information about the Pypy-commit mailing list