summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-08-19 21:18:11 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-08-19 21:18:11 (GMT)
commitf2e500c133f4130ab7b4a1d7e0ee1f08f41dbf61 (patch)
tree7216cd9c0b4105d317066656a5526b442ac9f576
parent344ff4ab2b68dee327fb36ee4fe01124466e49d6 (diff)
parentc1a723a0b300f036ba76c0370374ee2e455c2c52 (diff)
downloadcpython-f2e500c133f4130ab7b4a1d7e0ee1f08f41dbf61.zip
cpython-f2e500c133f4130ab7b4a1d7e0ee1f08f41dbf61.tar.gz
cpython-f2e500c133f4130ab7b4a1d7e0ee1f08f41dbf61.tar.bz2
Merge with 3.4
-rw-r--r--Lib/idlelib/ColorDelegator.py17
1 files changed, 0 insertions, 17 deletions
diff --git a/Lib/idlelib/ColorDelegator.py b/Lib/idlelib/ColorDelegator.py
index 729dec0..70a933a 100644
--- a/Lib/idlelib/ColorDelegator.py
+++ b/Lib/idlelib/ColorDelegator.py
@@ -32,7 +32,6 @@ def make_pat():
prog = re.compile(make_pat(), re.S)
idprog = re.compile(r"\s+(\w+)", re.S)
-asprog = re.compile(r".*?\b(as)\b")
class ColorDelegator(Delegator):
@@ -213,22 +212,6 @@ class ColorDelegator(Delegator):
self.tag_add("DEFINITION",
head + "+%dc" % a,
head + "+%dc" % b)
- elif value == "import":
- # color all the "as" words on same line, except
- # if in a comment; cheap approximation to the
- # truth
- if '#' in chars:
- endpos = chars.index('#')
- else:
- endpos = len(chars)
- while True:
- m1 = self.asprog.match(chars, b, endpos)
- if not m1:
- break
- a, b = m1.span(1)
- self.tag_add("KEYWORD",
- head + "+%dc" % a,
- head + "+%dc" % b)
m = self.prog.search(chars, m.end())
if "SYNC" in self.tag_names(next + "-1c"):
head = next