From 33072bf70e8a107718e4af6dd038025af3ab9f46 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 17 Sep 2023 13:38:51 +0530
Subject: [PATCH] ...

---
 src/calibre/db/tests/notes.py         | 8 ++++----
 src/calibre/gui2/book_details.py      | 3 +--
 src/calibre/gui2/dialogs/book_info.py | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/calibre/db/tests/notes.py b/src/calibre/db/tests/notes.py
index 4e13c95c70..a03aa4a99b 100644
--- a/src/calibre/db/tests/notes.py
+++ b/src/calibre/db/tests/notes.py
@@ -6,6 +6,7 @@ import os
 import shutil
 import tempfile
 import time
+from operator import itemgetter
 
 from calibre.db.tests.base import BaseTest
 from calibre.utils.resources import get_image_path
@@ -135,6 +136,7 @@ def test_cache_api(self: 'NotesTest'):
         note_id = cache.import_note('authors', author_id, f.name)
         self.assertGreater(note_id, 0)
         self.assertIn('<p>test simple exim <img', cache.notes_for('authors', author_id))
+        res = tuple(cache.get_notes_resource(x) for x in cache.notes_resources_used_by('authors', author_id))
         exported = cache.export_note('authors', author_id)
         self.assertIn('<p>test simple exim <img src="', exported)
         from html5_parser import parse
@@ -147,10 +149,8 @@ def test_cache_api(self: 'NotesTest'):
         note_id = cache.import_note('authors', author_id, f.name)
         self.assertGreater(note_id, 0)
         self.assertIn('<p>test simple exim <img', cache.notes_for('authors', author_id))
-        res = set()
-        for x in cache.notes_resources_used_by('authors', author_id):
-            res.add(cache.get_notes_resource(x)['name'])
-        self.ae(res, {'r 1.png', 'r 2.png'})
+        res2 = tuple(cache.get_notes_resource(x) for x in cache.notes_resources_used_by('authors', author_id))
+        self.ae(sorted(res, key=itemgetter('name')), sorted(res2, key=itemgetter('name')))
 
 
 def test_fts(self: 'NotesTest'):
diff --git a/src/calibre/gui2/book_details.py b/src/calibre/gui2/book_details.py
index bfeabb8315..dd693ebee8 100644
--- a/src/calibre/gui2/book_details.py
+++ b/src/calibre/gui2/book_details.py
@@ -16,8 +16,7 @@ from qt.core import (
 
 from calibre import fit_image, sanitize_file_name
 from calibre.constants import config_dir, iswindows
-from calibre.db.constants import DATA_DIR_NAME, DATA_FILE_PATTERN
-from calibre.db.notes.connect import RESOURCE_URL_SCHEME
+from calibre.db.constants import DATA_DIR_NAME, DATA_FILE_PATTERN, RESOURCE_URL_SCHEME
 from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.ebooks.metadata.book.base import Metadata, field_metadata
 from calibre.ebooks.metadata.book.render import mi_to_html
diff --git a/src/calibre/gui2/dialogs/book_info.py b/src/calibre/gui2/dialogs/book_info.py
index 6dcb36c7bc..913d21fd0b 100644
--- a/src/calibre/gui2/dialogs/book_info.py
+++ b/src/calibre/gui2/dialogs/book_info.py
@@ -12,7 +12,7 @@ from qt.core import (
 )
 
 from calibre import fit_image
-from calibre.db.notes.connect import RESOURCE_URL_SCHEME
+from calibre.db.constants import RESOURCE_URL_SCHEME
 from calibre.gui2 import NO_URL_FORMATTING, gprefs
 from calibre.gui2.book_details import (
     create_open_cover_with_menu, resolved_css, details_context_menu_event, render_html, set_html,