dexter has uploaded this change for review.

View Change

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
---
M pySim/card_key_provider.py
1 file changed, 7 insertions(+), 7 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/65/41465/1

diff --git a/pySim/card_key_provider.py b/pySim/card_key_provider.py
index 6292f93..16403ff 100644
--- a/pySim/card_key_provider.py
+++ b/pySim/card_key_provider.py
@@ -176,16 +176,16 @@
     csv_file = None
     filename = None
 
-    def __init__(self, filename: str, transport_keys: dict):
+    def __init__(self, csv_filename: str, transport_keys: dict):
         """
         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)
         """
-        self.csv_file = open(filename, 'r')
+        self.csv_file = open(csv_filename, 'r')
         if not self.csv_file:
-            raise RuntimeError("Could not open CSV file '%s'" % filename)
-        self.filename = filename
+            raise RuntimeError("Could not open CSV file '%s'" % csv_filename)
+        self.csv_filename = csv_filename
         self.crypt = CardKeyFieldCryptor(transport_keys)
 
     def get(self, fields: List[str], key: str, value: str) -> Dict[str, str]:
@@ -194,7 +194,7 @@
         self.csv_file.seek(0)
         cr = csv.DictReader(self.csv_file)
         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]
 
         rc = {}
@@ -204,7 +204,7 @@
                     if f in row:
                         rc.update({f: self.crypt.decrypt_field(f, row[f])})
                     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
 
 

To view, visit change 41465. To unsubscribe, or for help writing mail filters, visit settings.