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
fewer import * for certificate
[sfa.git]
/
geni
/
client
/
genidump.py
diff --git
a/geni/client/genidump.py
b/geni/client/genidump.py
index
49365ed
..
8c3be7d
100644
(file)
--- a/
geni/client/genidump.py
+++ b/
geni/client/genidump.py
@@
-8,16
+8,15
@@
import xmlrpclib
from types import StringTypes, ListType
from optparse import OptionParser
from types import StringTypes, ListType
from optparse import OptionParser
-from geni.trust.certificate import
Keypair,
Certificate
+from geni.trust.certificate import Certificate
from geni.trust.credential import Credential
from geni.trust.credential import Credential
-from geni.util.geniclient import GeniClient, ServerException
from geni.trust.gid import create_uuid
from geni.trust.gid import create_uuid
+
+from geni.util.geniclient import GeniClient, ServerException
from geni.util.record import GeniRecord
from geni.util.rspec import Rspec
def determine_geni_filekind(fn):
from geni.util.record import GeniRecord
from geni.util.rspec import Rspec
def determine_geni_filekind(fn):
- from geni.trust.certificate import Certificate
-
cert = Certificate(filename = fn)
data = cert.get_data()
cert = Certificate(filename = fn)
data = cert.get_data()