Changeset 1203 for trunk/bindings/python/nxs/napi.py

Timestamp:

06/02/09 14:02:11 (3 years ago)

Author:

Peter Peterson

Message:

Cleaned up getnxclass as suggested by Paul. Refs #101.

File:

• trunk/bindings/python/nxs/napi.py (modified) (3 diffs)

trunk/bindings/python/nxs/napi.py

@@ -524 +524 @@
             if nxclass is None:
                 nxclass = self.__getnxclass(name)
-                if nxclass is None:
-                    raise NeXusError("Failed to find entry with name \"%s\" "\
-                                     + "at %s" % (name, self.path))
             if nxclass != "SDS":
                 self.opengroup(name, nxclass)
@@ -562 +559 @@
         if nxclass is None:
             nxclass = self.__getnxclass(name)
-            if nxclass is None:
-                raise KeyError("file does not have \"%s\" at this level" \
-                               % name)
         status = nxlib.nxiopengroup_(self.handle, name, nxclass)
         if status == ERROR:
@@ -681 +675 @@
         return result
 
-    def __getnxclass(self, name):
+    def __getnxclass(self, target):
         """
         Return the nxclass of the supplied name.
         """
         self.initgroupdir()
-        (myname, nxclass) = self.getnextentry()
-        if (myname, nxclass) != (None, None):
-            if myname == name:
+        while True:
+            (nxname, nxclass) = self.getnextentry()
+            if nxname == target:
                 return nxclass
-        while (myname, nxclass) != (None, None):
-            (myname, nxclass) = self.getnextentry()
-            if myname == name:
-                return nxclass
-        return None
+            if nxname is None:
+                break
+        raise NeXusError("Failed to find entry with name \"%s\" " \
+                         + "at %s" % (target, self.path))
 
     def entries(self):