Changeset 391 for python/trunk/Lib/idlelib/HyperParser.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/idlelib/HyperParser.py (modified) (3 diffs)

python/trunk/Lib/idlelib/HyperParser.py

@@ -11 +11 @@
 import string
 import keyword
-import PyParse
+from idlelib import PyParse
 
 class HyperParser:
@@ -32 +32 @@
             for context in editwin.num_context_lines:
                 startat = max(lno - context, 1)
-                startatindex = `startat` + ".0"
+                startatindex = repr(startat) + ".0"
                 stopatindex = "%d.end" % lno
                 # We add the newline because PyParse requires a newline at end.
@@ -233 +233 @@
                 else:
                     # We can't continue after other types of brackets
+                    if rawtext[pos] in "'\"":
+                        # Scan a string prefix
+                        while pos > 0 and rawtext[pos - 1] in "rRbBuU":
+                            pos -= 1
+                        last_identifier_pos = pos
                     break