fixed non-const wxString iterators to work when a character is changed to another...

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

diff --git a/wxPython/wx/py/introspect.py b/wxPython/wx/py/introspect.py
index 3e37495d8484335322f5fc9ec23f0de0e4f1a4f4..4ba2c4dc88143d582287a10d94ee1d7d9ae6a606 100644 (file)
--- 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]
 
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 

-from __future__ import nested_scopes
-

 import cStringIO
 import inspect
 import sys
 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]!='_' \
     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


@@ -252,14 +250,14 @@ def getRoot(command, terminator=None):
         line = token[4]
         if tokentype is tokenize.ENDMARKER:
             continue
         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.
         or (tokentype is tokenize.OP and tokenstring == '.'):
             if prefix:
                 # The prefix isn't valid because it comes after a dot.