SC 28/11/2004

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

Author: Steve Chaplin

lib/matplotlib/backends/backend_cairo.py

@@ -17,8 +17,6 @@
 Requires (in order, all available from Cairo website):
     libpixman, cairo, pycairo
 
-cairo, pycairo from cvs fom Nov 06 2004 onwards are required
-
 Naming Conventions
   * classes MixedUpperCase
   * varables lowerUpper
@@ -43,14 +41,12 @@ def _fn_name(): return sys._getframe(1).f_code.co_name
 
 import cairo
 
-# version checking - enable when snapsnot released
-# version_required = (0,1,2)
-# if cairo.version_info < version_required:
-#    raise SystemExit ("PyCairo %d.%d.%d is installed\n"
-#                      "PyCairo %d.%d.%d or later is required"
-#                      % (cairo.version_info + version_required))
-# backend_version = cairo.version
-backend_version = 'unknown'
+version_required = (0,1,3)
+if cairo.version_info < version_required:
+   raise SystemExit ("PyCairo %d.%d.%d is installed\n"
+                     "PyCairo %d.%d.%d or later is required"
+                     % (cairo.version_info + version_required))
+backend_version = cairo.version
 
 
 DEBUG = False

lib/matplotlib/backends/backend_gtkcairo.py

@@ -8,8 +8,7 @@
 import cairo
 import cairo.gtk
 
-backend_version = 'PyGTK(%s),PyCairo(%s)' % ("%d.%d.%d" % gtk.pygtk_version, 'unknown')
-#backend_version = 'PyGTK(%d.%d.%d),PyCairo(%s)' % (gtk.pygtk_version, cairo.version)
+backend_version = 'PyGTK(%d.%d.%d),PyCairo(%d.%d.%d)' % (gtk.pygtk_version + cairo.version_info)
 
 DEBUG = False