Fix root group check to handle standard groups. (#634)

* Fix root group check to handle standard groups. * Revise code, only NestedGroup can be a root group. * Fix type check. * Clean up code.
AcademySoftwareFoundation · Feb 27, 2020 · 42139e9 · 42139e9
1 parent f347994
commit 42139e9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/cuegui/cuegui/Utils.py b/cuegui/cuegui/Utils.py
@@ -40,6 +40,7 @@
 from yaml.scanner import ScannerError
 
 import opencue
+import opencue.wrappers.group
 
 import cuegui.ConfirmationDialog
 import cuegui.Constants
@@ -141,14 +142,16 @@ def isRootGroup(object):
  """Returns true if the object is a root, false if not
  @return: If the object is a root group
  @rtype: bool"""
- return object.__class__.__name__ in ["NestedGroup", "Group"] and not object.hasParent()
+ return isinstance(object, opencue.wrappers.group.NestedGroup) and not object.hasParent()
 
 
 def isGroup(object):
  """Returns true if the object is a group, false if not
  @return: If the object is a group
  @rtype: bool"""
- return object.__class__.__name__ in ["NestedGroup", "Group"] and object.hasParent()
+ return (
+ type(object) == opencue.wrappers.group.Group or
+ (isinstance(object, opencue.wrappers.group.NestedGroup) and object.hasParent()))
 
 
 def isHost(object):

diff --git a/pycue/opencue/wrappers/group.py b/pycue/opencue/wrappers/group.py
@@ -197,14 +197,6 @@ def pendingJobs(self):
  :return: total number of running jobs"""
  return self.data.group_stats.pending_jobs
 
- def hasParent(self):
- """Whether this Group/NestedGroup has a parent group.
-
- :rtype: bool
- :return: whether the group has a parent
- """
- return self.data.HasField('parent')
-
 
 class NestedGroup(Group):
  """This class contains information and actions related to a nested group."""
@@ -240,3 +232,11 @@ def asGroup(self):
  level=self.data.level,
  group_stats=self.data.stats,
  ))
+
+ def hasParent(self):
+ """Whether this NestedGroup has a parent group.
+
+ :rtype: bool
+ :return: whether the group has a parent group.
+ """
+ return self.data.HasField('parent')