merge 0.20.x branch into master

5e37df05 · Stefan Behnel · ce98ed57 · 58c7a899 · 5e37df05
Commit 5e37df05 authored Apr 13, 2014 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

docs/src/tutorial/memory_allocation.rst docs/src/tutorial/memory_allocation.rst +1 -1

No files found.
--- a/docs/src/tutorial/memory_allocation.rst
+++ b/docs/src/tutorial/memory_allocation.rst
@@ -102,5 +102,5 @@ e.g.::
          # On error (mem is NULL), the originally memory has not been freed.
          self.data = mem

-      def __dealloc__(self, number):
+      def __dealloc__(self):
          PyMem_Free(self.data)     # no-op if self.data is NULL