Fix import of typing extensions (#59)

* Fix import of typing extensions

* Fix log message

* Use string type for python 3.6 compatibility

* Add newer python versions to setup.py

Author: hackermd

setup.py

@@ -33,6 +33,8 @@
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Development Status :: 4 - Beta',
     ],
     entry_points={

src/dicomweb_client/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.54.2'
+__version__ = '0.54.3rc'
 
 from dicomweb_client.api import DICOMwebClient, DICOMfileClient
 from dicomweb_client.protocol import DICOMClient

src/dicomweb_client/file.py

@@ -724,7 +724,7 @@ def __getstate__(self) -> dict:
     def _connection(self) -> sqlite3.Connection:
         """sqlite3.Connection: database connection"""
         if self._db_connection is None:
-            self._db_connection = sqlite3.connect(self._db_filepath)
+            self._db_connection = sqlite3.connect(str(self._db_filepath))
             self._db_connection.row_factory = sqlite3.Row
         return self._db_connection
 

src/dicomweb_client/protocol.py

@@ -1,15 +1,18 @@
+import sys
 from typing import (
     Any,
     Dict,
     Iterator,
     List,
     Optional,
-    Protocol,
-    runtime_checkable,
     Sequence,
     Tuple,
     Union,
 )
+if sys.version_info.minor < 8:
+    from typing_extensions import Protocol, runtime_checkable
+else:
+    from typing import Protocol, runtime_checkable
 
 from pydicom.dataset import Dataset
 

src/dicomweb_client/web.py

@@ -2094,7 +2094,9 @@ def search_for_series(
         """  # noqa: E501
         if study_instance_uid is not None:
             self._assert_uid_format(study_instance_uid)
-        logger.info(f'search for series of study "{study_instance_uid}"')
+            logger.info(f'search for series of study "{study_instance_uid}"')
+        else:
+            logger.info('search for series')
         url = self._get_series_url(_Transaction.SEARCH, study_instance_uid)
         params = self._parse_qido_query_parameters(
             fuzzymatching, limit, offset, fields, search_filters