SF.net SVN: matplotlib: [5109] trunk/matplotlib

[<md...@us...>]

Revision: 5109
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5109&view=rev
Author:   mdboom
Date:     2008-05-02 10:21:27 -0700 (Fri, 02 May 2008)

Log Message:
-----------
Merged revisions 5106-5108 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_91_maint

........
  r5107 | mdboom | 2008-05-02 13:05:19 -0400 (Fri, 02 May 2008) | 2 lines
  
  Don't call sys.exit() when pyemf is not found.
........
  r5108 | mdboom | 2008-05-02 13:20:38 -0400 (Fri, 02 May 2008) | 2 lines
  
  Fix build error with PyQt <= 3.14 [1851364] - MGD
........

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/backends/backend_emf.py
    trunk/matplotlib/setupext.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/v0_91_maint:1-5105
   + /branches/v0_91_maint:1-5108

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008-05-02 17:20:38 UTC (rev 5108)
+++ trunk/matplotlib/CHANGELOG	2008-05-02 17:21:27 UTC (rev 5109)
@@ -1,3 +1,9 @@
+2008-05-02 On PyQt <= 3.14 there is no way to determine the underlying
+           Qt version. [1851364] - MGD
+
+2008-05-02 Don't call sys.exit() when pyemf is not found [1924199] -
+           MGD
+
 2008-05-02 Update _subprocess.c from upstream Python 2.5.2 to get a
            few memory and reference-counting-related bugfixes.  See
            bug 1949978. - MGD

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_emf.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_emf.py	2008-05-02 17:20:38 UTC (rev 5108)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_emf.py	2008-05-02 17:21:27 UTC (rev 5109)
@@ -8,9 +8,7 @@
 try:
     import pyemf
 except ImportError:
-    import sys
-    print >>sys.stderr, 'You must first install pyemf from http://pyemf.sf.net'
-    sys.exit()
+    raise ImportError('You must first install pyemf from http://pyemf.sf.net')
 
 import os,sys,math,re
 
@@ -600,7 +598,7 @@
         pass
 
     filetypes = {'emf': 'Enhanced Metafile'}
-    
+
     def print_emf(self, filename, dpi=300, **kwargs):
         width, height = self.figure.get_size_inches()
         renderer = RendererEMF(filename,width,height,dpi)
@@ -609,7 +607,7 @@
 
     def get_default_filetype(self):
         return 'emf'
-        
+
 class FigureManagerEMF(FigureManagerBase):
     """
     Wrap everything up into a window for the pylab interface

Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py	2008-05-02 17:20:38 UTC (rev 5108)
+++ trunk/matplotlib/setupext.py	2008-05-02 17:21:27 UTC (rev 5109)
@@ -351,8 +351,13 @@
         print_status("Qt", "no")
         return False
     else:
+        try:
+            qt_version = pyqtconfig.Configuration().qt_version
+            qt_version = convert_qt_version(qt_version)
+        except AttributeError:
+            qt_version = "<unknown>"
         print_status("Qt", "Qt: %s, PyQt: %s" %
-                     (convert_qt_version(pyqtconfig.Configuration().qt_version),
+                     (qt_version,
                       pyqtconfig.Configuration().pyqt_version_str))
         return True
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.