SF.net SVN: matplotlib:[6031] trunk/matplotlib/lib/matplotlib

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

Revision: 6031
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6031&view=rev
Author:   mdboom
Date:     2008-08-13 15:00:05 +0000 (Wed, 13 Aug 2008)

Log Message:
-----------
Raise ImportError rather than SystemExit --
that is, importing an improperly configured matplotlib should not quit the Python console.

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/__init__.py
    trunk/matplotlib/lib/matplotlib/backends/backend_cairo.py
    trunk/matplotlib/lib/matplotlib/backends/backend_gdk.py
    trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
    trunk/matplotlib/lib/matplotlib/finance.py

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2008-08-13 14:09:04 UTC (rev 6030)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2008-08-13 15:00:05 UTC (rev 6031)
@@ -144,12 +144,12 @@
 #else: _have_pkg_resources = True
 
 if not _python24:
-    raise SystemExit('matplotlib requires Python 2.4 or later')
+    raise ImportError('matplotlib requires Python 2.4 or later')
 
 import numpy
 nn = numpy.__version__.split('.')
 if not (int(nn[0]) >= 1 and int(nn[1]) >= 1):
-    raise SystemExit(
+    raise ImportError(
             'numpy 1.1 or later is required; you have %s' % numpy.__version__)
 
 def is_string_like(obj):

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_cairo.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_cairo.py	2008-08-13 14:09:04 UTC (rev 6030)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_cairo.py	2008-08-13 15:00:05 UTC (rev 6031)
@@ -28,7 +28,7 @@
 import cairo
 _version_required = (1,2,0)
 if cairo.version_info < _version_required:
-   raise SystemExit ("Pycairo %d.%d.%d is installed\n"
+   raise ImportError ("Pycairo %d.%d.%d is installed\n"
                      "Pycairo %d.%d.%d or later is required"
                      % (cairo.version_info + _version_required))
 backend_version = cairo.version

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gdk.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_gdk.py	2008-08-13 14:09:04 UTC (rev 6030)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gdk.py	2008-08-13 15:00:05 UTC (rev 6031)
@@ -11,7 +11,7 @@
 import pango
 pygtk_version_required = (2,2,0)
 if gtk.pygtk_version < pygtk_version_required:
-    raise SystemExit ("PyGTK %d.%d.%d is installed\n"
+    raise ImportError ("PyGTK %d.%d.%d is installed\n"
                       "PyGTK %d.%d.%d or later is required"
                       % (gtk.pygtk_version + pygtk_version_required))
 del pygtk_version_required

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2008-08-13 14:09:04 UTC (rev 6030)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2008-08-13 15:00:05 UTC (rev 6031)
@@ -8,7 +8,7 @@
 import pango
 pygtk_version_required = (2,2,0)
 if gtk.pygtk_version < pygtk_version_required:
-    raise SystemExit ("PyGTK %d.%d.%d is installed\n"
+    raise ImportError ("PyGTK %d.%d.%d is installed\n"
                       "PyGTK %d.%d.%d or later is required"
                       % (gtk.pygtk_version + pygtk_version_required))
 del pygtk_version_required

Modified: trunk/matplotlib/lib/matplotlib/finance.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/finance.py	2008-08-13 14:09:04 UTC (rev 6030)
+++ trunk/matplotlib/lib/matplotlib/finance.py	2008-08-13 15:00:05 UTC (rev 6031)
@@ -14,7 +14,7 @@
 
 try: import datetime
 except ImportError:
-    raise SystemExit('The finance module requires datetime support (python2.3)')
+    raise ImportError('The finance module requires datetime support (python2.3)')
 
 import numpy as np
 
@@ -415,7 +415,7 @@
 
     # note this code assumes if any value open, close, low, high is
     # missing they all are missing
-    
+
     delta = width/2.
     barVerts = [ ( (i-delta, open), (i-delta, close), (i+delta, close), (i+delta, open) ) for i, open, close in zip(xrange(len(opens)), opens, closes) if open != -1 and close!=-1 ]
 


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