New upstream version 0.9.0+dfsg

5 files changed, 14 insertions, 11 deletions

diff --git a/silx/gui/fit/FitConfig.py b/silx/gui/fit/FitConfig.py
index 04e411b..479e469 100644
--- a/silx/gui/fit/FitConfig.py
+++ b/silx/gui/fit/FitConfig.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 # /*##########################################################################
-# Copyright (C) 2004-2016 V.A. Sole, European Synchrotron Radiation Facility
+# Copyright (C) 2004-2018 V.A. Sole, European Synchrotron Radiation Facility
 #
 # This file is part of the PyMca X-ray Fluorescence Toolkit developed at
 # the ESRF by the Software group.
@@ -60,7 +60,7 @@ class TabsDialog(qt.QDialog):
         # layout2.addWidget(self.buttonHelp)
 
         self.buttonDefault = qt.QPushButton(self)
-        self.buttonDefault.setText("Default")
+        self.buttonDefault.setText("Undo changes")
         layout2.addWidget(self.buttonDefault)
 
         spacer = qt.QSpacerItem(20, 20,
@@ -138,7 +138,7 @@ class TabsDialogData(TabsDialog):
 
         self.default = {} if default is None else default
 
-        self.buttonDefault.clicked.connect(self.setDefault)
+        self.buttonDefault.clicked.connect(self._resetDefault)
         # self.keyPressEvent(qt.Qt.Key_Enter).
 
     def keyPressEvent(self, event):
@@ -174,6 +174,9 @@ class TabsDialogData(TabsDialog):
         self.setDefault()
         super(TabsDialogData, self).reject()
 
+    def _resetDefault(self, checked):
+        self.setDefault()
+
     def setDefault(self, newdefault=None):
         """Reinitialize :attr:`output` with :attr:`default` or with
         new dictionary ``newdefault`` if provided.
diff --git a/silx/gui/fit/FitWidget.py b/silx/gui/fit/FitWidget.py
index 7012b63..78230b1 100644
--- a/silx/gui/fit/FitWidget.py
+++ b/silx/gui/fit/FitWidget.py
@@ -38,7 +38,7 @@ be user defined, or by default are loaded from
 
 __authors__ = ["V.A. Sole", "P. Knobel"]
 __license__ = "MIT"
-__date__ = "15/02/2017"
+__date__ = "17/07/2018"
 
 import logging
 import sys
@@ -315,8 +315,8 @@ class FitWidget(qt.QWidget):
         configuration.update(self.configure())
 
     def setdata(self, x, y, sigmay=None, xmin=None, xmax=None):
-        warnings.warn("Method renamed to setData",
-                      DeprecationWarning)
+        warnings.warning("Method renamed to setData",
+                         DeprecationWarning)
         self.setData(x, y, sigmay, xmin, xmax)
 
     def setData(self, x, y, sigmay=None, xmin=None, xmax=None):
@@ -525,8 +525,8 @@ class FitWidget(qt.QWidget):
         self._emitSignal(ddict)
 
     def startfit(self):
-        warnings.warn("Method renamed to startFit",
-                      DeprecationWarning)
+        warnings.warning("Method renamed to startFit",
+                         DeprecationWarning)
         self.startFit()
 
     def startFit(self):
diff --git a/silx/gui/fit/test/testBackgroundWidget.py b/silx/gui/fit/test/testBackgroundWidget.py
index 2e366e4..03b17b9 100644
--- a/silx/gui/fit/test/testBackgroundWidget.py
+++ b/silx/gui/fit/test/testBackgroundWidget.py
@@ -24,7 +24,7 @@
 # ###########################################################################*/
 import unittest
 
-from ...test.utils import TestCaseQt
+from silx.gui.utils.testutils import TestCaseQt
 
 from .. import BackgroundWidget
 
diff --git a/silx/gui/fit/test/testFitConfig.py b/silx/gui/fit/test/testFitConfig.py
index eea35cc..f89c099 100644
--- a/silx/gui/fit/test/testFitConfig.py
+++ b/silx/gui/fit/test/testFitConfig.py
@@ -30,7 +30,7 @@ __date__ = "05/12/2016"
 
 import unittest
 
-from ...test.utils import TestCaseQt
+from silx.gui.utils.testutils import TestCaseQt
 from .. import FitConfig
 
 
diff --git a/silx/gui/fit/test/testFitWidget.py b/silx/gui/fit/test/testFitWidget.py
index d542fd0..cfd2bc9 100644
--- a/silx/gui/fit/test/testFitWidget.py
+++ b/silx/gui/fit/test/testFitWidget.py
@@ -26,7 +26,7 @@
 
 import unittest
 
-from ...test.utils import TestCaseQt
+from silx.gui.utils.testutils import TestCaseQt
 
 from ... import qt
 from .. import FitWidget