Skip to content

Commit aafc518

Browse files
committed
Used 'entry_points' from 'backports.entry_points_selectable' instead
1 parent 36efb6f commit aafc518

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/murfey/server/__init__.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import math
66
import os
77
import subprocess
8-
import sys
98
import time
109
from datetime import datetime
1110
from functools import partial, singledispatch
@@ -57,17 +56,14 @@
5756
from murfey.server.ispyb import TransportManager # Session
5857
except AttributeError:
5958
pass
59+
from backports.entry_points_selectable import entry_points
60+
from importlib_metadata import EntryPoint # For type hinting only
61+
6062
import murfey.util.db as db
6163
from murfey.util import LogFilter
6264
from murfey.util.spa_params import default_spa_parameters
6365
from murfey.util.state import global_state
6466

65-
# Import entry_points depending on Python version
66-
if sys.version_info < (3, 10):
67-
from importlib_metadata import EntryPoint, entry_points
68-
else:
69-
from importlib.metadata import EntryPoint, entry_points
70-
7167
try:
7268
from importlib.resources import files # type: ignore
7369
except ImportError:

0 commit comments

Comments
 (0)