Changeset 66bb590 for fedd/creddy_split.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/creddy_split.py (modified) (1 diff)

fedd/creddy_split.py

@@ -5 +5 @@
 import os
 
-from optparse import OptionParser
-from federation.util import abac_split_cert, abac_pem_type
+from federation.util import abac_split_cert, abac_pem_type, file_expanding_opts
 
 # Options
-class Parser(OptionParser):
+class Parser(file_expanding_opts):
     def __init__(self):
-        OptionParser.__init__(self, usage="%prog [options] file.pem")
+        file_expanding_opts.__init__(self, usage="%prog [options] file.pem")
         self.add_option('--cert', dest='cert', default='./cert.pem', 
+                action='callback', callback=self.expand_file, type='str',
                 help='File to extract certificate into, default: [%default]')
         self.add_option('--key', dest='key', default='./key.pem', 
+                action='callback', callback=self.expand_file, type='str',
                 help='File to extract key into, default: [%default]')
         self.add_option('--force', action='store_true', dest='force',