diff options
| author | Rob Austein <sra@hactrn.net> | 2010-03-31 16:01:53 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-03-31 16:01:53 +0000 |
| commit | d3e80f631b239360f4277c3f42b6ad4656ccb660 (patch) | |
| tree | 96e8147d852f846f34e8cd2cdf177dafd0f0830a /myrpki.rototill/convert-from-csv-to-entitydb.py | |
| parent | 0b56214cd784b6a7a5703aca725c0c4fdb2ebf75 (diff) | |
Clean up CSV code per suggestions from Warren
svn path=/myrpki.rototill/apnic-to-csv.py; revision=3147
Diffstat (limited to 'myrpki.rototill/convert-from-csv-to-entitydb.py')
| -rw-r--r-- | myrpki.rototill/convert-from-csv-to-entitydb.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/myrpki.rototill/convert-from-csv-to-entitydb.py b/myrpki.rototill/convert-from-csv-to-entitydb.py index 92c85180..282d2e75 100644 --- a/myrpki.rototill/convert-from-csv-to-entitydb.py +++ b/myrpki.rototill/convert-from-csv-to-entitydb.py @@ -165,7 +165,7 @@ for d in map(entitydb, ("children", "parents", "repositories", "pubclients")): one_year_from_now = str(rpki.sundial.now() + rpki.sundial.timedelta(days = 365)) if os.path.exists(children_csv): - for child_handle, valid_until, child_resource_pemfile in myrpki.csv_open(children_csv): + for child_handle, valid_until, child_resource_pemfile in myrpki.csv_reader(children_csv, columns = 3): try: e = Element("parent", @@ -182,7 +182,7 @@ if os.path.exists(children_csv): pass if os.path.exists(parents_csv): - for parent_handle, parent_service_uri, parent_cms_pemfile, parent_https_pemfile, parent_myhandle, parent_sia_base in myrpki.csv_open(parents_csv): + for parent_handle, parent_service_uri, parent_cms_pemfile, parent_https_pemfile, parent_myhandle, parent_sia_base in myrpki.csv_reader(parents_csv, columns = 6): try: e = Element("parent", @@ -213,7 +213,7 @@ if os.path.exists(parents_csv): pass if os.path.exists(pubclients_csv): - for client_handle, client_resource_pemfile, client_sia_base in myrpki.csv_open(pubclients_csv): + for client_handle, client_resource_pemfile, client_sia_base in myrpki.csv_reader(pubclients_csv, columns = 3): try: parent_handle = client_handle.split("/")[-2] if "/" in client_handle else handle |