From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 12 Nov 2010 21:11:52 +0000 (-0500)
Subject: allow Xrn class to be instantiated with None
X-Git-Tag: sfa-1.0-9~19
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=70c0126963dfa9599610cf45261ba380ddc84bfb;p=sfa.git

allow Xrn class to be instantiated with None
---

diff --git a/sfa/util/xrn.py b/sfa/util/xrn.py
index 71731d9e..0d5e6bf5 100644
--- a/sfa/util/xrn.py
+++ b/sfa/util/xrn.py
@@ -61,19 +61,17 @@ class Xrn:
     # self.path
     # provide either urn, or (hrn + type)
     def __init__ (self, xrn, type=None):
+        if not xrn: xrn = ""
         # user has specified xrn : guess if urn or hrn
-        if xrn is not None:
-            if xrn.startswith(Xrn.URN_PREFIX):
-                self.hrn=None
-                self.urn=xrn
-                self.urn_to_hrn()
-            else:
-                self.urn=None
-                self.hrn=xrn
-                self.type=type
-                self.hrn_to_urn()
+        if xrn.startswith(Xrn.URN_PREFIX):
+            self.hrn=None
+            self.urn=xrn
+            self.urn_to_hrn()
         else:
-            raise SfaAPIError,"Xrn.__init__"
+            self.urn=None
+            self.hrn=xrn
+            self.type=type
+            self.hrn_to_urn()
 # happens all the time ..
 #        if not type:
 #            sfa_logger().debug("type-less Xrn's are not safe")