diff options
23 files changed, 40 insertions, 52 deletions
diff --git a/sardanaConfig/src/wizards/add_device_wizard.py b/sardanaConfig/src/wizards/add_device_wizard.py index 927e7bbf..3870fc2d 100644 --- a/sardanaConfig/src/wizards/add_device_wizard.py +++ b/sardanaConfig/src/wizards/add_device_wizard.py @@ -688,8 +688,7 @@ class NewDeviceBasePage(wiz.SardanaBasePage): self.model.addRecord(["Controller", PoolElementType[ item.get_controller_type()], item.get_name()], item, False) - elementTypeList = PoolElementType.keys() - elementTypeList.sort() + elementTypeList = sorted(PoolElementType.keys()) for type in elementTypeList: self.model.addNodes([type], False) for item in controllers: @@ -777,7 +776,7 @@ class NewDeviceBasePage(wiz.SardanaBasePage): self._currentItem = self.picked() self._currentItemIndex = self._treeView.currentIndex() - if type(self._currentItem) == taurus.core.tango.sardana.sardana.ControllerClassInfo: + if isinstance(self._currentItem, taurus.core.tango.sardana.sardana.ControllerClassInfo): self._gridLayout_2.addWidget(self._settings) self._settings.setVisible(True) @@ -799,7 +798,7 @@ class NewDeviceBasePage(wiz.SardanaBasePage): self.picked().get_description()) self._description.setImage(None) - if type(self._currentItem) == taurus.core.tango.sardana.sardana.ControllerInfo: + if isinstance(self._currentItem, taurus.core.tango.sardana.sardana.ControllerInfo): self._gridLayout_2.removeWidget(self._settings) self._settings.setVisible(False) @@ -951,9 +950,9 @@ class DescriptionWidget(QtGui.QWidget): self._descriptionLabelText.setText(text) def setImage(self, image): - if type(image) == QtGui.QPixmap: + if isinstance(image, QtGui.QPixmap): self._deviceLogo.setPixmap(image.scaled(*self._imageSize)) - elif type(image) == QtGui.QImage: + elif isinstance(image, QtGui.QImage): self._deviceLogo.setPixmap( QtGui.QPixmap().fromImage(image).scaled(*self._imageSize)) else: diff --git a/scripts/upgrade/upgrade_utils.py b/scripts/upgrade/upgrade_utils.py index 2248a52f..b9b09f80 100644 --- a/scripts/upgrade/upgrade_utils.py +++ b/scripts/upgrade/upgrade_utils.py @@ -99,7 +99,7 @@ def get_supported_upgrades(): continue m = imp.load_module(mod_name, *imp.find_module(mod_name)) for s in m.__dict__.values(): - if type(s) == type(Upgrade): + if isinstance(s, type(Upgrade)): if s == Upgrade: continue if issubclass(s, Upgrade): diff --git a/src/sardana/macroserver/macro.py b/src/sardana/macroserver/macro.py index cee93699..271cc1a4 100644 --- a/src/sardana/macroserver/macro.py +++ b/src/sardana/macroserver/macro.py @@ -1501,8 +1501,7 @@ class Macro(Logger): objects :rtype: seq<:class:`~sardana.macroserver.msmetamacro.MacroClass` /:class:`~sardana.macroserver.msmetamacro.MacroFunction`\>""" - ret = self.door.get_macros(filter=filter).values() - ret.sort() + ret = sorted(self.door.get_macros(filter=filter).values()) return ret @mAPI @@ -1518,8 +1517,7 @@ class Macro(Logger): a sequence of :class:`~sardana.macroserver.msmetamacro.MacroLibrary` objects :rtype: seq<:class:`~sardana.macroserver.msmetamacro.MacroLibrary`\>""" - ret = self.door.get_macro_libs(filter=filter).values() - ret.sort() + ret = sorted(self.door.get_macro_libs(filter=filter).values()) return ret @mAPI @@ -2271,7 +2269,7 @@ class Macro(Logger): # If macro returns a generator then running the macro means go through # the generator steps, otherwise the macro has already ran - if type(res) == types.GeneratorType: + if isinstance(res, types.GeneratorType): it = iter(res) for i in it: if operator.isMappingType(i): diff --git a/src/sardana/macroserver/macros/scan.py b/src/sardana/macroserver/macros/scan.py index e395c5b8..4c599116 100644 --- a/src/sardana/macroserver/macros/scan.py +++ b/src/sardana/macroserver/macros/scan.py @@ -967,7 +967,7 @@ class scanhist(Macro): user = h['user'] store = "Not stored!" if scan_dir is not None and scan_file is not None: - if type(scan_file) is str: + if isinstance(scan_file, str): store = os.path.join(scan_dir, scan_file) else: store = scan_dir + os.path.sep + str(scan_file) diff --git a/src/sardana/macroserver/macros/standard.py b/src/sardana/macroserver/macros/standard.py index ccfec625..cf23c4b5 100644 --- a/src/sardana/macroserver/macros/standard.py +++ b/src/sardana/macroserver/macros/standard.py @@ -153,8 +153,7 @@ class _wum(Macro): motor_width = 9 motor_names = [] motor_pos = [] - motor_list = list(motor_list) - motor_list.sort() + motor_list = sorted(motor_list) for motor in motor_list: name = motor.getName() motor_names.append([name]) diff --git a/src/sardana/macroserver/msparameter.py b/src/sardana/macroserver/msparameter.py index 751526c2..f0422c89 100644 --- a/src/sardana/macroserver/msparameter.py +++ b/src/sardana/macroserver/msparameter.py @@ -397,7 +397,7 @@ class ParamDecoder: else: value = raw_param # None or [] indicates default value - if value is None or (type(value) == list and len(value) == 0): + if value is None or (isinstance(value, list) and len(value) == 0): value = param_def['default_value'] if value is None: raise MissingParam, "'%s' not specified" % name diff --git a/src/sardana/macroserver/recorders/storage.py b/src/sardana/macroserver/recorders/storage.py index b2ce94d6..0aa4b4a5 100644 --- a/src/sardana/macroserver/recorders/storage.py +++ b/src/sardana/macroserver/recorders/storage.py @@ -135,8 +135,7 @@ class FIO_FileRecorder(BaseFileRecorder): self.fd.flush() env = self.macro.getAllEnv() if env.has_key('FlagFioWriteMotorPositions') and env['FlagFioWriteMotorPositions']: - all_motors = self.macro.findObjs('.*', type_class=Type.Motor) - all_motors.sort() + all_motors = sorted(self.macro.findObjs('.*', type_class=Type.Motor)) for mot in all_motors: pos = mot.getPosition(force=True) if pos is None: diff --git a/src/sardana/pool/controller.py b/src/sardana/pool/controller.py index eb3fcee5..7b674907 100644 --- a/src/sardana/pool/controller.py +++ b/src/sardana/pool/controller.py @@ -1097,7 +1097,7 @@ class PseudoController(Controller): elem = local_cache.get(index_or_role) if elem is None: pool = self._getPoolController().pool - if type(index_or_role) == int: + if isinstance(index_or_role, int): index = index_or_role role = roles[index] else: diff --git a/src/sardana/pool/pool.py b/src/sardana/pool/pool.py index 783d546e..5151e4d4 100644 --- a/src/sardana/pool/pool.py +++ b/src/sardana/pool/pool.py @@ -521,7 +521,7 @@ class Pool(PoolContainer, PoolObject, SardanaElementManager, SardanaIDManager): self.check_element(name, full_name) for elem_id in elem_ids: - if type(elem_id) is int: + if isinstance(elem_id, int): self.pool.get_element(id=elem_id) else: tg_attr_validator = TangoAttributeNameValidator() diff --git a/src/sardana/pool/poolbasegroup.py b/src/sardana/pool/poolbasegroup.py index 8928c5d0..14fc67de 100644 --- a/src/sardana/pool/poolbasegroup.py +++ b/src/sardana/pool/poolbasegroup.py @@ -158,7 +158,7 @@ class PoolBaseGroup(PoolContainer): pool = self._get_pool() for user_element_id in self._user_element_ids: # an internal element - internal = type(user_element_id) is int + internal = isinstance(user_element_id, int) if internal: try: user_element = pool.get_element(id=user_element_id) diff --git a/src/sardana/pool/poolcontrollermanager.py b/src/sardana/pool/poolcontrollermanager.py index ce6e0879..b07f1184 100644 --- a/src/sardana/pool/poolcontrollermanager.py +++ b/src/sardana/pool/poolcontrollermanager.py @@ -492,9 +492,8 @@ class ControllerManager(Singleton, Logger): return sorted(self._controller_dict.values()) expr = re.compile(filter, re.IGNORECASE) - ret = [kls for n, kls in self._controller_dict.iteritems() - if not expr.match(n) is None] - ret.sort() + ret = sorted([kls for n, kls in self._controller_dict.iteritems() + if not expr.match(n) is None]) return ret def getControllerMetaClass(self, controller_name): diff --git a/src/sardana/pool/poolmeasurementgroup.py b/src/sardana/pool/poolmeasurementgroup.py index fc34fc1c..0993cfe2 100644 --- a/src/sardana/pool/poolmeasurementgroup.py +++ b/src/sardana/pool/poolmeasurementgroup.py @@ -502,7 +502,7 @@ class PoolMeasurementGroup(PoolGroupElement): g_timer, g_monitor = cfg['timer'], cfg['monitor'] for ctrl, ctrl_data in cfg['controllers'].items(): # skip external channels - if type(ctrl) is str: + if isinstance(ctrl, str): continue # telling controller in which acquisition mode it will participate ctrl.set_ctrl_par('acquisition_mode', self.acquisition_mode) diff --git a/src/sardana/sardanadefs.py b/src/sardana/sardanadefs.py index 3b045216..ca8f003e 100644 --- a/src/sardana/sardanadefs.py +++ b/src/sardana/sardanadefs.py @@ -239,14 +239,14 @@ def to_dtype_dformat(data): elif operator.isSequenceType(data): dformat = DataFormat.OneD dtype = data[0] - if type(dtype) == str: + if isinstance(dtype, str): dtype, dformat2 = from_dtype_str(dtype) if dformat2 == DataFormat.OneD: dformat = DataFormat.TwoD elif operator.isSequenceType(dtype): dformat = DataFormat.TwoD dtype = dtype[0] - if type(dtype) == str: + if isinstance(dtype, str): dtype, _ = from_dtype_str(dtype) dtype = DTYPE_MAP.get(dtype, DataType.Invalid) return dtype, dformat diff --git a/src/sardana/sardanamanager.py b/src/sardana/sardanamanager.py index a4afd9b7..96e749b3 100644 --- a/src/sardana/sardanamanager.py +++ b/src/sardana/sardanamanager.py @@ -91,6 +91,6 @@ class SardanaIDManager(object): :param id: the ID to be reserved :type id: int""" - assert type(nid) == int + assert isinstance(nid, int) if nid > self._last_id: self._last_id = nid diff --git a/src/sardana/sardanamodulemanager.py b/src/sardana/sardanamodulemanager.py index 8ad2b7ff..f69cec2d 100755 --- a/src/sardana/sardanamodulemanager.py +++ b/src/sardana/sardanamodulemanager.py @@ -305,6 +305,5 @@ class ModuleManager(Singleton, Logger): return m def getModuleNames(self): - module_names = self._modules.keys() - module_names.sort() + module_names = sorted(self._modules.keys()) return module_names diff --git a/src/sardana/taurus/core/tango/sardana/macroserver.py b/src/sardana/taurus/core/tango/sardana/macroserver.py index bea38ad2..9f2445bf 100755 --- a/src/sardana/taurus/core/tango/sardana/macroserver.py +++ b/src/sardana/taurus/core/tango/sardana/macroserver.py @@ -1212,7 +1212,7 @@ class BaseMacroServer(MacroServerDevice): paramNode.setMax(max) paramNode.setDescription(str(paramInfo.get("description"))) - if type(paramType) == list: + if isinstance(paramType, list): paramNode.setParamsInfo(paramType) for repeatNode in paramNode.children(): for internalParamNode, internalParamInfo in zip(repeatNode.children(), paramType): diff --git a/src/sardana/taurus/qt/qtgui/extra_macroexecutor/common.py b/src/sardana/taurus/qt/qtgui/extra_macroexecutor/common.py index dc87a093..e036c7d3 100644 --- a/src/sardana/taurus/qt/qtgui/extra_macroexecutor/common.py +++ b/src/sardana/taurus/qt/qtgui/extra_macroexecutor/common.py @@ -57,8 +57,7 @@ class MSAttrListComboBox(TaurusAttrListComboBox): parentModelObj = self.getParentModelObj() if parentModelObj is None: return - items = parentModelObj.getElementNamesWithInterface(self._elementType) - items.sort() + items = sorted(parentModelObj.getElementNamesWithInterface(self._elementType)) self.addItems(items) if text in items: self.setCurrentText(text) @@ -110,8 +109,7 @@ class MacroComboBox(Qt.QComboBox, TaurusBaseWidget): if ms is None: return macros = ms.getElementsWithInterface('MacroCode') - macroNames = [macro.name for macro in macros.values()] - macroNames.sort() + macroNames = sorted([macro.name for macro in macros.values()]) macroNames.insert(0, '') # adding blank item self.addItems(macroNames) self.updateStyle() diff --git a/src/sardana/taurus/qt/qtgui/extra_pool/poolioregister.py b/src/sardana/taurus/qt/qtgui/extra_pool/poolioregister.py index c54095f2..f1a04fad 100644 --- a/src/sardana/taurus/qt/qtgui/extra_pool/poolioregister.py +++ b/src/sardana/taurus/qt/qtgui/extra_pool/poolioregister.py @@ -80,8 +80,7 @@ class PoolIORegisterReadWidget(TaurusLabel): try: display_value = int(self.getDisplayValue()) extended_tooltip = '' - value_keys = self.readEventValueMap.keys() - value_keys.sort() + value_keys = sorted(self.readEventValueMap.keys()) for value in value_keys: label = self.readEventValueMap[value] value_label_info = '%d: %s' % (value, label) diff --git a/src/sardana/taurus/qt/qtgui/extra_sardana/macrotree.py b/src/sardana/taurus/qt/qtgui/extra_sardana/macrotree.py index 4c55726d..bb017155 100644 --- a/src/sardana/taurus/qt/qtgui/extra_sardana/macrotree.py +++ b/src/sardana/taurus/qt/qtgui/extra_sardana/macrotree.py @@ -212,8 +212,7 @@ class MacroPlainMacroModel(MacroBaseModel): return root = self._rootItem macro_dict = ms.getMacros() - macros = macro_dict.keys() - macros.sort() + macros = sorted(macro_dict.keys()) self.debug("Found %d macros", len(macros)) for macro_name in macros: macro = macro_dict[macro_name] diff --git a/src/sardana/taurus/qt/qtgui/extra_sardana/sardanaeditor.py b/src/sardana/taurus/qt/qtgui/extra_sardana/sardanaeditor.py index eb81b170..13f1fb8a 100755 --- a/src/sardana/taurus/qt/qtgui/extra_sardana/sardanaeditor.py +++ b/src/sardana/taurus/qt/qtgui/extra_sardana/sardanaeditor.py @@ -254,8 +254,7 @@ class SardanaEditor(TaurusBaseEditor, TaurusBaseWidget): msg = "Please select the library where you want to place the new macro" macro_libraries = macro_server.getElementsOfType("MacroLibrary") - macro_lib_names = macro_libraries.keys() - macro_lib_names.sort() + macro_lib_names = sorted(macro_libraries.keys()) macro_lib_name, ok = Qt.QInputDialog.getItem(self, "Macro library", msg, macro_lib_names, current=0, editable=False) if not ok: diff --git a/src/sardana/tools/config/pexpect23.py b/src/sardana/tools/config/pexpect23.py index 6f734967..efe15809 100644 --- a/src/sardana/tools/config/pexpect23.py +++ b/src/sardana/tools/config/pexpect23.py @@ -232,7 +232,7 @@ def run(command, timeout=-1, withexitstatus=False, events=None, extra_args=None, responses = None child_result_list = [] event_count = 0 - while 1: + while True: try: index = child.expect(patterns) if type(child.after) in types.StringTypes: @@ -241,7 +241,7 @@ def run(command, timeout=-1, withexitstatus=False, events=None, extra_args=None, child_result_list.append(child.before) if type(responses[index]) in types.StringTypes: child.send(responses[index]) - elif type(responses[index]) is types.FunctionType: + elif isinstance(responses[index], types.FunctionType): callback_result = responses[index](locals()) sys.stdout.flush() if type(callback_result) in types.StringTypes: @@ -510,11 +510,11 @@ class spawn (object): # that performs some task; creates no stdout output; and then dies. # If command is an int type then it may represent a file descriptor. - if type(command) == type(0): + if isinstance(command, type(0)): raise ExceptionPexpect( 'Command is an int type. If this is a file descriptor then maybe you want to use fdpexpect.fdspawn which takes an existing file descriptor instead of a command string.') - if type(args) != type([]): + if not isinstance(args, type([])): raise TypeError('The argument, args, must be a list.') if args == []: @@ -1216,7 +1216,7 @@ class spawn (object): if patterns is None: return [] - if type(patterns) is not types.ListType: + if not isinstance(patterns, types.ListType): patterns = [patterns] compile_flags = re.DOTALL # Allow dot to match \n @@ -1230,7 +1230,7 @@ class spawn (object): compiled_pattern_list.append(EOF) elif p is TIMEOUT: compiled_pattern_list.append(TIMEOUT) - elif type(p) is type(re.compile('')): + elif isinstance(p, type(re.compile(''))): compiled_pattern_list.append(p) else: raise TypeError( diff --git a/src/sardana/tools/config/sardana.py b/src/sardana/tools/config/sardana.py index 60b7affe..ca2bf161 100644 --- a/src/sardana/tools/config/sardana.py +++ b/src/sardana/tools/config/sardana.py @@ -580,7 +580,7 @@ class TangoServer: def run(self, step=True, timeout=0): """Run""" - while 1: + while True: self._proc.run(timeout=timeout) if step: return @@ -1827,7 +1827,7 @@ class Sardana: servs = self._getServsStartupOrder() self.o("Running ") count = 0 - while 1: + while True: count += 1 if count % 10 == 0: self.o(":") diff --git a/test/poolunittest.py b/test/poolunittest.py index 835b1da8..e5671542 100644 --- a/test/poolunittest.py +++ b/test/poolunittest.py @@ -697,7 +697,7 @@ class PoolTestCase(unittest.TestCase): "Was not able to grab Pool output") self.pool_start_time = time.time() - while 1: + while True: delta_time = time.time() - self.pool_start_time self.failIf(delta_time >= PoolTestCase.PoolMaxStartupTime, @@ -747,7 +747,7 @@ class PoolTestCase(unittest.TestCase): "Was not able to grab Motor Simulator output") self.motsim_start_time = time.time() - while 1: + while True: delta_time = time.time() - self.motsim_start_time self.failIf(delta_time >= PoolTestCase.MotorSimulatorMaxStartupTime, @@ -799,7 +799,7 @@ class PoolTestCase(unittest.TestCase): "Was not able to grab CounterTimer Simulator output") self.ctsim_start_time = time.time() - while 1: + while True: delta_time = time.time() - self.ctsim_start_time self.failIf(delta_time >= PoolTestCase.CounterTimerSimulatorMaxStartupTime, |