Python3: use list comprehension

Replace map() + lambda expression to list comprehension
moreati · Jun 30, 2015 · f7db52b · f7db52b
1 parent 4e7cbdd
commit f7db52b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/smartcard/Examples/wx/apdumanager/SampleAPDUManagerPanel.py b/smartcard/Examples/wx/apdumanager/SampleAPDUManagerPanel.py
@@ -41,7 +41,7 @@
 ID_TEXT_SW2,
 ID_TEXTCTRL_SW2,
 ID_CARDSTATE,
-ID_TRANSMIT] = map(lambda x: wx.NewId(), range(11))
+ID_TRANSMIT] = [wx.NewId() for x in range(11)]
 
 
 class SampleAPDUManagerPanel(wx.Panel, SimpleSCardAppEventObserver):

diff --git a/smartcard/pcsc/PCSCCardConnection.py b/smartcard/pcsc/PCSCCardConnection.py
@@ -208,7 +208,7 @@ def doTransmit(self, bytes, protocol=None):
  sw1 = (response[-2] + 256) % 256
  sw2 = (response[-1] + 256) % 256
 
- data = map(lambda x: (x + 256) % 256, response[:-2])
+ data = [(x + 256) % 256 for x in response[:-2]]
  return list(data), sw1, sw2
 
  def doControl(self, controlCode, bytes=[]):
@@ -226,7 +226,7 @@ def doControl(self, controlCode, bytes=[]):
  raise SmartcardException(
  'Failed to control ' + SCardGetErrorMessage(hresult))
 
- data = map(lambda x: (x + 256) % 256, response)
+ data = [(x + 256) % 256 for x in response]
  return list(data)
 
  def doGetAttrib(self, attribId):

diff --git a/smartcard/test/framework/testcase_CardType.py b/smartcard/test/framework/testcase_CardType.py
@@ -99,7 +99,7 @@ def testcase_ATRCardTypeWithMask(self):
 
  for reader in readers():
  if [] != expectedATRinReader[str(reader)]:
- mask = map(lambda x: 0xFF, expectedATRinReader[str(reader)])
+ mask = [0xFF for x in expectedATRinReader[str(reader)]]
  # don't look to the last byte
  mask[-1] = 0x00
  ct = ATRCardType(expectedATRinReader[str(reader)], mask)
@@ -117,7 +117,7 @@ def testcase_ATRCardTypeWithMaskMismatch(self):
 
  for reader in readers():
  if [] != expectedATRinReader[str(reader)]:
- mask = map(lambda x: 0xFF, expectedATRinReader[str(reader)])
+ mask = [0xFF for x in expectedATRinReader[str(reader)]]
  # don't look to the last byte
  mask[0] = mask[-1] = 0x00
  ct = ATRCardType(expectedATRinReader[str(reader)], mask)

diff --git a/smartcard/wx/APDUTracerPanel.py b/smartcard/wx/APDUTracerPanel.py
@@ -30,7 +30,7 @@
 
 [
 wxID_APDUTEXTCTRL,
-] = map(lambda x: wx.NewId(), range(1))
+] = [wx.NewId() for x in range(1)]
 
 
 class APDUTracerPanel(wx.Panel, CardConnectionObserver):

diff --git a/smartcard/wx/SimpleSCardAppFrame.py b/smartcard/wx/SimpleSCardAppFrame.py
@@ -37,7 +37,7 @@
 
 [
 wxID_SIMPLESCARDAPP_FRAME,
-] = map(lambda x: wx.NewId(), range(1))
+] = [wx.NewId() for x in range(1)]
 
 
 class BlankPanel(wx.Panel, SimpleSCardAppEventObserver):