diff options
Diffstat (limited to 'src/sardana/tango')
| -rw-r--r-- | src/sardana/tango/core/util.py | 2 | ||||
| -rw-r--r-- | src/sardana/tango/macroserver/MacroServer.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sardana/tango/core/util.py b/src/sardana/tango/core/util.py index 939c3711..6bda8b82 100644 --- a/src/sardana/tango/core/util.py +++ b/src/sardana/tango/core/util.py @@ -57,13 +57,13 @@ from PyTango import Util, Database, WAttribute, DbDevInfo, DevFailed, \ import taurus from taurus.core.util.log import Logger -from taurus.core.util.wrap import wraps import sardana from sardana import State, SardanaServer, DataType, DataFormat, InvalidId, \ DataAccess, to_dtype_dformat, to_daccess, Release, ServerRunMode from sardana.sardanaexception import SardanaException from sardana.sardanavalue import SardanaValue +from sardana.util.wrap import wraps from sardana.pool.poolmetacontroller import DataInfo diff --git a/src/sardana/tango/macroserver/MacroServer.py b/src/sardana/tango/macroserver/MacroServer.py index 704780eb..4d8b9748 100644 --- a/src/sardana/tango/macroserver/MacroServer.py +++ b/src/sardana/tango/macroserver/MacroServer.py @@ -347,7 +347,7 @@ class MacroServerClass(SardanaDeviceClass): [10] ], 'EnvironmentDb': [DevString, - "The environment database (usualy a plain file).", + "The environment database (usually a plain file).", os.path.join(DefaultEnvBaseDir, DefaultEnvRelDir) ], 'RConsolePort': [DevLong, |