Changeset 0a49bd7 for fedd/init_abac_authorizer.py

Timestamp:

Jan 15, 2011 5:52:15 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

aaf7f41

Parents:

ac15159 (diff), 944b746 (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.

git-author:

Ted Faber <faber@…> (01/15/11 17:51:40)

git-committer:

Ted Faber <faber@…> (01/15/11 17:52:15)

Message:

merge from current

File:

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

fedd/init_abac_authorizer.py

@@ -4 +4 @@
 import os, os.path
 
-from optparse import OptionParser
+from federation.util import file_expanding_opts
 from federation.authorizer import abac_authorizer
 
-class Parser(OptionParser):
+class Parser(file_expanding_opts):
     def __init__(self):
-        OptionParser.__init__(self, usage='%prog [options]')
-        self.add_option('--cert', dest='cert', help='Identity certificate')
-        self.add_option('--key', dest='key', help='Identity key')
+        file_expanding_opts.__init__(self, usage='%prog [options]')
+        self.add_option('--cert', dest='cert', 
+                action='callback', callback=self.expand_file, type='str',
+                help='Identity certificate')
+        self.add_option('--key', dest='key',
+                action='callback', callback=self.expand_file, type='str',
+                help='Identity key')
         self.add_option('--policy', dest='policy', 
+                action='callback', callback=self.expand_file, type='str',
                 help='ABAC policy certificates')
-        self.add_option('--dir', dest='out_dir', help='directory to save into')
+        self.add_option('--dir', dest='out_dir',
+                action='callback', callback=self.expand_file, type='str',
+                help='directory to save into')
 
 parser = Parser()