Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't do str() on Numeric arrays

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-02-07 20:43:00 +00:00
parent 9c7d63962a
commit 7ab7156341
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wxPython/wx/py/introspect.py
View File

@@ -49,18 +49,22 @@ def getAttributeNames(object, includeMagic=1, includeSingle=1,
try: attributes += object._getAttributeNames() try: attributes += object._getAttributeNames()
except: pass except: pass
# Get all attribute names. # Get all attribute names.
attrdict = getAllAttributeNames(object) str_type = str(type(object))
# Store the object's dir. if str_type == "<type 'array'>":
object_dir = dir(object) attributes += dir(object)
for (str_obj, technique, count), attrlist in attrdict.items(): else:
# This complexity is necessary to avoid accessing all the attrdict = getAllAttributeNames(object)
# attributes of the object. This is very handy for objects # Store the object's dir.
# whose attributes are lazily evaluated. object_dir = dir(object)
if str(object) == str_obj and technique == 'dir': for (str_obj, technique, count), attrlist in attrdict.items():
attributes += attrlist # This complexity is necessary to avoid accessing all the
else: # attributes of the object. This is very handy for objects
attributes += [attr for attr in attrlist \ # whose attributes are lazily evaluated.
if attr not in object_dir and hasattr(object, attr)] if str(object) == str_obj and technique == 'dir':
attributes += attrlist
else:
attributes += [attr for attr in attrlist \
if attr not in object_dir and hasattr(object, attr)]
# Remove duplicates from the attribute list. # Remove duplicates from the attribute list.
for item in attributes: for item in attributes: