TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

dgui: update DirectScrolledList type checking for Python 2/3 compatibility

Browse Source
This commit is contained in:
Aidan Noll 2019-10-03 23:15:13 -04:00 committed by rdb
parent 8b0256e0f9
commit 984d70e8e0
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
direct/src/gui/DirectScrolledList.py
View File

@ -9,6 +9,12 @@ from direct.directnotify import DirectNotifyGlobal
from direct.task.Task import Task from direct.task.Task import Task
from .DirectFrame import * from .DirectFrame import *
from .DirectButton import * from .DirectButton import *
import sys
if sys.version_info >= (3,0):
stringType = str
else:
stringType = basestring
class DirectScrolledListItem(DirectButton): class DirectScrolledListItem(DirectButton):
@ -61,7 +67,7 @@ class DirectScrolledList(DirectFrame):
# so we can modify it without mangling the user's list # so we can modify it without mangling the user's list
if 'items' in kw: if 'items' in kw:
for item in kw['items']: for item in kw['items']:
if type(item) != type(''): if not isinstance(item, stringType):
break break
else: else:
# we get here if every item in 'items' is a string # we get here if every item in 'items' is a string
@ -106,7 +112,7 @@ class DirectScrolledList(DirectFrame):
DirectFrame, (self,), DirectFrame, (self,),
) )
for item in self["items"]: for item in self["items"]:
if item.__class__.__name__ != 'str': if not isinstance(item, stringType):
item.reparentTo(self.itemFrame) item.reparentTo(self.itemFrame)
self.initialiseoptions(DirectScrolledList) self.initialiseoptions(DirectScrolledList)
@ -124,7 +130,7 @@ class DirectScrolledList(DirectFrame):
else: else:
self.maxHeight = 0.0 self.maxHeight = 0.0
for item in self["items"]: for item in self["items"]:
if item.__class__.__name__ != 'str': if not isinstance(item, stringType):
self.maxHeight = max(self.maxHeight, item.getHeight()) self.maxHeight = max(self.maxHeight, item.getHeight())
def setScrollSpeed(self): def setScrollSpeed(self):
@ -172,7 +178,7 @@ class DirectScrolledList(DirectFrame):
if len(self["items"]) == 0: if len(self["items"]) == 0:
return 0 return 0
if type(self["items"][0]) == type(''): if isinstance(self["items"][0], stringType):
self.notify.warning("getItemIndexForItemID: cant find itemID for non-class list items!") self.notify.warning("getItemIndexForItemID: cant find itemID for non-class list items!")
return 0 return 0
@ -238,7 +244,7 @@ class DirectScrolledList(DirectFrame):
# Hide them all # Hide them all
for item in self["items"]: for item in self["items"]:
if item.__class__.__name__ != 'str': if not isinstance(item, stringType):
item.hide() item.hide()
# Then show the ones in range, and stack their positions # Then show the ones in range, and stack their positions
@ -248,7 +254,7 @@ class DirectScrolledList(DirectFrame):
#print "stacking buttontext[", i,"]", self["items"][i]["text"] #print "stacking buttontext[", i,"]", self["items"][i]["text"]
# If the item is a 'str', then it has not been created (scrolled list is 'as needed') # If the item is a 'str', then it has not been created (scrolled list is 'as needed')
# Therefore, use the the function given to make it or just make it a frame # Therefore, use the the function given to make it or just make it a frame
if item.__class__.__name__ == 'str': if isinstance(item, stringType):
if self['itemMakeFunction']: if self['itemMakeFunction']:
# If there is a function to create the item # If there is a function to create the item
item = self['itemMakeFunction'](item, i, self['itemMakeExtraArgs']) item = self['itemMakeFunction'](item, i, self['itemMakeExtraArgs'])
@ -280,7 +286,7 @@ class DirectScrolledList(DirectFrame):
# Therefore, use the the function given to make it or # Therefore, use the the function given to make it or
# just make it a frame # just make it a frame
#print "Making " + str(item) #print "Making " + str(item)
if item.__class__.__name__ == 'str': if isinstance(item, stringType):
if self['itemMakeFunction']: if self['itemMakeFunction']:
# If there is a function to create the item # If there is a function to create the item
item = self['itemMakeFunction'](item, i, self['itemMakeExtraArgs']) item = self['itemMakeFunction'](item, i, self['itemMakeExtraArgs'])
@ -345,16 +351,16 @@ class DirectScrolledList(DirectFrame):
Add this string and extraArg to the list Add this string and extraArg to the list
""" """
assert self.notify.debugStateCall(self) assert self.notify.debugStateCall(self)
if type(item) != type(''): if not isinstance(item, stringType):
# cant add attribs to non-classes (like strings & ints) # cant add attribs to non-classes (like strings & ints)
item.itemID = self.nextItemID item.itemID = self.nextItemID
self.nextItemID += 1 self.nextItemID += 1
self['items'].append(item) self['items'].append(item)
if type(item) != type(''): if not isinstance(item, stringType):
item.reparentTo(self.itemFrame) item.reparentTo(self.itemFrame)
if refresh: if refresh:
self.refresh() self.refresh()
if type(item) != type(''): if not isinstance(item, stringType):
return item.itemID # to pass to scrollToItemID return item.itemID # to pass to scrollToItemID
def removeItem(self, item, refresh=1): def removeItem(self, item, refresh=1):
@ -369,7 +375,7 @@ class DirectScrolledList(DirectFrame):
if hasattr(self, "currentSelected") and self.currentSelected is item: if hasattr(self, "currentSelected") and self.currentSelected is item:
del self.currentSelected del self.currentSelected
self["items"].remove(item) self["items"].remove(item)
if type(item) != type(''): if not isinstance(item, stringType):
item.reparentTo(ShowBaseGlobal.hidden) item.reparentTo(ShowBaseGlobal.hidden)
self.refresh() self.refresh()
return 1 return 1
@ -387,7 +393,7 @@ class DirectScrolledList(DirectFrame):
if (hasattr(item, 'destroy') and hasattr(item.destroy, '__call__')): if (hasattr(item, 'destroy') and hasattr(item.destroy, '__call__')):
item.destroy() item.destroy()
self["items"].remove(item) self["items"].remove(item)
if type(item) != type(''): if not isinstance(item, stringType):
item.reparentTo(ShowBaseGlobal.hidden) item.reparentTo(ShowBaseGlobal.hidden)
self.refresh() self.refresh()
return 1 return 1
@ -409,7 +415,7 @@ class DirectScrolledList(DirectFrame):
if hasattr(self, "currentSelected") and self.currentSelected is item: if hasattr(self, "currentSelected") and self.currentSelected is item:
del self.currentSelected del self.currentSelected
self["items"].remove(item) self["items"].remove(item)
if type(item) != type(''): if not isinstance(item, stringType):
#RAU possible leak here, let's try to do the right thing #RAU possible leak here, let's try to do the right thing
#item.reparentTo(ShowBaseGlobal.hidden) #item.reparentTo(ShowBaseGlobal.hidden)
item.removeNode() item.removeNode()
@ -434,7 +440,7 @@ class DirectScrolledList(DirectFrame):
if (hasattr(item, 'destroy') and hasattr(item.destroy, '__call__')): if (hasattr(item, 'destroy') and hasattr(item.destroy, '__call__')):
item.destroy() item.destroy()
self["items"].remove(item) self["items"].remove(item)
if type(item) != type(''): if not isinstance(item, stringType):
#RAU possible leak here, let's try to do the right thing #RAU possible leak here, let's try to do the right thing
#item.reparentTo(ShowBaseGlobal.hidden) #item.reparentTo(ShowBaseGlobal.hidden)
item.removeNode() item.removeNode()
@ -459,7 +465,7 @@ class DirectScrolledList(DirectFrame):
def getSelectedText(self): def getSelectedText(self):
assert self.notify.debugStateCall(self) assert self.notify.debugStateCall(self)
if self['items'][self.index].__class__.__name__ == 'str': if isinstance(self['items'][self.index], stringType):
return self['items'][self.index] return self['items'][self.index]
else: else:
return self['items'][self.index]['text'] return self['items'][self.index]['text']