Remove use of PyCXX in core C++ extensions

Author: mdboom

.travis.yml

@@ -24,8 +24,8 @@ matrix:
 
 install:
   - pip install -q --use-mirrors nose python-dateutil $NUMPY pep8 pyparsing pillow
-  - sudo apt-get update && sudo apt-get -qq install inkscape libav-tools
-  # We use --no-install-recommends to avoid pulling in additional large latex docs that we don't need 
+  - sudo apt-get update && sudo apt-get -qq install inkscape libav-tools gdb
+  # We use --no-install-recommends to avoid pulling in additional large latex docs that we don't need
   - if [[ $BUILD_DOCS == true ]]; then sudo apt-get install -qq --no-install-recommends dvipng texlive-latex-base texlive-latex-extra texlive-fonts-recommended graphviz; fi
   - if [[ $BUILD_DOCS == true ]]; then pip install sphinx numpydoc linkchecker; fi
   - python setup.py install
@@ -37,11 +37,12 @@ script:
   - echo Testing using 8 processes
   # Generate the font caches in a single process before starting the
   # multiple processes
+  - gcc --version
   - python -c "from matplotlib import font_manager"
   - if [[ $BUILD_DOCS == false ]]; then export MPL_REPO_DIR=$PWD; fi # pep8-conformance test of the examples
   - if [[ $BUILD_DOCS == false ]]; then mkdir ../tmp_test_dir; fi
   - if [[ $BUILD_DOCS == false ]]; then cd ../tmp_test_dir; fi
-  - if [[ $BUILD_DOCS == false ]]; then python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300 $TEST_ARGS; fi
+  - if [[ $BUILD_DOCS == false ]]; then gdb -return-child-result -batch -ex r -ex bt --args python ../matplotlib/tests.py -sv $TEST_ARGS; fi
   - if [[ $BUILD_DOCS == true ]]; then cd doc; python make.py html --small; fi
   # We don't build the LaTeX docs here, so linkchecker will complain
   - if [[ $BUILD_DOCS == true ]]; then touch build/html/Matplotlib.pdf; fi

examples/pylab_examples/agg_buffer_to_array.py

@@ -8,12 +8,7 @@
 fig.canvas.draw()
 
 # grab the pixel buffer and dump it into a numpy array
-buf = fig.canvas.buffer_rgba()
-l, b, w, h = fig.bbox.bounds
-# The array needs to be copied, because the underlying buffer
-# may be reallocated when the window is resized.
-X = np.frombuffer(buf, np.uint8).copy()
-X.shape = h,w,4
+X = np.array(fig.canvas.renderer._renderer)
 
 # now display the array X as an Axes in a new figure
 fig2 = plt.figure()

examples/pylab_examples/mathtext_demo.py

@@ -24,5 +24,4 @@
 
 ax.set_title(r'$\Delta_i^j \hspace{0.4} \mathrm{versus} \hspace{0.4} \Delta_{i+1}^j$', fontsize=20)
 
-
 show()

lib/matplotlib/__init__.py

@@ -1405,6 +1405,13 @@ def tk_window_focus():
 
 def test(verbosity=1):
     """run the matplotlib test suite"""
+    try:
+        import faulthandler
+    except ImportError:
+        pass
+    else:
+        faulthandler.enable()
+
     old_backend = rcParams['backend']
     try:
         use('agg')

lib/matplotlib/axes/_base.py

@@ -2063,8 +2063,8 @@ def draw(self, renderer=None, inframe=False):
                    for z, im in zorder_images]
 
             l, b, r, t = self.bbox.extents
-            width = mag * ((round(r) + 0.5) - (round(l) - 0.5))
-            height = mag * ((round(t) + 0.5) - (round(b) - 0.5))
+            width = int(mag * ((round(r) + 0.5) - (round(l) - 0.5)))
+            height = int(mag * ((round(t) + 0.5) - (round(b) - 0.5)))
             im = mimage.from_images(height,
                                     width,
                                     ims)

lib/matplotlib/backends/backend_agg.py

@@ -127,15 +127,19 @@ def draw_path_collection(self, *kl, **kw):
         return self._renderer.draw_path_collection(*kl, **kw)
 
     def _update_methods(self):
-        #self.draw_path = self._renderer.draw_path  # see below
-        #self.draw_markers = self._renderer.draw_markers
-        #self.draw_path_collection = self._renderer.draw_path_collection
         self.draw_quad_mesh = self._renderer.draw_quad_mesh
         self.draw_gouraud_triangle = self._renderer.draw_gouraud_triangle
         self.draw_gouraud_triangles = self._renderer.draw_gouraud_triangles
         self.draw_image = self._renderer.draw_image
         self.copy_from_bbox = self._renderer.copy_from_bbox
