rename get_drag_enter_paths to drag_drop_paths

msl/qt/io.py

@@ -14,7 +14,7 @@
 )
 
 __all__ = (
-    'get_drag_enter_paths',
+    'drag_drop_paths',
     'get_icon',
     'icon_to_base64',
     'rescale_icon',
@@ -266,13 +266,13 @@ def icon_to_base64(icon, *, fmt='png'):
     return array.toBase64()
 
 
-def get_drag_enter_paths(event, *, pattern=None):
-    """Returns the list of file paths from a :class:`QtGui.QDragEnterEvent`.
+def drag_drop_paths(event, *, pattern=None):
+    """Returns the list of file paths from a drag-enter or drop event.
 
     Parameters
     ----------
-    event : :class:`QtGui.QDragEnterEvent`
-        A drag-enter event.
+    event : :class:`QtGui.QDragEnterEvent` or :class:`QtGui.QDropEvent`
+        A drag-enter or drop event.
     pattern : :class:`str`, optional
         Include only the file paths that match the `pattern`. For example,
         to only include JPEG or JPG image files use ``'*.jp*g'``.
@@ -286,7 +286,7 @@ def get_drag_enter_paths(event, *, pattern=None):
     """
     if event.mimeData().hasUrls():
         urls = event.mimeData().urls()
-        paths = [str(url.toLocalFile()) for url in urls if url.isValid() and url.scheme() == 'file']
+        paths = [url.toLocalFile() for url in urls if url.isValid() and url.scheme() == 'file']
         if pattern is None:
             return paths
         return fnmatch.filter(paths, pattern)

tests/test_io.py

@@ -178,7 +178,7 @@ def test_drag_enter_paths():
     mime = QtCore.QMimeData()
 
     event = QtGui.QDragEnterEvent(QtCore.QPoint(0, 0), Qt.CopyAction, mime, Qt.LeftButton, Qt.NoModifier)
-    paths = io.get_drag_enter_paths(event)
+    paths = io.drag_drop_paths(event)
     assert len(paths) == 0
 
     url1 = QtCore.QUrl('/path/to/image.jpeg')
@@ -198,17 +198,17 @@ def test_drag_enter_paths():
     mime.setUrls([url1, url2, url3, url4, url5])
     event = QtGui.QDragEnterEvent(QtCore.QPoint(0, 0), Qt.CopyAction, mime, Qt.LeftButton, Qt.NoModifier)
 
-    paths = io.get_drag_enter_paths(event)
+    paths = io.drag_drop_paths(event)
     assert len(paths) == 3
     assert '/path/to/image.jpeg' in paths
     assert '/path/to/image.png' in paths
     assert '/path/to/image2.jpg' in paths
 
-    paths = io.get_drag_enter_paths(event, pattern='*.jp*g')
+    paths = io.drag_drop_paths(event, pattern='*.jp*g')
     assert len(paths) == 2
     assert '/path/to/image.jpeg' in paths
     assert '/path/to/image2.jpg' in paths
 
-    paths = io.get_drag_enter_paths(event, pattern='*.png')
+    paths = io.drag_drop_paths(event, pattern='*.png')
     assert len(paths) == 1
     assert '/path/to/image.png' in paths