'SC'

Steve Chaplin · Steve Chaplin · commit 75b8009946fe · 2005-07-23T06:25:55.000Z
svn path=/trunk/matplotlib/; revision=1555
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 New entries should be added at the top
 
+2005-07-23 backend_gtk.py: removed pygtk.require()
+           matplotlib/__init__.py: delete 'FROZEN' and 'MPLError' which are 
+           no longer used - SC
+
 2005-07-22 backend_gdk.py: removed pygtk.require() - SC
 
 2005-07-21 backend_svg.py: Remove unused imports. Remove methods doc strings
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -985,18 +985,3 @@ def tk_window_focus():
 verbose.report('interactive is %s'%rcParams['interactive'])
 verbose.report('platform is %s'%sys.platform)
 verbose.report('loaded modules: %s'%sys.modules.keys(), 'debug')
-
-# True if we are running under Py2EXE (or similar)
-FROZEN = hasattr(sys, 'frozen')
-
-
-class MPLError (Exception):
-    """Exception for Matplotlib errors
-    Attributes:
-        message -- explanation of the error
-    """
-    def __init__ (self, message):
-        self.message = message
-
-    def __str__ (self):
-        return self.message
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -4,45 +4,31 @@
 import sys
 def fn_name(): return sys._getframe(1).f_code.co_name
 
-import matplotlib
-from matplotlib import verbose, MPLError
+import gobject
+import gtk; gdk = gtk.gdk
+import pango
+pygtk_version_required = (2,0,0)
+if gtk.pygtk_version < pygtk_version_required:
+    raise SystemExit ("PyGTK %d.%d.%d is installed\n"
+                      "PyGTK %d.%d.%d or later is required"
+                      % (gtk.pygtk_version + pygtk_version_required))
+backend_version = "%d.%d.%d" % gtk.pygtk_version
+del pygtk_version_required
 
+import matplotlib
+from matplotlib import verbose
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
      FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors
+from matplotlib.backends.backend_gdk import RendererGDK
 from matplotlib.cbook import is_string_like, enumerate
 from matplotlib.figure import Figure
 from matplotlib.font_manager import fontManager
+import matplotlib.numerix as numerix
 from matplotlib.numerix import asarray, fromstring, UInt8, zeros, \
      where, transpose, nonzero, indices, ones, nx
-import matplotlib.numerix as numerix
 from matplotlib.widgets import SubplotTool
 
-from backend_gdk import RendererGDK
-
-
-pygtk_version_required = (2,0,0)
-try:
-    import pygtk
-    if not matplotlib.FROZEN:
-        pygtk.require('2.0')
-except:
-    print >> sys.stderr, sys.exc_info()[1]
-    raise SystemExit('PyGTK version %d.%d.%d or greater is required to run '
-                     'the GTK Matplotlib backends'
-                     % pygtk_version_required)
-
-import gobject
-import gtk; gdk = gtk.gdk
-import pango
-
-if gtk.pygtk_version < pygtk_version_required:
-    raise SystemExit ("PyGTK %d.%d.%d is installed\n"
-                      "PyGTK %d.%d.%d or later is required"
-                      % (gtk.pygtk_version + pygtk_version_required))
-backend_version = "%d.%d.%d" % gtk.pygtk_version
-del pygtk_version_required
-
 
 _debug = False
 #_debug = True
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -1,8 +1,10 @@
 from __future__ import division
-import os, math
+import math
+import os
 import sys
+
 import matplotlib
-from matplotlib import verbose, MPLError
+from matplotlib import verbose
 from matplotlib.numerix import asarray, fromstring, UInt8, zeros, \
      where, transpose, nonzero, indices, ones, nx
 import matplotlib.numerix as numerix
