minor fixes

Author: anon

qubesadmin/device_protocol.py

@@ -29,26 +29,27 @@
 should be moved to one place.
 """
 
+from __future__ import annotations
 
 import string
 import sys
+import typing
 from enum import Enum
 from typing import Optional, Any
 from collections.abc import Callable
 
 import qubesadmin.exc
 from qubesadmin.exc import QubesValueError
 
+if typing.TYPE_CHECKING:
+    from qubesadmin.vm import QubesVM
+
 
 class ProtocolError(AssertionError):
     """
     Raised when something is wrong with data received.
     """
 
-
-QubesVM = 'qubesadmin.vm.QubesVM'
-
-
 class UnexpectedDeviceProperty(qubesadmin.exc.QubesException, ValueError):
     """
     Device has unexpected property such as backend_domain, devclass etc.

qubesadmin/tests/tools/qvm_template.py

@@ -5474,7 +5474,7 @@ def test_240_qubes_release(self, mock_exists):
             self.assertEqual(mock_exists.mock_calls, [
                 mock.call('/usr/share/qubes/marker-vm')
             ])
-            mock_open.assert_called_with('/etc/os-release', 'r',
+            mock_open.assert_called_with('/etc/os-release',
                                          encoding='ascii')
         self.assertAllCalled()
 
@@ -5499,7 +5499,7 @@ def test_241_qubes_release_quotes(self, mock_exists):
             self.assertEqual(mock_exists.mock_calls, [
                 mock.call('/usr/share/qubes/marker-vm')
             ])
-            mock_open.assert_called_with('/etc/os-release', 'r',
+            mock_open.assert_called_with('/etc/os-release',
                                          encoding='ascii')
         self.assertAllCalled()
 
@@ -5519,7 +5519,7 @@ def test_242_qubes_release_quotes(self, mock_exists):
             self.assertEqual(mock_exists.mock_calls, [
                 mock.call('/usr/share/qubes/marker-vm')
             ])
-            mock_open.assert_called_with('/usr/share/qubes/marker-vm', 'r',
+            mock_open.assert_called_with('/usr/share/qubes/marker-vm',
                                          encoding='ascii')
         self.assertAllCalled()