diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index feacf98..040f1c8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -31,6 +31,7 @@ Fixed
hangs/weird behaviour)
* Fixed an intermittent crash when invoking New Scene
* Fixed bee files hanging on to disk space of deleted images (issue #99)
+* Fixing Drag @ Drop from pinterest feed (by Randommist)
diff --git a/beeref/fileio/image.py b/beeref/fileio/image.py
index a38619d..da9c04b 100644
--- a/beeref/fileio/image.py
+++ b/beeref/fileio/image.py
@@ -22,8 +22,8 @@ from urllib import parse, request
from PyQt6 import QtGui
import exif
-import plum
from lxml import etree
+import plum
logger = logging.getLogger(__name__)
diff --git a/tests/fileio/test_image.py b/tests/fileio/test_image.py
index 432a55f..63f130a 100644
--- a/tests/fileio/test_image.py
+++ b/tests/fileio/test_image.py
@@ -122,3 +122,65 @@ def test_load_image_loads_from_web_url_errors(view, imgfilename3x3):
img, filename = load_image(QtCore.QUrl(url))
assert img.isNull() is True
assert filename == url
+
+
+@httpretty.activate
+def test_load_image_from_pinterest_finds_image(view, imgdata3x3):
+ url = 'http://pinterest.com/a1b2c3/'
+ img_url = 'http://pinterest.com/foo.png'
+ httpretty.register_uri(
+ httpretty.GET,
+ url,
+ body=f'
',
+ )
+ httpretty.register_uri(
+ httpretty.GET,
+ img_url,
+ body=imgdata3x3,
+ )
+ img, filename = load_image(QtCore.QUrl(url))
+ assert img.isNull() is False
+ assert filename == img_url
+
+
+@httpretty.activate
+def test_load_image_from_pinterest_when_already_image(view, imgdata3x3):
+ img_url = 'http://pinterest.com/foo.png'
+ httpretty.register_uri(
+ httpretty.GET,
+ img_url,
+ body=imgdata3x3,
+ )
+ img, filename = load_image(QtCore.QUrl(img_url))
+ assert img.isNull() is False
+ assert filename == img_url
+
+
+@httpretty.activate
+def test_load_image_from_pinterest_when_img_url_not_found(view, imgdata3x3):
+ url = 'http://pinterest.com/a1b2c3/'
+ img_url = 'http://pinterest.com/foo.png'
+ httpretty.register_uri(
+ httpretty.GET,
+ url,
+ body='no image here
',
+ )
+ httpretty.register_uri(
+ httpretty.GET,
+ img_url,
+ body=imgdata3x3,
+ )
+ img, filename = load_image(QtCore.QUrl(url))
+ assert img.isNull() is True
+
+
+@httpretty.activate
+def test_load_image_from_pinterest_when_url_errors(view, imgdata3x3):
+ url = 'http://pinterest.com/a1b2c3/'
+ httpretty.register_uri(
+ httpretty.GET,
+ url,
+ status=500,
+ )
+ img, filename = load_image(QtCore.QUrl(url))
+ assert img.isNull() is True