Removed all outdated makefile.dos and their *.msc include.

[wxWidgets.git] / wxPython / wx / py / introspect.py

diff --git a/wxPython/wx/py/introspect.py b/wxPython/wx/py/introspect.py
index f134a28ce74f9dc95a7ce3ca4d3d969a1ebca082..4ba2c4dc88143d582287a10d94ee1d7d9ae6a606 100644 (file)
--- a/wxPython/wx/py/introspect.py
+++ b/wxPython/wx/py/introspect.py
@@ -5,13 +5,12 @@ __author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 

-from __future__ import nested_scopes
-

 import cStringIO
 import inspect
 import sys
 import tokenize
 import types
 import cStringIO
 import inspect
 import sys
 import tokenize
 import types

+import wx

 
 def getAutoCompleteList(command='', locals=None, includeMagic=1, 
                         includeSingle=1, includeDouble=1):
 
 def getAutoCompleteList(command='', locals=None, includeMagic=1, 
                         includeSingle=1, includeDouble=1):


@@ -56,11 +55,11 @@ def getAttributeNames(object, includeMagic=1, includeSingle=1,
         attrdict = getAllAttributeNames(object)
         # Store the object's dir.
         object_dir = dir(object)
         attrdict = getAllAttributeNames(object)
         # Store the object's dir.
         object_dir = dir(object)

-        for (str_obj, technique, count), attrlist in attrdict.items():
+        for (obj_type_name, technique, count), attrlist in attrdict.items():

             # This complexity is necessary to avoid accessing all the
             # attributes of the object.  This is very handy for objects
             # whose attributes are lazily evaluated.
             # This complexity is necessary to avoid accessing all the
             # attributes of the object.  This is very handy for objects
             # whose attributes are lazily evaluated.

-            if str(object) == str_obj and technique == 'dir':
+            if type(object).__name__ == obj_type_name and technique == 'dir':

                 attributes += attrlist
             else:
                 attributes += [attr for attr in attrlist \
                 attributes += attrlist
             else:
                 attributes += [attr for attr in attrlist \


@@ -77,7 +76,7 @@ def getAttributeNames(object, includeMagic=1, includeSingle=1,
     attributes.sort(lambda x, y: cmp(x.upper(), y.upper()))
     if not includeSingle:
         attributes = filter(lambda item: item[0]!='_' \
     attributes.sort(lambda x, y: cmp(x.upper(), y.upper()))
     if not includeSingle:
         attributes = filter(lambda item: item[0]!='_' \

-                            or item[1]=='_', attributes)
+                            or item[1:2]=='_', attributes)

     if not includeDouble:
         attributes = filter(lambda item: item[:2]!='__', attributes)
     return attributes
     if not includeDouble:
         attributes = filter(lambda item: item[:2]!='__', attributes)
     return attributes


@@ -97,10 +96,9 @@ def getAllAttributeNames(object):
     # They always return true for hasattr().
     # !!!
     try:
     # They always return true for hasattr().
     # !!!
     try:

-        # Yes, this can fail if object is an instance of a class with
-        # __str__ (or __repr__) having a bug or raising an
-        # exception. :-(
-        key = str(object)
+        # This could(?) fail if the type is poorly defined without
+        # even a name.
+        key = type(object).__name__

     except:
         key = 'anonymous'
     # Wake up sleepy objects - a hack for ZODB objects in "ghost" state.
     except:
         key = 'anonymous'
     # Wake up sleepy objects - a hack for ZODB objects in "ghost" state.


@@ -292,7 +290,14 @@ def getRoot(command, terminator=None):
 
 def getTokens(command):
     """Return list of token tuples for command."""
 
 def getTokens(command):
     """Return list of token tuples for command."""

-    command = str(command)  # In case the command is unicode, which fails.
+
+    # In case the command is unicode try encoding it
+    if type(command) == unicode:
+        try:
+            command = command.encode(wx.GetDefaultPyEncoding())
+        except UnicodeEncodeError:
+            pass # otherwise leave it alone
+                

     f = cStringIO.StringIO(command)
     # tokens is a list of token tuples, each looking like: 
     # (type, string, (srow, scol), (erow, ecol), line)
     f = cStringIO.StringIO(command)
     # tokens is a list of token tuples, each looking like: 
     # (type, string, (srow, scol), (erow, ecol), line)