git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e3f88d7
)
simpler and hopefully less error-prone way to init Xrn
author
Barış Metin
<Talip-Baris.Metin@sophia.inria.fr>
Mon, 18 Oct 2010 14:46:49 +0000
(16:46 +0200)
committer
Barış Metin
<Talip-Baris.Metin@sophia.inria.fr>
Mon, 18 Oct 2010 14:46:49 +0000
(16:46 +0200)
sfa/util/xrn.py
patch
|
blob
|
history
diff --git
a/sfa/util/xrn.py
b/sfa/util/xrn.py
index
86a1f86
..
c00dcef
100644
(file)
--- a/
sfa/util/xrn.py
+++ b/
sfa/util/xrn.py
@@
-56,23
+56,22
@@
class Xrn:
# provide either urn, or (hrn + type)
def __init__ (self, xrn=None, urn=None, hrn=None, type=None):
# provide either urn, or (hrn + type)
def __init__ (self, xrn=None, urn=None, hrn=None, type=None):
- if xrn:
- if xrn.startswith(Xrn.URN_PREFIX):
- self.urn=xrn
- self.urn_to_hrn()
+ if not xrn:
+ if urn:
+ xrn = urn
+ elif hrn:
+ xrn = hrn
else:
else:
- self.hrn=xrn
- self.type=type
- self.hrn_to_urn()
- elif urn:
- self.urn=urn
+ raise SfaAPIError,"Xrn.__init__"
+
+ if xrn.startswith(Xrn.URN_PREFIX):
+ self.urn=xrn
self.urn_to_hrn()
self.urn_to_hrn()
- el
if hrn and type:
- self.hrn=
h
rn
+ el
se:
+ self.hrn=
x
rn
self.type=type
self.hrn_to_urn()
self.type=type
self.hrn_to_urn()
- else:
- raise SfaAPIError,"Xrn.__init__"
+
if not type:
sfa_logger().debug("type-less Xrn's are not safe")
if not type:
sfa_logger().debug("type-less Xrn's are not safe")