card_key_provider: rename parameter filename to csv_filename
let's rename the parameter filename to csv_filename to make it more clear to what kind of file this parameter refers. Change-Id: Id5b7c61b5e72fb205e30d2787855b2c276840a7b
This commit is contained in:
@@ -176,16 +176,16 @@ class CardKeyProviderCsv(CardKeyProvider):
|
|||||||
csv_file = None
|
csv_file = None
|
||||||
filename = None
|
filename = None
|
||||||
|
|
||||||
def __init__(self, filename: str, transport_keys: dict):
|
def __init__(self, csv_filename: str, transport_keys: dict):
|
||||||
"""
|
"""
|
||||||
Args:
|
Args:
|
||||||
filename : file name (path) of CSV file containing card-individual key/data
|
csv_filename : file name (path) of CSV file containing card-individual key/data
|
||||||
transport_keys : (see class CardKeyFieldCryptor)
|
transport_keys : (see class CardKeyFieldCryptor)
|
||||||
"""
|
"""
|
||||||
self.csv_file = open(filename, 'r')
|
self.csv_file = open(csv_filename, 'r')
|
||||||
if not self.csv_file:
|
if not self.csv_file:
|
||||||
raise RuntimeError("Could not open CSV file '%s'" % filename)
|
raise RuntimeError("Could not open CSV file '%s'" % csv_filename)
|
||||||
self.filename = filename
|
self.csv_filename = csv_filename
|
||||||
self.crypt = CardKeyFieldCryptor(transport_keys)
|
self.crypt = CardKeyFieldCryptor(transport_keys)
|
||||||
|
|
||||||
def get(self, fields: List[str], key: str, value: str) -> Dict[str, str]:
|
def get(self, fields: List[str], key: str, value: str) -> Dict[str, str]:
|
||||||
@@ -194,7 +194,7 @@ class CardKeyProviderCsv(CardKeyProvider):
|
|||||||
self.csv_file.seek(0)
|
self.csv_file.seek(0)
|
||||||
cr = csv.DictReader(self.csv_file)
|
cr = csv.DictReader(self.csv_file)
|
||||||
if not cr:
|
if not cr:
|
||||||
raise RuntimeError("Could not open DictReader for CSV-File '%s'" % self.filename)
|
raise RuntimeError("Could not open DictReader for CSV-File '%s'" % self.csv_filename)
|
||||||
cr.fieldnames = [field.upper() for field in cr.fieldnames]
|
cr.fieldnames = [field.upper() for field in cr.fieldnames]
|
||||||
|
|
||||||
rc = {}
|
rc = {}
|
||||||
@@ -204,7 +204,7 @@ class CardKeyProviderCsv(CardKeyProvider):
|
|||||||
if f in row:
|
if f in row:
|
||||||
rc.update({f: self.crypt.decrypt_field(f, row[f])})
|
rc.update({f: self.crypt.decrypt_field(f, row[f])})
|
||||||
else:
|
else:
|
||||||
raise RuntimeError("CSV-File '%s' lacks column '%s'" % (self.filename, f))
|
raise RuntimeError("CSV-File '%s' lacks column '%s'" % (self.csv_filename, f))
|
||||||
return rc
|
return rc
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user