Changeset 62f3dd9 for fedd/fedd.py

Timestamp:

Dec 10, 2010 9:00:16 AM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

913dc7a

Parents:

fbee30a

git-author:

Ted Faber <faber@…> (12/09/10 11:41:45)

git-committer:

Ted Faber <faber@…> (12/10/10 09:00:16)

Message:

allow command line progams to expand tildes. Added a class derived from OptionParser? to make that easily available.

File:

• fedd/fedd.py (modified) (3 diffs)

fedd/fedd.py

@@ -7 +7 @@
 from federation import config_parser
 from federation.server import server, xmlrpc_handler, soap_handler
-from federation.util import fedd_ssl_context
+from federation.util import fedd_ssl_context, file_expanding_opts
 from federation.deter_impl import new_feddservice
 
@@ -18 +18 @@
 import logging
 import M2Crypto
-
-class fedd_opts(OptionParser):
+import os.path
+
+class fedd_opts(file_expanding_opts):
     """Encapsulate option processing in this class, rather than in main"""
+
     def __init__(self):
-        OptionParser.__init__(self, usage="%prog [opts] (--help for details)",
+        file_expanding_opts.__init__(self, 
+                usage="%prog [opts] (--help for details)",
                 version="0.1")
 
@@ -29 +32 @@
         self.add_option("-d", "--debug", action="count", dest="debug", 
                 help="Set debug.  Repeat for more information")
-        self.add_option("-f", "--configfile", action="store",
+        self.add_option("-f", "--configfile", action="callback",
+                callback=self.expand_file, type='str',
                 default="/usr/local/etc/fedd.conf",
-                dest="configfile", help="Configuration file (required)")
+                dest="configfile", help="Configuration file")
         self.add_option("-l", "--logfile", action="store", dest="logfile", 
                 help="File to send log messages to")