summaryrefslogtreecommitdiff
path: root/silx/gui/widgets
diff options
context:
space:
mode:
authorPicca Frédéric-Emmanuel <picca@debian.org>2021-09-07 14:39:36 +0200
committerPicca Frédéric-Emmanuel <picca@debian.org>2021-09-07 14:39:36 +0200
commitd3194b1a9c4404ba93afac43d97172ab24c57098 (patch)
treea1604130e1401dc1cbd084518ed72869dc92b86f /silx/gui/widgets
parentb3bea947efa55d2c0f198b6c6795b3177be27f45 (diff)
New upstream version 0.15.2+dfsg
Diffstat (limited to 'silx/gui/widgets')
-rw-r--r--silx/gui/widgets/FlowLayout.py2
-rw-r--r--silx/gui/widgets/UrlSelectionTable.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/silx/gui/widgets/FlowLayout.py b/silx/gui/widgets/FlowLayout.py
index 14c8ab2..3c4c9dd 100644
--- a/silx/gui/widgets/FlowLayout.py
+++ b/silx/gui/widgets/FlowLayout.py
@@ -71,7 +71,7 @@ class FlowLayout(qt.QLayout):
return None
def expandingDirections(self):
- return 0
+ return qt.Qt.Orientations()
def hasHeightForWidth(self):
return True
diff --git a/silx/gui/widgets/UrlSelectionTable.py b/silx/gui/widgets/UrlSelectionTable.py
index 27ea363..fb15edd 100644
--- a/silx/gui/widgets/UrlSelectionTable.py
+++ b/silx/gui/widgets/UrlSelectionTable.py
@@ -1,5 +1,5 @@
# /*##########################################################################
-# Copyright (C) 2017 European Synchrotron Radiation Facility
+# Copyright (C) 2017-2021 European Synchrotron Radiation Facility
#
# This file is part of the PyMca X-ray Fluorescence Toolkit developed at
# the ESRF by the Software group.
@@ -37,7 +37,7 @@ import functools
import logging
import os
-logger = logging.getLogger(__file__)
+logger = logging.getLogger(__name__)
class UrlSelectionTable(TableWidget):