git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2to3 -f except
[sfa.git]
/
sfa
/
trust
/
credential.py
diff --git
a/sfa/trust/credential.py
b/sfa/trust/credential.py
index
f61601a
..
37af67b
100644
(file)
--- a/
sfa/trust/credential.py
+++ b/
sfa/trust/credential.py
@@
-26,6
+26,8
@@
# Credentials are signed XML files that assign a subject gid privileges to an object gid
##
# Credentials are signed XML files that assign a subject gid privileges to an object gid
##
+from __future__ import print_function
+
import os, os.path
import subprocess
from types import StringTypes
import os, os.path
import subprocess
from types import StringTypes
@@
-189,7
+191,7
@@
class Signature(object):
try:
doc = parseString(self.xml)
try:
doc = parseString(self.xml)
- except ExpatError
,
e:
+ except ExpatError
as
e:
logger.log_exc ("Failed to parse credential, %s"%self.xml)
raise
sig = doc.getElementsByTagName("Signature")[0]
logger.log_exc ("Failed to parse credential, %s"%self.xml)
raise
sig = doc.getElementsByTagName("Signature")[0]
@@
-728,7
+730,7
@@
class Credential(object):
doc = None
try:
doc = parseString(self.xml)
doc = None
try:
doc = parseString(self.xml)
- except ExpatError
,
e:
+ except ExpatError
as
e:
raise CredentialNotVerifiable("Malformed credential")
doc = parseString(self.xml)
sigs = []
raise CredentialNotVerifiable("Malformed credential")
doc = parseString(self.xml)
sigs = []
@@
-858,7
+860,7
@@
class Credential(object):
# or non PEM files
trusted_cert_objects.append(GID(filename=f))
ok_trusted_certs.append(f)
# or non PEM files
trusted_cert_objects.append(GID(filename=f))
ok_trusted_certs.append(f)
- except Exception
,
exc:
+ except Exception
as
exc:
logger.error("Failed to load trusted cert from %s: %r"%( f, exc))
trusted_certs = ok_trusted_certs
logger.error("Failed to load trusted cert from %s: %r"%( f, exc))
trusted_certs = ok_trusted_certs
@@
-1154,7
+1156,7
@@
class Credential(object):
#
# @param dump_parents If true, also dump the parent certificates
def dump (self, *args, **kwargs):
#
# @param dump_parents If true, also dump the parent certificates
def dump (self, *args, **kwargs):
- print
self.dump_string(*args, **kwargs
)
+ print
(self.dump_string(*args, **kwargs)
)
# SFA code ignores show_xml and disables printing the cred xml
def dump_string(self, dump_parents=False, show_xml=False):
# SFA code ignores show_xml and disables printing the cred xml
def dump_string(self, dump_parents=False, show_xml=False):
@@
-1197,7
+1199,7
@@
class Credential(object):
result += "\nEnd XML\n"
except:
import traceback
result += "\nEnd XML\n"
except:
import traceback
- print
"exc. Credential.dump_string / XML"
+ print
("exc. Credential.dump_string / XML")
traceback.print_exc()
return result
traceback.print_exc()
return result