X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab3db25392f3b3d283d2a8cf8dbd54997850de5d..3e47020738f9f6a45a1d3d59936e5250f1c117cc:/wxPython/wx/py/introspect.py?ds=sidebyside

diff --git a/wxPython/wx/py/introspect.py b/wxPython/wx/py/introspect.py
index 3e37495d84..4ba2c4dc88 100644
--- a/wxPython/wx/py/introspect.py
+++ b/wxPython/wx/py/introspect.py
@@ -5,8 +5,6 @@ __author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-from __future__ import nested_scopes
-
 import cStringIO
 import inspect
 import sys
@@ -78,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]!='_' \
-                            or item[1]=='_', attributes)
+                            or item[1:2]=='_', attributes)
     if not includeDouble:
         attributes = filter(lambda item: item[:2]!='__', attributes)
     return attributes
@@ -252,14 +250,14 @@ def getRoot(command, terminator=None):
         line = token[4]
         if tokentype is tokenize.ENDMARKER:
             continue
-        #if tokentype in (tokenize.NAME, tokenize.STRING, tokenize.NUMBER) \
-        #    and laststring != '.':
-        #    # We've reached something that's not part of the root.
-        #    if prefix and line[token[3][1]] != ' ':
-        #        # If it doesn't have a space after it, remove the prefix.
-        #        prefix = ''
-        #    break
-        if tokentype in (tokenize.NAME, tokenize.STRING, tokenize.NUMBER, tokenize.OP) \
+        if tokentype in (tokenize.NAME, tokenize.STRING, tokenize.NUMBER) \
+        and laststring != '.':
+            # We've reached something that's not part of the root.
+            if prefix and line[token[3][1]] != ' ':
+                # If it doesn't have a space after it, remove the prefix.
+                prefix = ''
+            break
+        if tokentype in (tokenize.NAME, tokenize.STRING, tokenize.NUMBER) \
         or (tokentype is tokenize.OP and tokenstring == '.'):
             if prefix:
                 # The prefix isn't valid because it comes after a dot.