[Pcsclite-cvs-commit] r3342 - in /website: matrix.py readers.ini readers.txt

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Tue Mar 10 10:09:40 UTC 2009 

Author: rousseau
Date: Tue Mar 10 10:09:40 2009
New Revision: 3342

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3342
Log:
use ConfigParser to parse the reader list

Added:
    website/readers.ini   (contents, props changed)
      - copied, changed from r3341, website/readers.txt
Removed:
    website/readers.txt
Modified:
    website/matrix.py

Modified: website/matrix.py
URL: http://svn.debian.org/wsvn/pcsclite/website/matrix.py?rev=3342&op=diff
==============================================================================
--- website/matrix.py (original)
+++ website/matrix.py Tue Mar 10 10:09:40 2009
@@ -19,6 +19,7 @@
 
 import glob
 import os
+import ConfigParser
 
 def parse_reader(path, reader):
     """
@@ -70,13 +71,12 @@
 
 if __name__ == "__main__":
     # one foobar.txt per line
-    list = "readers.txt"
+    list = "readers.ini"
     path = "../trunk/Drivers/ccid/readers/"
 
-    list_file = open(list)
-    # remove trailing \n
-    reader_list = [ r.rstrip('\n') for r in list_file.readlines() ]
-    list_file.close()
+    config = ConfigParser.ConfigParser()
+    config.read(list)
+    reader_list = config.sections()
 
     check_list(path, reader_list)
     readers = parse_all(path, reader_list)

Copied: website/readers.ini (from r3341, website/readers.txt)
URL: http://svn.debian.org/wsvn/pcsclite/website/readers.ini?rev=3342&op=diff
==============================================================================
--- website/readers.txt (original)
+++ website/readers.ini Tue Mar 10 10:09:40 2009
@@ -1,125 +1,125 @@
-ACR122U_PICC.txt
-ACR122U.txt
-ACR38U-CCID.txt
-ACS_ACR100.txt
-ACS_ACR38_plugin.txt
-ActivCardV2.txt
-ActivCardV3.txt
-ActivkeySim.txt
-Aktiv_Rutoken_Magistra.txt
-Aladdin_eToken_PRO_USB_72K_Java.txt
-Alya.txt
-ASEDrive_IIIe_KB.txt
-ASE_IIIe.txt
-ATMEL_AT91SO.txt
-ATMEL_AT98SC032CT.txt
-AU9520.txt
-AxaltoV3.txt
-BludriveII.txt
-Broadcom_5880.txt
-C3PO_KBR36.txt
-C3PO_LTC32_USBv2_old.txt
-C3PO_LTC32_USBv2.txt
-C3PO_TLTC2USB.txt
-CardMan1021.txt
-CardMan3021.txt
-CardMan3121.txt
-CardMan3621.txt
-CardMan3821.txt
-CardMan4321.txt
-CardMan5121.txt
-CardMan5125.txt
-CardMan5321.txt
-CardMan6121.txt
-Charismathics.txt
-CherrySmartBoardXX1X.txt
-CherrySmartTerminalST2XXX.txt
-CherrySmartTerminalXX1X.txt
-CherryST1044U.txt
-CherryXX33.txt
-CherryXX44.txt
-CL1356T.txt
-CryptoIdentity.txt
-DellSCRK.txt
-DellSK-3106.txt
-e-gate.txt
-Eutron_CryptoIdentity.txt
-Eutron_Digipass_860.txt
-Eutron_Smart_Pocket.txt
-FujitsuSiemens_SmartCard_Keyboard_USB_2A.txt
-FujitsuSiemens_SmartCard_USB_2A.txt
-Gemalto_PDT.txt
-GemaltoSmartEnterpriseGuardian.txt
-GemCoreSIMPro.txt
-Gem_e-SealPro.txt
-GemPC433_SL.txt
-GemPC_Express.txt
-GemPCKey.txt
-GemPCPinpad.txt
-GemPCTwin.txt
-GnD_StarSignCardToken350.txt
-GnD_StarSignCardToken550.txt
-HP_MFP_SmartCardReader.txt
-HPUSBSmartCardKeyboard.txt
-HPUSBSmartCardReader.txt
-id3_CL1356A_HID.txt
-id3_CL1356D.txt
-iDream.txt
-iMONO.txt
-JCOP41V221.txt
-jNet_jToken_s1.txt
-KAAN_Advanced.txt
-KAAN_Base.txt
-KAAN_SIM_III.txt
-KEBTechnology_KONA_USB_SmartCard.txt
-Kobil_EMV_CAP.txt
-Lenovo.txt
-LTC31.txt
-LTC31v2.txt
-LTC32.txt
-mIDentity.txt
-mIDentityXL.txt
-MSI_StarReader_SMART.txt
-MySmartPad.txt
-Neowave_Weneo.txt
-Oberthur-CosmoCard.txt
-Omnikey_noname1.txt
-Oz776_7772.txt
-Oz776S.txt
-Philips_SmartMX.txt
-Precise_200_MC.txt
-Precise_250_MC.txt
-ReinerSCT.txt
-SCR3310.txt
-SCR3311.txt
-SCR331-DI-NTTCom.txt
-SCR331-DI.txt
-SCR331.txt
-SCR3320.txt
-SCR333.txt
-SCR3340.txt
-SCR335.txt
-SCR355.txt
-SDI010.txt
-sid800.txt
-SIM_Pocket_Combo.txt
-Sitecom_MD-010.txt
-SPR532.txt
-SpringCard_CrazyWriter.txt
-SpringCard_CSB6_Basic.txt
-SpringCard_CSB6_Secure.txt
-SpringCard_CSB6_Ultimate.txt
-SpringCard_EasyFinger_Standard.txt
-SpringCard_EasyFinger_Ultimate.txt
-SpringCard_Prox_N_Roll.txt
-Teo.txt
-TianYu_CCID_SmartKey.txt
-Validy_TokenA.txt
-Vasco_DP905.txt
-Vega-Alpha.txt
-Verisign_secure_storage_token.txt
-Verisign_secure_token.txt
-VMware_Virtual_USB_CCID.txt
-Winbond.txt
-Xiring_XI-SIGN_6000.txt
-Xiring_XI-SIGN.txt
+[ACR122U_PICC.txt]
+[ACR122U.txt]
+[ACR38U-CCID.txt]
+[ACS_ACR100.txt]
+[ACS_ACR38_plugin.txt]
+[ActivCardV2.txt]
+[ActivCardV3.txt]
+[ActivkeySim.txt]
+[Aktiv_Rutoken_Magistra.txt]
+[Aladdin_eToken_PRO_USB_72K_Java.txt]
+[Alya.txt]
+[ASEDrive_IIIe_KB.txt]
+[ASE_IIIe.txt]
+[ATMEL_AT91SO.txt]
+[ATMEL_AT98SC032CT.txt]
+[AU9520.txt]
+[AxaltoV3.txt]
+[BludriveII.txt]
+[Broadcom_5880.txt]
+[C3PO_KBR36.txt]
+[C3PO_LTC32_USBv2_old.txt]
+[C3PO_LTC32_USBv2.txt]
+[C3PO_TLTC2USB.txt]
+[CardMan1021.txt]
+[CardMan3021.txt]
+[CardMan3121.txt]
+[CardMan3621.txt]
+[CardMan3821.txt]
+[CardMan4321.txt]
+[CardMan5121.txt]
+[CardMan5125.txt]
+[CardMan5321.txt]
+[CardMan6121.txt]
+[Charismathics.txt]
+[CherrySmartBoardXX1X.txt]
+[CherrySmartTerminalST2XXX.txt]
+[CherrySmartTerminalXX1X.txt]
+[CherryST1044U.txt]
+[CherryXX33.txt]
+[CherryXX44.txt]
+[CL1356T.txt]
+[CryptoIdentity.txt]
+[DellSCRK.txt]
+[DellSK-3106.txt]
+[e-gate.txt]
+[Eutron_CryptoIdentity.txt]
+[Eutron_Digipass_860.txt]
+[Eutron_Smart_Pocket.txt]
+[FujitsuSiemens_SmartCard_Keyboard_USB_2A.txt]
+[FujitsuSiemens_SmartCard_USB_2A.txt]
+[Gemalto_PDT.txt]
+[GemaltoSmartEnterpriseGuardian.txt]
+[GemCoreSIMPro.txt]
+[Gem_e-SealPro.txt]
+[GemPC433_SL.txt]
+[GemPC_Express.txt]
+[GemPCKey.txt]
+[GemPCPinpad.txt]
+[GemPCTwin.txt]
+[GnD_StarSignCardToken350.txt]
+[GnD_StarSignCardToken550.txt]
+[HP_MFP_SmartCardReader.txt]
+[HPUSBSmartCardKeyboard.txt]
+[HPUSBSmartCardReader.txt]
+[id3_CL1356A_HID.txt]
+[id3_CL1356D.txt]
+[iDream.txt]
+[iMONO.txt]
+[JCOP41V221.txt]
+[jNet_jToken_s1.txt]
+[KAAN_Advanced.txt]
+[KAAN_Base.txt]
+[KAAN_SIM_III.txt]
+[KEBTechnology_KONA_USB_SmartCard.txt]
+[Kobil_EMV_CAP.txt]
+[Lenovo.txt]
+[LTC31.txt]
+[LTC31v2.txt]
+[LTC32.txt]
+[mIDentity.txt]
+[mIDentityXL.txt]
+[MSI_StarReader_SMART.txt]
+[MySmartPad.txt]
+[Neowave_Weneo.txt]
+[Oberthur-CosmoCard.txt]
+[Omnikey_noname1.txt]
+[Oz776_7772.txt]
+[Oz776S.txt]
+[Philips_SmartMX.txt]
+[Precise_200_MC.txt]
+[Precise_250_MC.txt]
+[ReinerSCT.txt]
+[SCR3310.txt]
+[SCR3311.txt]
+[SCR331-DI-NTTCom.txt]
+[SCR331-DI.txt]
+[SCR331.txt]
+[SCR3320.txt]
+[SCR333.txt]
+[SCR3340.txt]
+[SCR335.txt]
+[SCR355.txt]
+[SDI010.txt]
+[sid800.txt]
+[SIM_Pocket_Combo.txt]
+[Sitecom_MD-010.txt]
+[SPR532.txt]
+[SpringCard_CrazyWriter.txt]
+[SpringCard_CSB6_Basic.txt]
+[SpringCard_CSB6_Secure.txt]
+[SpringCard_CSB6_Ultimate.txt]
+[SpringCard_EasyFinger_Standard.txt]
+[SpringCard_EasyFinger_Ultimate.txt]
+[SpringCard_Prox_N_Roll.txt]
+[Teo.txt]
+[TianYu_CCID_SmartKey.txt]
+[Validy_TokenA.txt]
+[Vasco_DP905.txt]
+[Vega-Alpha.txt]
+[Verisign_secure_storage_token.txt]
+[Verisign_secure_token.txt]
+[VMware_Virtual_USB_CCID.txt]
+[Winbond.txt]
+[Xiring_XI-SIGN_6000.txt]
+[Xiring_XI-SIGN.txt]

Propchange: website/readers.ini
------------------------------------------------------------------------------
    svn:mergeinfo =

More information about the Pcsclite-cvs-commit mailing list