added popd

svn path=/trunk/matplotlib/; revision=715

Author: jdh2358

CHANGELOG

@@ -1,5 +1,8 @@
 New entries should be added at the top
 
+2004-11-25 Added Printf to mplutils for printf style format string
+           formatting in C++ (should help write better exceptions)
+
 2004-11-24 IMAGE_FORMAT: remove from agg and gtkagg backends as its no longer
            used - SC
 

lib/matplotlib/cbook.py

@@ -411,3 +411,14 @@ def allpairs(x):
     assert( not allequal(('a', 'b')))    
 
 
+def popd(d, *args):
+    if len(args)==1:
+        key = args[0]
+        val = d[key]
+        del d[key]
+    elif len(args)==2:
+        key, default = args
+        val = d.get(key, default)
+        try: del d[key]
+        except KeyError: pass
+    return val

src/_backend_agg.cpp

@@ -950,12 +950,8 @@ RendererAgg::write_png(const Py::Tuple& args)
   if (o.isString()) {
     std::string fileName = Py::String(o);
     const char *file_name = fileName.c_str();
-    if ((fp = fopen(file_name, "wb")) == NULL) {   
-      std::ostringstream os;
-      os << "Could not open file " << file_name;
+    if ((fp = fopen(file_name, "wb")) == NULL) 
       throw Py::RuntimeError( Printf("Could not open file %s", file_name).str() );
-    }
-    //fp = fopen(file_name, "wb");
   }
   else {
     if ((fp = PyFile_AsFile(o.ptr())) == NULL) 

src/_image.cpp

@@ -539,26 +539,26 @@ Image::write_png(const Py::Tuple& args)
 
   fp = fopen(file_name, "wb");
   if (fp == NULL) 
-    throw Py::RuntimeError("could not open file");
+    throw Py::RuntimeError(Printf("Could not open file %s", file_name).str());
 
 
   png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
   if (png_ptr == NULL) {
     fclose(fp);
-    throw Py::RuntimeError("could not create write struct");
+    throw Py::RuntimeError("Could not create write struct");
   }
 
   info_ptr = png_create_info_struct(png_ptr);
   if (info_ptr == NULL) {
     fclose(fp);
     png_destroy_write_struct(&png_ptr, &info_ptr);
-    throw Py::RuntimeError("could not create info struct");
+    throw Py::RuntimeError("Could not create info struct");
   }
 
   if (setjmp(png_ptr->jmpbuf)) {
     fclose(fp);
     png_destroy_write_struct(&png_ptr, &info_ptr);
-    throw Py::RuntimeError("error building image");
+    throw Py::RuntimeError("Error building image");
   }
 
   png_init_io(png_ptr, fp);
@@ -726,7 +726,7 @@ _image_module::readpng(const Py::Tuple& args) {
 
   FILE *fp = fopen(fname.c_str(), "rb");
   if (!fp)
-    throw Py::RuntimeError("_image_module::readpng could not open PNG file for reading");
+    throw Py::RuntimeError(Printf("_image_module::readpng could not open PNG file %s for reading", fname.c_str()).str());
 
   fread(header, 1, 8, fp);
   if (png_sig_cmp(header, 0, 8))
@@ -879,7 +879,7 @@ _image_module::fromarray(const Py::Tuple& args) {
 
     if (A->dimensions[2] != 3 && A->dimensions[2] != 4 ) {
       Py_XDECREF(A);  
-      throw Py::ValueError("3rd dimension must be length 3 (RGB) or 4 (RGBA)"); 
+      throw Py::ValueError(Printf("3rd dimension must be length 3 (RGB) or 4 (RGBA); found %d", A->dimensions[2]).str()); 
 
     }
 

src/ft2font.cpp

@@ -488,13 +488,13 @@ FT2Font::load_char(const Py::Tuple & args) {
   int error = FT_Load_Char( face, (unsigned long)charcode, FT_LOAD_DEFAULT);
 
   if (error)
-    throw Py::RuntimeError("Could not load charcode");
+    throw Py::RuntimeError(Printf("Could not load charcode %d", charcode).str());
 
   FT_Glyph thisGlyph;
   error = FT_Get_Glyph( face->glyph, &thisGlyph );
 
   if (error)
-    throw Py::RuntimeError("Could not get glyph for char");
+    throw Py::RuntimeError(Printf("Could not get glyph for char %d", charcode).str());
 
   size_t num = glyphs.size();  //the index into the glyphs list
   glyphs.push_back(thisGlyph);
@@ -615,7 +615,7 @@ FT2Font::draw_rect(const Py::Tuple & args) {
   if ( x0<0 || y0<0 || x1<0 || y1<0 || 
        x0>iwidth || x1>iwidth ||
        y0>iheight || y1>iheight ) 
-    throw Py::ValueError("rect coords outside image bounds");
+    throw Py::ValueError("Rect coords outside image bounds");
 
   for (long i=x0; i<x1; ++i) {
     image.buffer[i + y0*iwidth] = 255;
@@ -774,7 +774,7 @@ FT2Font::get_glyph_name(const Py::Tuple & args) {
 
   char buffer[128];
   if (FT_Get_Glyph_Name(face, (FT_UInt) Py::Int(args[0]), buffer, 128))
-    Py::RuntimeError("Could not get glyph names.");
+    throw Py::RuntimeError("Could not get glyph names.");
   return Py::String(buffer);
 }