Merge fix

This commit is contained in:
Philip Ridout 2017-08-10 07:28:30 +01:00
parent 469e7f3bb6
commit 5d99c48fe0
1 changed files with 2 additions and 3 deletions

View File

@ -20,7 +20,6 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
""" Patch the QFileDialog so it accepts and returns Path objects""" """ Patch the QFileDialog so it accepts and returns Path objects"""
from functools import wraps
from pathlib import Path from pathlib import Path
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
@ -73,7 +72,7 @@ class FileDialog(QtWidgets.QFileDialog):
@classmethod @classmethod
def getOpenFileNames(cls, *args, **kwargs): def getOpenFileNames(cls, *args, **kwargs):
""" """
Wrap `getOpenFileNames` so that it can be called with, and return Path objects Wraps `getOpenFileNames` so that it can be called with, and return Path objects
:type parent: QtWidgets.QWidget or None :type parent: QtWidgets.QWidget or None
:type caption: str :type caption: str
@ -95,7 +94,7 @@ class FileDialog(QtWidgets.QFileDialog):
@classmethod @classmethod
def getSaveFileName(cls, *args, **kwargs): def getSaveFileName(cls, *args, **kwargs):
""" """
Wrap `getSaveFileName` so that it can be called with, and return Path objects Wraps `getSaveFileName` so that it can be called with, and return Path objects
:type parent: QtWidgets.QWidget or None :type parent: QtWidgets.QWidget or None
:type caption: str :type caption: str