Merge branch 'v1.0.x'

Author: ddale

CHANGELOG

@@ -1,3 +1,8 @@
+2011-03-29 Wrapped ViewVCCachedServer definition in a factory function.
+           This class now inherits from urllib2.HTTPSHandler in order
+           to fetch data from github, but HTTPSHandler is not defined
+           if python was built without SSL support. - DSD
+
 2011-03-10 Update pytz version to 2011c, thanks to Simon Cross. - JKS
 
 2011-03-06 Add standalone tests.py test runner script. - JKS

lib/matplotlib/backends/backend_qt4.py

@@ -15,7 +15,13 @@
 from matplotlib.figure import Figure
 from matplotlib.mathtext import MathTextParser
 from matplotlib.widgets import SubplotTool
-import matplotlib.backends.qt4_editor.figureoptions as figureoptions
+try:
+    import matplotlib.backends.qt4_editor.figureoptions as figureoptions
+except ImportError:
+    figureoptions = None
+figureoptions = None
+
+print figureoptions
 
 try:
     from PyQt4 import QtCore, QtGui
@@ -429,9 +435,10 @@ def _init_toolbar(self):
                 self.configure_subplots)
         a.setToolTip('Configure subplots')
 
-        a = self.addAction(self._icon("qt4_editor_options.svg"),
-                           'Customize', self.edit_parameters)
-        a.setToolTip('Edit curves line and axes parameters')
+        if figureoptions is not None:
+            a = self.addAction(self._icon("qt4_editor_options.svg"),
+                               'Customize', self.edit_parameters)
+            a.setToolTip('Edit curves line and axes parameters')
 
         a = self.addAction(self._icon('filesave.svg'), 'Save',
                 self.save_figure)
@@ -456,34 +463,35 @@ def _init_toolbar(self):
         # reference holder for subplots_adjust window
         self.adj_window = None
 
-    def edit_parameters(self):
-        allaxes = self.canvas.figure.get_axes()
-        if len(allaxes) == 1:
-            axes = allaxes[0]
-        else:
-            titles = []
-            for axes in allaxes:
-                title = axes.get_title()
-                ylabel = axes.get_ylabel()
-                if title:
-                    text = title
-                    if ylabel:
-                        text += ": "+ylabel
-                    text += " (%s)"
-                elif ylabel:
-                    text = "%%s (%s)" % ylabel
-                else:
-                    text = "%s"
-                titles.append(text % repr(axes))
-            item, ok = QtGui.QInputDialog.getItem(self, 'Customize',
-                                                  'Select axes:', titles,
-                                                  0, False)
-            if ok:
-                axes = allaxes[titles.index(unicode(item))]
+    if figureoptions is not None:
+        def edit_parameters(self):
+            allaxes = self.canvas.figure.get_axes()
+            if len(allaxes) == 1:
+                axes = allaxes[0]
             else:
-                return
+                titles = []
+                for axes in allaxes:
+                    title = axes.get_title()
+                    ylabel = axes.get_ylabel()
+                    if title:
+                        text = title
+                        if ylabel:
+                            text += ": "+ylabel
+                        text += " (%s)"
+                    elif ylabel:
+                        text = "%%s (%s)" % ylabel
+                    else:
+                        text = "%s"
+                    titles.append(text % repr(axes))
+                item, ok = QtGui.QInputDialog.getItem(self, 'Customize',
+                                                      'Select axes:', titles,
+                                                      0, False)
+                if ok:
+                    axes = allaxes[titles.index(unicode(item))]
+                else:
+                    return
 
-        figureoptions.figure_edit(axes, self)
+            figureoptions.figure_edit(axes, self)
 
 
     def dynamic_update( self ):