Skip to content

Commit 83b2468

Browse files
authored
Merge pull request PyMoDAQ#540 from PyMoDAQ/feature/backcompat_v4_v5
backcompatibility
2 parents 90c53ad + 82c4ff9 commit 83b2468

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

src/pymodaq/daq_utils/__init__.py

Whitespace-only changes.

src/pymodaq/daq_utils/daq_utils.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from pymodaq_utils import utils as daq_utils
2+
3+
from pymodaq_utils.warnings import deprecation_msg
4+
5+
deprecation_msg('Importing daq_utils stuff from pymodaq is deprecated in pymodaq>5.0.0,'
6+
'please use the pymodaq_utils.utils module')

src/pymodaq/utils/daq_utils.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
import platform
66
from pathlib import Path
77

8-
from pymodaq_utils import logger as logger_module
98
from pymodaq_utils.config import Config
10-
from pymodaq_utils.utils import get_entrypoints, ThreadCommand, getLineInfo
9+
from pymodaq_utils.utils import get_entrypoints, ThreadCommand, getLineInfo, find_keys_from_val, is_64bits, timer # for backcompat
10+
from pymodaq_utils.logger import set_logger, get_module_name # for backcompat
11+
12+
from pymodaq.utils.data import DataFromPlugins # for backcompat
1113

1214
from pymodaq.utils.config import get_set_preset_path
1315

@@ -18,7 +20,7 @@
1820
from functools import lru_cache as cache
1921

2022

21-
logger = logger_module.set_logger(logger_module.get_module_name(__file__))
23+
logger = set_logger(get_module_name(__file__))
2224

2325
config = Config()
2426

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
from pymodaq_gui.utils.widgets.lcd import LCD
2+
3+
from pymodaq_utils.warnings import deprecation_msg
4+
5+
deprecation_msg('Importing LCD from pymodaq is deprecated '
6+
'in pymodaq>5.0.0,'
7+
'please use the same method from the '
8+
'pymodaq_gui.utils.widgets.lcd module')

0 commit comments

Comments
 (0)