Merge branch 'develop' into pyqtgraph-core

exporters/ImageExporter.py

@@ -1,6 +1,6 @@
 from .Exporter import Exporter
 from ..parametertree import Parameter
-from ..Qt import QtGui, QtCore, QtSvg, USE_PYSIDE\
+from ..Qt import QtGui, QtCore, QtSvg, USE_PYSIDE
 from .. import functions as fn
 import numpy as np
 
@@ -99,4 +99,4 @@ class ImageExporter(Exporter):
             self.png.save(fileName)
         
 ImageExporter.register()        
-        
+        

exporters/Matplotlib.py

@@ -62,9 +62,9 @@ MatplotlibExporter.register()
 
 class MatplotlibWindow(QtGui.QMainWindow):
     def __init__(self):
-        from .. import widgets.MatplotlibWidget
+        from ..widgets import MatplotlibWidget
         QtGui.QMainWindow.__init__(self)
-        self.mpl = pyqtgraph.widgets.MatplotlibWidget.MatplotlibWidget()
+        self.mpl = MatplotlibWidget.MatplotlibWidget()
         self.setCentralWidget(self.mpl)
         self.show()