From 227a6e4cf9338fcaf5878d7d6717cd33550b338c Mon Sep 17 00:00:00 2001 From: CeDeROM Date: Mon, 6 Feb 2017 17:15:55 +0100 Subject: [PATCH] Fixed remaining has_key() uses. --- iCeDeROM/interface/ftdi.py | 30 +++++++++++++++--------------- iCeDeROM/interface/ftdi_qt.py | 6 +++--- iCeDeROM/interface/interface.py | 6 +++--- iCeDeROM/interface/interface_qt.py | 6 +++--- iCeDeROM/memory/memory.py | 12 ++++++------ 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/iCeDeROM/interface/ftdi.py b/iCeDeROM/interface/ftdi.py index 07343b7..5a4a0c8 100644 --- a/iCeDeROM/interface/ftdi.py +++ b/iCeDeROM/interface/ftdi.py @@ -25,7 +25,7 @@ def __init__(self, **params): Note: Use Setup routine to connect to a physical Device. """ self.name = 'ftdi.uart' - if not params.has_key('iCeDeROM'): + if not 'iCeDeROM' in params: raise KeyError('iCeDeROM parameter reference mandatory!') self.iCeDeROM = params['iCeDeROM'] self.capabilities = ['uart'] @@ -56,40 +56,40 @@ def setup(self, **params): """ cfg = dict() try: - if params.has_key('vid'): + if 'vid' in params: if type(params['vid']) == type('a'): params['vid'] = int(params['vid'], base=16) self.devcfg['vid'] = params['vid'] if pylibftdi.USB_VID_LIST.count(params['vid']) == 0: pylibftdi.USB_VID_LIST.append(params['vid']) - if params.has_key('pid'): + if 'pid' in params: if type(params['pid']) == type('a'): params['pid'] = int(params['pid'], base=16) self.devcfg['pid'] = params['pid'] if pylibftdi.USB_PID_LIST.count(params['pid']) == 0: pylibftdi.USB_PID_LIST.append(params['pid']) - if params.has_key('serial'): + if 'serial' in params: if params['serial'] != '': cfg['device_id'] = params['serial'] - if params.has_key('channel'): + if 'channel' in params: cfg['interface_select'] = params['channel'] - if params.has_key('mode'): + if 'mode' in params: mode = params['mode'] if str(mode).lower()[0] == 't': cfg['mode'] = params['mode'] = 't' else: cfg['mode'] = params['mode'] = 'b' - if params.has_key('encoding'): + if 'encoding' in params: cfg['encoding'] = params['encoding'] - if params.has_key('index'): + if 'index' in params: index = int(params['index']) if index > 0: cfg['device_index'] = index - if params.has_key('interface'): + if 'interface' in params: cfg['interface_select'] = int(params['interface']) except: self.iCeDeROM.modules['log'].log.exception('Invalid FTDI UART configuration!') - if self.iCeDeROM.modules.has_key('gui'): + if 'gui' in self.iCeDeROM.modules: self.iCeDeROM.modules['gui'].dialogs['message'].critical( params['iCeDeROM'].modules['gui'].window, 'FTDI UART Interface', 'Invalid FTDI UART Interface confguration!') @@ -99,14 +99,14 @@ def setup(self, **params): self.device = pylibftdi.Device(**cfg) except: self.iCeDeROM.modules['log'].log.exception('FTDI UART Interface setup failed!') - if self.iCeDeROM.modules.has_key('gui'): + if 'gui' in self.iCeDeROM.modules: self.iCeDeROM.modules['gui'].dialogs['message'].critical( params['iCeDeROM'].modules['gui'].window, 'FTDI UART Interface', 'FTDI UART Interface setup failed!') return False - if params.has_key('mode'): + if 'mode' in params: self.devcfg['mode'] = params['mode'] - if params.has_key('baudrate'): + if 'baudrate' in params: self.devcfg['baudrate'] = int(params['baudrate']) self.device.baudrate = self.devcfg['baudrate'] self.iCeDeROM.modules['log'].log.info('FTDI UART Interface connected: vid=' + @@ -117,11 +117,11 @@ def setup(self, **params): self.iCeDeROM.modules['interface'].device = self def start(self, **params): - if self.ui.has_key('qt'): + if 'qt' in self.ui: self.ui['qt'].start(**params) def stop(self, **params): - if self.ui.has_key('qt'): + if 'qt' in self.ui: self.ui['qt'].stop(**params) def write(self, data): diff --git a/iCeDeROM/interface/ftdi_qt.py b/iCeDeROM/interface/ftdi_qt.py index dbe65b0..78b0006 100644 --- a/iCeDeROM/interface/ftdi_qt.py +++ b/iCeDeROM/interface/ftdi_qt.py @@ -19,7 +19,7 @@ class module(QtGui.QWidget): def __init__(self, **params): """Create QtWidget.""" self.name = 'ftdi.uart_qt' - if not params.has_key('iCeDeROM'): + if not 'iCeDeROM' in params: raise KeyError('iCeDeROM parameter reference mandatory!') if params['iCeDeROM'].ui != 'qt': raise RuntimeError('Interface QtWidget requires Qt GUI running!') @@ -34,7 +34,7 @@ def __init__(self, **params): self.defaults['interface'] = 'KT-LINK' self.devcfg = dict() self.parent = None - if params.has_key('parent'): self.parent = params['parent'] + if 'parent' in params: self.parent = params['parent'] self.createQtWidget(**params) def setup(self, **params): @@ -156,7 +156,7 @@ def addDevice(self, **params): Parameters: name is the name of interface module to add. """ - if not params.has_key('name'): + if not 'name' in params: raise KeyError('name parameter reference mandatory!') if self.iCeDeROM.ui != 'qt': raise RuntimeError('Interface QtWidget requires Qt GUI running!') diff --git a/iCeDeROM/interface/interface.py b/iCeDeROM/interface/interface.py index 2b313b5..44181a4 100644 --- a/iCeDeROM/interface/interface.py +++ b/iCeDeROM/interface/interface.py @@ -82,7 +82,7 @@ def load(self, **params): self.devices[params['name']] = __import__(params['name'], fromlist=['']).module(**params) self.devices[params['name']].parent = self self.iCeDeROM.modules['log'].log.debug('Added ' + params['name'] + ' interface device.') - if self.ui.has_key('qt'): + if 'qt' in self.ui: self.ui['qt'].stacks['config'].addWidget( self.devices[params['name']].ui['qt']) except: @@ -100,10 +100,10 @@ def setDefault(self, **params): Parameters: name is the name of interface to be selected as default. """ - if not params.has_key('name'): + if not 'name' in params: self.iCeDeROM.modules['log'].error('name parameter reference mandatory!') raise KeyError('name parameter reference mandatory!') - if self.devices.has_key(params['name']): + if params['name'] in self.devices: self.device = self.devices[params['name']] self.iCeDeROM.modules['gui'].labels['interface'].setText(self.device.name) self.iCeDeROM.modules['log'].log.info('Selected ' + params['name'] + ' as the default interface device.') diff --git a/iCeDeROM/interface/interface_qt.py b/iCeDeROM/interface/interface_qt.py index 61b16ed..b352734 100644 --- a/iCeDeROM/interface/interface_qt.py +++ b/iCeDeROM/interface/interface_qt.py @@ -79,7 +79,7 @@ def addDevice(self, **params): Parameters: name is the name of interface module to add. """ - if not params.has_key('name'): + if not 'name' in params: raise KeyError('name parameter reference mandatory!') if self.iCeDeROM.ui != 'qt': raise RuntimeError('Interface QtWidget requires Qt GUI running!') @@ -92,9 +92,9 @@ def select(self, **params): Parameters: name is the interface name to be selected. """ - if not params.has_key('name'): + if not 'name' in params: raise KeyError('name parameter reference mandatory!') - if self.iCeDeROM.modules['interface'].devices.has_key(params['name']): + if params['name'] in self.iCeDeROM.modules['interface'].devices: if self.device != None: self.device.stop() self.device = self.iCeDeROM.modules['interface'].devices[params['name']] diff --git a/iCeDeROM/memory/memory.py b/iCeDeROM/memory/memory.py index 32ef854..4b7dc9a 100644 --- a/iCeDeROM/memory/memory.py +++ b/iCeDeROM/memory/memory.py @@ -4,7 +4,7 @@ # # iCeDeROM: In-Circuit Evaluate Debug and Edit for Research on Microelectronics # Module 'Memory' (memory buffer module to store data). -# (C) 2015 Tomasz Bolesław CEDRO (http://www.tomek.cedro.info) +# (C) 2014-2017 CeDeROM Tomasz Bolesław CEDRO (http://www.tomek.cedro.info) # All rights reserved, so far :-) import io @@ -57,7 +57,7 @@ def fileOpen(self, filename=default_filename): self.buffer = io.open(filename, mode='a+', buffering=self.chunksize) self.size = self.buffer.seek(0, io.SEEK_END) self.filename = filename - if self.ui.has_key('qt'): + if 'qt' in self.ui: self.ui['qt'].window.statusBar().showMessage(str(self.filename)) except: self.iCeDeROM.modules['log'].log.exception('Error opening file!') @@ -76,23 +76,23 @@ def fileSave(self, filename): newbuffer.write(self.buffer.read()) except: self.iCeDeROM.modules['log'].log.exception('Error saving new file!') - if self.ui.has_key('qt'): + if 'qt' in self.ui: self.iCeDeROM.modules['gui'].dialogs['message'].warning( self.iCeDeROM.modules['gui'].window, 'Error', 'Error saving new file!\n' + str(self.filename)) self.buffer.close() self.buffer = newbuffer - if self.ui.has_key('qt'): + if 'qt' in self.ui: self.ui['qt'].window.statusBar().showMessage(str(self.filename)) def fileClose(self): try: self.buffer.close() - if self.ui.has_key('qt'): + if 'qt' in self.ui: self.ui['qt'].window.statusBar().showMessage('') except: self.iCeDeROM.modules['log'].log.exception('Error closing file!') - if self.ui.has_key('qt'): + if 'qt' in self.ui: self.iCeDeROM.modules['gui'].dialogs['message'].warning( self.iCeDeROM.modules['gui'].window, 'Error', 'Error closing file!\n' + str(self.filename))