-        self.tostring_rgba_minimized = self._renderer.tostring_rgba_minimized
+        self.get_content_extents = self._renderer.get_content_extents
+
+    def tostring_rgba_minimized(self):
+        extents = self.get_content_extents()
+        bbox = [[extents[0], self.height - (extents[1] + extents[3])],
+                [extents[0] + extents[2], self.height - extents[1]]]
+        region = self.copy_from_bbox(bbox)
+        return np.array(region), extents
 
     def draw_path(self, gc, path, transform, rgbFace=None):
         """
@@ -203,7 +207,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
 
         #print x, y, int(x), int(y), s
         self._renderer.draw_text_image(
-            font.get_image(), np.round(x - xd), np.round(y + yd) + 1, angle, gc)
+            font, np.round(x - xd), np.round(y + yd) + 1, angle, gc)
 
     def get_text_width_height_descent(self, s, prop, ismath):
         """
@@ -354,7 +358,7 @@ def restore_region(self, region, bbox=None, xy=None):
             else:
                 ox, oy = xy
 
-            self._renderer.restore_region2(region, x1, y1, x2, y2, ox, oy)
+            self._renderer.restore_region(region, x1, y1, x2, y2, ox, oy)
 
         else:
             self._renderer.restore_region(region)
@@ -394,7 +398,7 @@ def post_processing(image, dpi):
 
         width, height = int(self.width), int(self.height)
 
-        buffer, bounds = self._renderer.tostring_rgba_minimized()
+        buffer, bounds = self.tostring_rgba_minimized()
 
         l, b, w, h = bounds
 
@@ -407,7 +411,6 @@ def post_processing(image, dpi):
             img, ox, oy = post_processing(img.reshape((h, w, 4)) / 255.,
                                           self.dpi)
             image = fromarray(img, 1)
-            image.flipud_out()
 
             gc = self.new_gc()
             self._renderer.draw_image(gc,
@@ -505,12 +508,13 @@ def print_raw(self, filename_or_obj, *args, **kwargs):
         original_dpi = renderer.dpi
         renderer.dpi = self.figure.dpi
         if is_string_like(filename_or_obj):
-            filename_or_obj = open(filename_or_obj, 'wb')
+            fileobj = open(filename_or_obj, 'wb')
             close = True
         else:
+            fileobj = filename_or_obj
             close = False
         try:
-            renderer._renderer.write_rgba(filename_or_obj)
+            fileobj.write(renderer._renderer.buffer_rgba())
         finally:
             if close:
                 filename_or_obj.close()
@@ -528,9 +532,7 @@ def print_png(self, filename_or_obj, *args, **kwargs):
         else:
             close = False
         try:
-            _png.write_png(renderer._renderer.buffer_rgba(),
-                           renderer.width, renderer.height,
-                           filename_or_obj, self.figure.dpi)
+            _png.write_png(renderer._renderer, filename_or_obj, self.figure.dpi)
         finally:
             if close:
                 filename_or_obj.close()

lib/matplotlib/backends/backend_cairo.py

@@ -167,8 +167,6 @@ def draw_image(self, gc, x, y, im):
         # bbox - not currently used
         if _debug: print('%s.%s()' % (self.__class__.__name__, _fn_name()))
 
-        im.flipud_out()
-
         rows, cols, buf = im.color_conv (BYTE_FORMAT)
         surface = cairo.ImageSurface.create_for_data (
                       buf, cairo.FORMAT_ARGB32, cols, rows, cols*4)
@@ -183,8 +181,6 @@ def draw_image(self, gc, x, y, im):
             ctx.paint()
         ctx.restore()
 
-        im.flipud_out()
-
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         # Note: x,y are device/display coords, not user-coords, unlike other
         # draw_* methods

lib/matplotlib/backends/backend_gdk.py

@@ -109,7 +109,6 @@ def draw_image(self, gc, x, y, im):
             #             int(w), int(h))
             # set clip rect?
 
-        im.flipud_out()
         rows, cols, image_str = im.as_rgba_str()
 
         image_array = np.fromstring(image_str, np.uint8)
@@ -120,7 +119,7 @@ def draw_image(self, gc, x, y, im):
                                 width=cols, height=rows)
 
         array = pixbuf_get_pixels_array(pixbuf)
-        array[:,:,:] = image_array
+        array[:,:,:] = image_array[::-1]
 
         gc = self.new_gc()
 
@@ -138,9 +137,6 @@ def draw_image(self, gc, x, y, im):
                                   int(x), int(y), cols, rows,
                                   gdk.RGB_DITHER_NONE, 0, 0)
 
-        # unflip
-        im.flipud_out()
-
 
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         x, y = int(x), int(y)

lib/matplotlib/backends/backend_macosx.py

@@ -110,10 +110,8 @@ def get_image_magnification(self):
         return self.gc.get_image_magnification()
 
     def draw_image(self, gc, x, y, im):
-        im.flipud_out()
         nrows, ncols, data = im.as_rgba_str()
         gc.draw_image(x, y, nrows, ncols, data)
-        im.flipud_out()
 
     def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
         # todo, handle props, angle, origins

lib/matplotlib/backends/backend_mixed.py

@@ -121,7 +121,6 @@ def stop_rasterizing(self):
             if w > 0 and h > 0:
                 image = frombuffer(buffer, w, h, True)
                 image.is_grayscale = False
-                image.flipud_out()
                 gc = self._renderer.new_gc()
                 # TODO: If the mixedmode resolution differs from the figure's
                 #       dpi, the image must be scaled (dpi->_figdpi). Not all