Changeset 66bb590 for fedd/fedd_to_abac.py

Timestamp:

Dec 10, 2010 9:03:35 AM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

52b6ebc

Parents:

913dc7a (diff), 8d5394e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

File:

• fedd/fedd_to_abac.py (modified) (1 diff)

fedd/fedd_to_abac.py

@@ -9 +9 @@
 
 from string import join
-from optparse import OptionParser
 
-from federation.util import abac_pem_type, abac_split_cert
+from federation.util import abac_pem_type, abac_split_cert, file_expanding_opts
 
-class Parser(OptionParser):
+class Parser(file_expanding_opts):
     def __init__(self):
-        OptionParser.__init__(self)
+        file_expanding_opts.__init__(self)
         self.add_option('--cert', dest='cert', default=None,
+                action='callback', callback=self.expand_file, type='str',
                 help='my fedid as an X.509 certificate')
         self.add_option('--key', dest='key', default=None,
+                action='callback', callback=self.expand_file, type='str',
                 help='key for the certificate')
         self.add_option('--dir', dest='dir', default=None,
+                action='callback', callback=self.expand_file, type='str',
                 help='Output directory for credentials')
         self.add_option('--make-dir', action='store_true', dest='make_dir',