Changeset 0a49bd7 for fedd/federation/util.py

Timestamp:

Jan 15, 2011 5:52:15 PM (14 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/federation/util.py (modified) (3 diffs)

fedd/federation/util.py

@@ -8 +8 @@
 
 import httplib
+
+from optparse import OptionParser
 
 from socket import sslerror
@@ -95 +97 @@
             self.set_allow_unknown_ca(True)
             self.set_verify(SSL.verify_peer, 10, callback=callb)
+
+class file_expanding_opts(OptionParser):
+    def expand_file(self, option, opt_str, v, p):
+        """
+        Store the given value to the given destination after expanding home
+        directories.
+        """
+        setattr(p.values, option.dest, os.path.expanduser(v))
+
+    def __init__(self, usage=None, version=None):
+        OptionParser.__init__(self)
+
 
 def read_simple_accessdb(fn, auth, mask=[]):
@@ -360 +374 @@
     # This should be a one-iteration loop
     for c in context.credentials():
-        ids.add(c.issuer_cert())
-        attrs.add(c.attribute_cert())
+        ids.add(str(c.issuer_cert()))
+        attrs.add(str(c.attribute_cert()))
 
     return list(ids), list(attrs)